Remove unnecessary comments

JoeRobich · JoeRobich · commit afb9321ad7f3 · 2021-07-09T23:59:16.000-07:00
diff --git a/test/integrationTests/advisor.integration.test.ts b/test/integrationTests/advisor.integration.test.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 
-import { expect } from 'chai';
+import { expect, should } from 'chai';
 import * as path from 'path';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
@@ -25,7 +25,8 @@ suite(`Advisor ${testAssetWorkspace.description}`, function () {
     let advisor: Advisor;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/codeActionRename.integration.test.ts b/test/integrationTests/codeActionRename.integration.test.ts
@@ -21,7 +21,6 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
 
-        // These tests don't run on the BasicRazorApp2_1 solution
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/completionProvider.integration.test.ts b/test/integrationTests/completionProvider.integration.test.ts
@@ -7,14 +7,15 @@ import OmniSharpCompletionProvider from "../../src/features/completionProvider";
 import * as vscode from 'vscode';
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import * as path from "path";
-import { expect } from "chai";
+import { expect, should } from "chai";
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from "./integrationHelpers";
 
 suite(`${OmniSharpCompletionProvider.name}: Returns the completion items`, () => {
     let fileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/definitionProvider.test.ts b/test/integrationTests/definitionProvider.test.ts
@@ -7,14 +7,15 @@ import * as vscode from "vscode";
 import CSharpDefinitionProvider from "../../src/features/definitionProvider";
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
-import { expect } from "chai";
+import { expect, should } from "chai";
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator, restartOmniSharpServer } from './integrationHelpers';
 
 suite(`${CSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/diagnostics.integration.test.ts b/test/integrationTests/diagnostics.integration.test.ts
@@ -50,7 +50,6 @@ suite(`DiagnosticProvider: ${testAssetWorkspace.description}`, function () {
         suiteSetup(async function () {
             should();
 
-            // These tests only run on the BasicRazorApp2_1 solution
             if (!isRazorWorkspace(vscode.workspace)) {
                 this.skip();
             }
diff --git a/test/integrationTests/documentSymbolProvider.integration.test.ts b/test/integrationTests/documentSymbolProvider.integration.test.ts
@@ -20,7 +20,6 @@ suite(`DocumentSymbolProvider: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
 
-        // These tests don't run on the BasicRazorApp2_1 solution
         if (integrationHelpers.isRazorWorkspace(vscode.workspace) || integrationHelpers.isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/hoverProvider.integration.test.ts b/test/integrationTests/hoverProvider.integration.test.ts
@@ -20,7 +20,6 @@ suite(`Hover Provider: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
 
-        // These tests don't run on the BasicRazorApp2_1 solution
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/implementationProvider.test.ts b/test/integrationTests/implementationProvider.test.ts
@@ -7,14 +7,15 @@ import * as vscode from "vscode";
 import CSharpImplementationProvider from "../../src/features/implementationProvider";
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
-import { expect } from "chai";
+import { expect, should } from "chai";
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 
 suite(`${CSharpImplementationProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/languageMiddleware.integration.test.ts b/test/integrationTests/languageMiddleware.integration.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from "vscode";
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
-import { expect } from "chai";
+import { expect, should } from "chai";
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 import { LanguageMiddleware, LanguageMiddlewareFeature } from "../../src/omnisharp/LanguageMiddlewareFeature";
 
@@ -15,7 +15,8 @@ suite(`${LanguageMiddlewareFeature.name}: ${testAssetWorkspace.description}`, ()
     let remappedFileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/launchConfiguration.integration.test.ts b/test/integrationTests/launchConfiguration.integration.test.ts
@@ -19,7 +19,6 @@ suite(`Tasks generation: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
 
-        // These tests don't run on the BasicRazorApp2_1 solution
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/reAnalyze.integration.test.ts b/test/integrationTests/reAnalyze.integration.test.ts
@@ -39,7 +39,6 @@ suite(`ReAnalyze: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
 
-        // These tests don't run on the BasicRazorApp2_1 solution
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/referenceProvider.test.ts b/test/integrationTests/referenceProvider.test.ts
@@ -7,14 +7,15 @@ import * as vscode from "vscode";
 import OmnisharpReferenceProvider from "../../src/features/referenceProvider";
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
-import { expect } from "chai";
+import { expect, should } from "chai";
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 
 suite(`${OmnisharpReferenceProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/semanticTokensProvider.test.ts b/test/integrationTests/semanticTokensProvider.test.ts
@@ -52,7 +52,6 @@ suite(`SemanticTokensProvider: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
 
-        // These tests don't run on the BasicRazorApp2_1 solution
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/signatureHelp.integration.test.ts b/test/integrationTests/signatureHelp.integration.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 
-import { expect } from 'chai';
+import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 
@@ -18,7 +18,8 @@ suite(`SignatureHelp: ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/sourceGeneratorDefinitionProvider.test.ts b/test/integrationTests/sourceGeneratorDefinitionProvider.test.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { expect, should } from "chai";
 import * as vscode from "vscode";
 import * as path from 'path';
 import CSharpDefinitionProvider from "../../src/features/definitionProvider";
@@ -10,7 +10,8 @@ suite(`${CSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, ()
     let fileUri: vscode.Uri;
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (!isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
diff --git a/test/integrationTests/virtualDocumentTracker.integration.test.ts b/test/integrationTests/virtualDocumentTracker.integration.test.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 
-import { should, assert } from 'chai';
+import { assert, expect, should } from 'chai';
 import { activateCSharpExtension, isSlnWithGenerator } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import { IDisposable } from '../../src/Disposable';
@@ -20,17 +20,18 @@ suite(`Virtual Document Tracking ${testAssetWorkspace.description}`, function ()
     let virtualUri: vscode.Uri;
 
     suiteSetup(async function () {
+        should();
+
         if (isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }
-        should();
+
+        await activateCSharpExtension();
+        await testAssetWorkspace.restore();
 
         const virtualCSharpDocumentProvider = new VirtualCSharpDocumentProvider();
         virtualDocumentRegistration = vscode.workspace.registerTextDocumentContentProvider(virtualScheme, virtualCSharpDocumentProvider);
         virtualUri = vscode.Uri.parse(`${virtualScheme}://${testAssetWorkspace.projects[0].projectDirectoryPath}/_virtualFile.cs`);
-
-        await activateCSharpExtension();
-        await testAssetWorkspace.restore();
     });
 
     suiteTeardown(async () => {
@@ -39,16 +40,16 @@ suite(`Virtual Document Tracking ${testAssetWorkspace.description}`, function ()
         }
 
         await testAssetWorkspace.cleanupWorkspace();
-        virtualDocumentRegistration.dispose();
+        virtualDocumentRegistration?.dispose();
     });
 
     test("Virtual documents are operated on.", async () => {
         await vscode.workspace.openTextDocument(virtualUri);
 
         let position = new vscode.Position(2, 0);
-        let completionItems = <vscode.CompletionList>await vscode.commands.executeCommand("vscode.executeCompletionItemProvider", virtualUri, position);
+        let completionList = <vscode.CompletionList>await vscode.commands.executeCommand("vscode.executeCompletionItemProvider", virtualUri, position);
 
-        assert.include(completionItems.items.map(({ label }) => label), "while");
+        expect(completionList.items).to.not.be.empty;
     });
 });
 
diff --git a/test/integrationTests/workspaceSymbolProvider.integration.test.ts b/test/integrationTests/workspaceSymbolProvider.integration.test.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 
-import { expect } from 'chai';
+import { expect, should } from 'chai';
 import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 const chai = require('chai');
@@ -15,7 +15,8 @@ chai.use(require('chai-fs'));
 suite(`WorkspaceSymbolProvider: ${testAssetWorkspace.description}`, function () {
 
     suiteSetup(async function () {
-        // These tests don't run on the BasicRazorApp2_1 solution
+        should();
+
         if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
             this.skip();
         }

Original file line number	Diff line number	Diff line change
@@ -21,7 +21,6 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
`21`	`21`	`suiteSetup(async function () {`
`22`	`22`	`should();`
`23`	`23`
`24`		`- // These tests don't run on the BasicRazorApp2_1 solution`
`25`	`24`	`if (isRazorWorkspace(vscode.workspace) \|\| isSlnWithGenerator(vscode.workspace)) {`
`26`	`25`	`this.skip();`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
@@ -50,7 +50,6 @@ suite(`DiagnosticProvider: ${testAssetWorkspace.description}`, function () {
`50`	`50`	`suiteSetup(async function () {`
`51`	`51`	`should();`
`52`	`52`
`53`		`- // These tests only run on the BasicRazorApp2_1 solution`
`54`	`53`	`if (!isRazorWorkspace(vscode.workspace)) {`
`55`	`54`	`this.skip();`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,6 @@ suite(`DocumentSymbolProvider: ${testAssetWorkspace.description}`, function () {
`20`	`20`	`suiteSetup(async function () {`
`21`	`21`	`should();`
`22`	`22`
`23`		`- // These tests don't run on the BasicRazorApp2_1 solution`
`24`	`23`	`if (integrationHelpers.isRazorWorkspace(vscode.workspace) \|\| integrationHelpers.isSlnWithGenerator(vscode.workspace)) {`
`25`	`24`	`this.skip();`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,6 @@ suite(`Hover Provider: ${testAssetWorkspace.description}`, function () {
`20`	`20`	`suiteSetup(async function () {`
`21`	`21`	`should();`
`22`	`22`
`23`		`- // These tests don't run on the BasicRazorApp2_1 solution`
`24`	`23`	`if (isRazorWorkspace(vscode.workspace) \|\| isSlnWithGenerator(vscode.workspace)) {`
`25`	`24`	`this.skip();`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
@@ -19,7 +19,6 @@ suite(`Tasks generation: ${testAssetWorkspace.description}`, function () {
`19`	`19`	`suiteSetup(async function () {`
`20`	`20`	`should();`
`21`	`21`
`22`		`- // These tests don't run on the BasicRazorApp2_1 solution`
`23`	`22`	`if (isRazorWorkspace(vscode.workspace) \|\| isSlnWithGenerator(vscode.workspace)) {`
`24`	`23`	`this.skip();`
`25`	`24`	`}`