Run a build before the integration tests instead of as part of the specific source generator test.

Author: 333fred

test/integrationTests/definitionProvider.test.ts

@@ -9,7 +9,7 @@ import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import { expect } from "chai";
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithCsproj, restartOmniSharpServer } from './integrationHelpers';
-import { assertWithPoll, sleep } from "./poll";
+import { assertWithPoll } from "./poll";
 
 suite(`${CSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
@@ -70,14 +70,14 @@ suite(`${CSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, ()
         const textStart = new vscode.Position(11, 41);
         await vscode.commands.executeCommand('vscode.open', generatorTriggerUri);
 
-        // We need to do a full build in order to get the source generator built and ready to run, or tests will fail
-        await vscode.commands.executeCommand("dotnet.generateAssets", 0);
-        await sleep(100);
-        const tasks = await vscode.tasks.fetchTasks();
-        const task = (tasks).filter(task => task.name === 'build')[0];
-        expect(task).to.not.be.undefined;
-        await vscode.tasks.executeTask(task);
-        await restartOmniSharpServer();
+        // // We need to do a full build in order to get the source generator built and ready to run, or tests will fail
+        // await vscode.commands.executeCommand("dotnet.generateAssets", 0);
+        // await sleep(100);
+        // const tasks = await vscode.tasks.fetchTasks();
+        // const task = (tasks).filter(task => task.name === 'build')[0];
+        // expect(task).to.not.be.undefined;
+        // await vscode.tasks.executeTask(task);
+        // await restartOmniSharpServer();
 
         const definitionList = <vscode.Location[]>(await vscode.commands.executeCommand("vscode.executeDefinitionProvider", generatorTriggerUri, textStart));
         expect(definitionList.length).to.be.equal(1);

test/runIntegrationTests.ts

@@ -6,6 +6,7 @@
 import * as path from 'path';
 
 import { runTests } from 'vscode-test';
+import { execChildProcess } from '../src/common';
 
 async function main() {
     try {
@@ -18,11 +19,19 @@ async function main() {
         const extensionTestsPath = path.resolve(__dirname, './integrationTests/index');
 
         // The integration tests expect that the workspace to run the
-        // tests against is set in an evironment variable.
+        // tests against is set in an environment variable.
         const workspacePath = process.env.CODE_TESTS_WORKSPACE;
 
+        if (!workspacePath) {
+            console.error(`Empty workspace path`);
+            process.exit(-1);
+        }
+
         console.log(`workspace path = '${workspacePath}'`);
 
+        // Run a build before the tests, to ensure that source generators are set up correctly
+        await execChildProcess(`dotnet build`, workspacePath);
+
         // Download VS Code, unzip it and run the integration test
         await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs: [workspacePath, '-n', '--verbose'], extensionTestsEnv: process.env });
     } catch (err) {
@@ -32,4 +41,4 @@ async function main() {
     }
 }
 
-main();
+main();