clean up

Author: akshita31

test/unitTests/logging/InformationMessageObserver.test.ts

@@ -37,42 +37,47 @@ suite("InformationMessageObserver", () => {
         });
     });
 
-    suite('OmnisharpServerUnresolvedDependencies', () => {
-        let event = getUnresolvedDependenices("someFile");
-
-        suite('Suppress Dotnet Restore Notification is true', () => {
-            setup(() => updateConfig(vscode, 'csharp', 'suppressDotnetRestoreNotification', true));
-
-            test('The information message is not shown', () => {
-                observer.post(event);
-                expect(infoMessage).to.be.undefined;
-            });
-        });
-
-        suite('Suppress Dotnet Restore Notification is false', () => {
-            setup(() => updateConfig(vscode, 'csharp', 'suppressDotnetRestoreNotification', false));
-
-            test('The information message is shown', async () => {
-                observer.post(event);
-                expect(relativePath).to.not.be.empty;
-                expect(infoMessage).to.not.be.empty;
-                doClickOk();
-                await commandDone;
-                expect(invokedCommand).to.be.equal('dotnet.restore');
-            });
-
-            test('Given an information message if the user clicks Restore, the command is executed', async () => {
-                observer.post(event);
-                doClickOk();
-                await commandDone;
-                expect(invokedCommand).to.be.equal('dotnet.restore');
+    [
+        {
+            event: getUnresolvedDependenices("someFile"),
+            expectedCommand: "dotnet.restore"
+        }
+    ].forEach((elem) => {
+        suite(elem.event.constructor.name, () => {
+            suite('Suppress Dotnet Restore Notification is true', () => {
+                setup(() => updateConfig(vscode, 'csharp', 'suppressDotnetRestoreNotification', true));
+
+                test('The information message is not shown', () => {
+                    observer.post(elem.event);
+                    expect(infoMessage).to.be.undefined;
+                });
             });
 
-            test('Given an information message if the user clicks cancel, the command is not executed', async () => {
-                observer.post(event);
-                doClickCancel();
-                await expect(Observable.fromPromise(commandDone).timeout(1).toPromise()).to.be.rejected;
-                expect(invokedCommand).to.be.undefined;
+            suite('Suppress Dotnet Restore Notification is false', () => {
+                setup(() => updateConfig(vscode, 'csharp', 'suppressDotnetRestoreNotification', false));
+
+                test('The information message is shown', async () => {
+                    observer.post(elem.event);
+                    expect(relativePath).to.not.be.empty;
+                    expect(infoMessage).to.not.be.empty;
+                    doClickOk();
+                    await commandDone;
+                    expect(invokedCommand).to.be.equal(elem.expectedCommand);
+                });
+
+                test('Given an information message if the user clicks Restore, the command is executed', async () => {
+                    observer.post(elem.event);
+                    doClickOk();
+                    await commandDone;
+                    expect(invokedCommand).to.be.equal(elem.expectedCommand);
+                });
+
+                test('Given an information message if the user clicks cancel, the command is not executed', async () => {
+                    observer.post(elem.event);
+                    doClickCancel();
+                    await expect(Observable.fromPromise(commandDone).timeout(1).toPromise()).to.be.rejected;
+                    expect(invokedCommand).to.be.undefined;
+                });
             });
         });
     });

test/unitTests/testAssets/Fakes.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from '../../../src/vscodeAdapter';
 import * as protocol from '../../../src/omnisharp/protocol';
-import { DocumentSelector, MessageItem, TextDocument, Uri, GlobPattern, WorkspaceConfiguration } from '../../../src/vscodeAdapter';
+import { DocumentSelector, MessageItem, TextDocument, Uri, GlobPattern } from '../../../src/vscodeAdapter';
 import { ITelemetryReporter } from '../../../src/observers/TelemetryObserver';
 import { MSBuildDiagnosticsMessage } from '../../../src/omnisharp/protocol';
 import { OmnisharpServerMsBuildProjectDiagnostics, OmnisharpServerOnError, OmnisharpServerUnresolvedDependencies, WorkspaceInformationUpdated } from '../../../src/omnisharp/loggingEvents';