Refactor a bit and add some more test messages

Author: DustinCampbell

test/integrationTests/codeActionRename.integration.test.ts

@@ -8,8 +8,6 @@ import * as vscode from 'vscode';
 import { should, expect } from 'chai';
 import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { dotnetRestore } from '../../src/features/commands';
-import { EventStream } from '../../src/EventStream';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -18,7 +16,7 @@ chai.use(require('chai-fs'));
 suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
-        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+        await testAssetWorkspace.restore();
         await activateCSharpExtension();
     });
 

test/integrationTests/codeLensProvider.integration.test.ts

@@ -9,8 +9,6 @@ import * as path from 'path';
 import { should, expect } from 'chai';
 import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { dotnetRestore } from '../../src/features/commands';
-import { EventStream } from '../../src/EventStream';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -21,7 +19,7 @@ suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
 
     suiteSetup(async function () {
         should();
-        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+        await testAssetWorkspace.restore();
         await activateCSharpExtension();
 
         let fileName = 'Program.cs';

test/integrationTests/documentSymbolProvider.integration.test.ts

@@ -9,8 +9,6 @@ import * as path from 'path';
 import { should, expect } from 'chai';
 import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { dotnetRestore } from '../../src/features/commands';
-import { EventStream } from '../../src/EventStream';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -21,7 +19,7 @@ suite(`DocumentSymbolProvider: ${testAssetWorkspace.description}`, function () {
 
     suiteSetup(async function () {
         should();
-        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+        await testAssetWorkspace.restore();
         await activateCSharpExtension();
 
         let fileName = 'documentSymbols.cs';

test/integrationTests/hoverProvider.integration.test.ts

@@ -9,8 +9,6 @@ import * as path from 'path';
 import { should, expect } from 'chai';
 import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { dotnetRestore } from '../../src/features/commands';
-import { EventStream } from '../../src/EventStream';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -19,7 +17,7 @@ chai.use(require('chai-fs'));
 suite(`Hover Provider: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
-        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+        await testAssetWorkspace.restore();
         await activateCSharpExtension();
     });
 

test/integrationTests/integrationHelpers.ts

@@ -15,6 +15,7 @@ export async function activateCSharpExtension(): Promise<void> {
 
     try {
         await csharpExtension.exports.initializationFinished();
+        console.log("ms-vscode.csharp activated");
     }
     catch (err) {
         console.log(JSON.stringify(err));

test/integrationTests/launchConfiguration.integration.test.ts

@@ -10,8 +10,6 @@ import poll from './poll';
 import { should, expect } from 'chai';
 import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { dotnetRestore } from '../../src/features/commands';
-import { EventStream } from '../../src/EventStream';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -20,7 +18,7 @@ chai.use(require('chai-fs'));
 suite(`Tasks generation: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
-        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+        await testAssetWorkspace.restore();
         await activateCSharpExtension();
 
         await vscode.commands.executeCommand("dotnet.generateAssets");
@@ -33,8 +31,9 @@ suite(`Tasks generation: ${testAssetWorkspace.description}`, function () {
     });
 
     test("Starting .NET Core Launch (console) from the workspace root should create an Active Debug Session", async () => {
-        await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], ".NET Core Launch (console)");
-
+        let result = await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], ".NET Core Launch (console)");
+        expect(result, "Debugger could not be started.");
+        
         let debugSessionTerminated = new Promise(resolve => {
             vscode.debug.onDidTerminateDebugSession((e) => resolve());
         });

test/integrationTests/signatureHelp.integration.test.ts

@@ -9,8 +9,6 @@ import * as path from 'path';
 import { should, expect } from 'chai';
 import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { dotnetRestore } from '../../src/features/commands';
-import { EventStream } from '../../src/EventStream';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -21,7 +19,7 @@ suite(`SignatureHelp: ${testAssetWorkspace.description}`, function () {
 
     suiteSetup(async function () {
         should();
-        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+        await testAssetWorkspace.restore();
         await activateCSharpExtension();
 
         let fileName = 'sigHelp.cs';

test/integrationTests/testAssets/testAssets.ts

@@ -7,6 +7,8 @@ import * as fs from 'async-file';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import spawnGit from './spawnGit';
+import { dotnetRestore } from '../../../src/features/commands';
+import { EventStream } from '../../../src/EventStream';
 
 export class TestAssetProject {
     constructor(project: ITestAssetProject) {
@@ -33,6 +35,10 @@ export class TestAssetProject {
         await fs.rimraf(this.objDirectoryPath);
     }
 
+    async restore(): Promise<void> {
+        await dotnetRestore(vscode.workspace.rootPath, new EventStream());
+    }
+
     async addFileWithContents(fileName: string, contents: string): Promise<vscode.Uri> {
         let dir = path.dirname(this.projectDirectoryPath);
         let loc = path.join(dir, fileName);
@@ -54,6 +60,10 @@ export class TestAssetWorkspace {
         this.projects.forEach(async p => await p.deleteBuildArtifacts());
     }
 
+    async restore(): Promise<void> {
+        this.projects.forEach(async p => await p.restore());
+    }
+
     get vsCodeDirectoryPath(): string {
         return path.join(vscode.workspace.rootPath, ".vscode");
     }