Wait for workspace to be updated in Reanalyze tests

Author: JoeRobich

package-lock.json

@@ -44,8 +44,10 @@ suite(`ReAnalyze: ${testAssetWorkspace.description}`, function () {
             this.skip();
         }
 
-        eventStream = (await activateCSharpExtension()).eventStream;
-        await testAssetWorkspace.restore();
+        const activation = await activateCSharpExtension();
+        await testAssetWorkspace.restoreAndWait(activation);
+
+        eventStream = activation.eventStream;
 
         let projectDirectory = testAssetWorkspace.projects[0].projectDirectoryPath;
         interfaceUri = vscode.Uri.file(path.join(projectDirectory, 'ISomeInterface.cs'));

test/integrationTests/reAnalyze.integration.test.ts

@@ -9,8 +9,6 @@ import * as path from 'path';
 import { should, assert } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { EventType } from '../../src/omnisharp/EventType';
-import { poll } from './poll';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -60,19 +58,7 @@ suite(`SemanticTokensProvider: ${testAssetWorkspace.description}`, function () {
         }
 
         const activation = await activateCSharpExtension();
-        await testAssetWorkspace.restore();
-
-        // Wait for workspace information to be returned
-        let isWorkspaceLoaded = false;
-
-        const subscription = activation.eventStream.subscribe(event => {
-            if (event.type === EventType.WorkspaceInformationUpdated) {
-                isWorkspaceLoaded = true;
-                subscription.unsubscribe();
-            }
-        });
-
-        await poll(() => isWorkspaceLoaded, 25000, 500);
+        await testAssetWorkspace.restoreAndWait(activation);
 
         const fileName = 'semantictokens.cs';
         const projectDirectory = testAssetWorkspace.projects[0].projectDirectoryPath;

test/integrationTests/semanticTokensProvider.test.ts

@@ -6,6 +6,9 @@
 import * as fs from 'async-file';
 import * as path from 'path';
 import * as vscode from 'vscode';
+import { EventType } from '../../../src/omnisharp/EventType';
+import { ActivationResult } from '../integrationHelpers';
+import { poll } from '../poll';
 import spawnGit from './spawnGit';
 
 export class TestAssetProject {
@@ -41,6 +44,22 @@ export class TestAssetWorkspace {
         await vscode.commands.executeCommand("dotnet.restore.all");
     }
 
+    async restoreAndWait(activation: ActivationResult): Promise<void> {
+        await this.restore();
+
+        // Wait for workspace information to be returned
+        let isWorkspaceLoaded = false;
+
+        const subscription = activation.eventStream.subscribe(event => {
+            if (event.type === EventType.WorkspaceInformationUpdated) {
+                isWorkspaceLoaded = true;
+                subscription.unsubscribe();
+            }
+        });
+
+        await poll(() => isWorkspaceLoaded, 25000, 500);
+    }
+
     get vsCodeDirectoryPath(): string {
         return path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, ".vscode");
     }