Fix broken tests (microsoft#1538)

* Fix tests * Remove unnecessary coalesce * Change assert messages * Review changes * Restore source path * Revert source path

Author: lggomez

test/go.test.ts

@@ -380,20 +380,24 @@ It returns the number of bytes written and any write error encountered.
 { line: 11, severity: 'warning', msg: 'error return value not checked (undeclared name: prin) (errcheck)' },
 { line: 11, severity: 'warning', msg: 'unused variable or constant undeclared name: prin (varcheck)' },
 ];
-return check(vscode.Uri.file(path.join(fixturePath, 'errorsTest', 'errors.go')), config).then(diagnostics => {
+let errorsTestPath = path.join(fixtureSourcePath, 'errorsTest', 'errors.go');
+return check(vscode.Uri.file(errorsTestPath), config).then(diagnostics => {
 let sortedDiagnostics = diagnostics.sort((a, b) => {
 if (a.msg < b.msg)
 return -1;
 if (a.msg > b.msg)
 return 1;
 return 0;
 });
+
+assert.equal(sortedDiagnostics.length, expected.length, `too many errors ${JSON.stringify(sortedDiagnostics)}`);
+
 for (let i in expected) {
 assert.equal(sortedDiagnostics[i].line, expected[i].line, `Failed to match expected error #${i}: ${JSON.stringify(sortedDiagnostics)}`);
 assert.equal(sortedDiagnostics[i].severity, expected[i].severity, `Failed to match expected error #${i}: ${JSON.stringify(sortedDiagnostics)}`);
 assert.equal(sortedDiagnostics[i].msg, expected[i].msg, `Failed to match expected error #${i}: ${JSON.stringify(sortedDiagnostics)}`);
 }
-assert.equal(sortedDiagnostics.length, expected.length, `too many errors ${JSON.stringify(sortedDiagnostics)}`);
+
 return Promise.resolve();
 });
 }).then(() => done(), done);
@@ -855,22 +859,26 @@ It returns the number of bytes written and any write error encountered.
 { file: path.join(linterTestPath, 'linter_2.go'), line: 5, severity: 'warning', msg: 'error return value not checked (missing return) (errcheck)' },
 { file: path.join(linterTestPath, 'linter_1.go'), line: 5, severity: 'warning', msg: 'exported function ExportedFunc should have comment or be unexported (golint)' },
 ];
-return goLint(vscode.Uri.file(path.join(linterTestPath, 'linter_1.go')), config).then(diagnostics => {
+let linterFilePath = path.join(linterTestPath, 'linter_1.go');
+return goLint(vscode.Uri.file(linterFilePath), config).then(diagnostics => {
 let sortedDiagnostics = diagnostics.sort((a, b) => {
 if (a.msg < b.msg)
 return -1;
 if (a.msg > b.msg)
 return 1;
 return 0;
 });
+
+assert.equal(sortedDiagnostics.length, expected.length, `too many errors ${JSON.stringify(sortedDiagnostics)}`);
+
 for (let i in expected) {
 let errorMsg = `Failed to match expected error #${i}: ${JSON.stringify(sortedDiagnostics)}`;
 assert(sortedDiagnostics[i].msg.startsWith(expected[i].msg), errorMsg);
 assert.equal(sortedDiagnostics[i].file.toLowerCase(), expected[i].file.toLowerCase(), errorMsg);
 assert.equal(sortedDiagnostics[i].line, expected[i].line, errorMsg);
 assert.equal(sortedDiagnostics[i].severity, expected[i].severity, errorMsg);
 }
-assert.equal(sortedDiagnostics.length, expected.length, `too many errors ${JSON.stringify(sortedDiagnostics)}`);
+
 return Promise.resolve();
 });
 }).then(() => done(), done);