Improve code coverage by adding tests for BACK-COMPAT options scenarios

Author: DustinCampbell

src/omnisharp/options.ts

@@ -81,7 +81,7 @@ export class Options {
         }
         else if (csharpConfig.has('omnisharp')) {
             // BACKCOMPAT: If 'csharp.omnisharp' setting was found, use it.
-            return csharpConfig.get<string>('path');
+            return csharpConfig.get<string>('omnisharp');
         }
         else {
             // Otherwise, null.

test/unitTests/options.test.ts

@@ -6,23 +6,24 @@
 import { should, expect } from 'chai';
 import { Options } from '../../src/omnisharp/options';
 import { getFakeVsCode, getWorkspaceConfiguration } from './testAssets/Fakes';
+import { WorkspaceConfiguration } from '../../src/vscodeAdapter';
 
-function getVSCode() {
+function getVSCode(omnisharpConfig?: WorkspaceConfiguration, csharpConfig?: WorkspaceConfiguration) {
     const vscode = getFakeVsCode();
 
-    const omnisharpConfig = getWorkspaceConfiguration();
-    const csharpConfig = getWorkspaceConfiguration();
+    const _omnisharpConfig = omnisharpConfig || getWorkspaceConfiguration();
+    const _csharpConfig = csharpConfig || getWorkspaceConfiguration();
 
     vscode.workspace.getConfiguration = (section?, resource?) =>
     {
         if (section === 'omnisharp')
         {
-            return omnisharpConfig;
+            return _omnisharpConfig;
         }
 
         if (section === 'csharp')
         {
-            return csharpConfig;
+            return _csharpConfig;
         }
 
         return undefined;
@@ -34,7 +35,7 @@ function getVSCode() {
 suite("Options tests", () => {
     suiteSetup(() => should());
 
-    test('Construct options and verify defaults', () =>
+    test('Verify defaults', () =>
     {
         const vscode = getVSCode();
         const options = Options.Read(vscode);
@@ -53,4 +54,83 @@ suite("Options tests", () => {
         options.disableCodeActions.should.equal(false);
         options.disableCodeActions.should.equal(false);
     });
+
+    test('BACK-COMPAT: "omnisharp.loggingLevel": "verbose" == "omnisharp.loggingLevel": "debug"', () =>
+    {
+        const omnisharpConfig = getWorkspaceConfiguration();
+        omnisharpConfig.update('loggingLevel', "verbose");
+        const vscode = getVSCode(omnisharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.loggingLevel.should.equal("debug");
+    });
+
+    test('BACK-COMPAT: "omnisharp.useMono": true == "omnisharp.useGlobalMono": "always"', () =>
+    {
+        const omnisharpConfig = getWorkspaceConfiguration();
+        omnisharpConfig.update('useMono', true);
+        const vscode = getVSCode(omnisharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.useGlobalMono.should.equal("always");
+    });
+
+    test('BACK-COMPAT: "omnisharp.useMono": false == "omnisharp.useGlobalMono": "auto"', () =>
+    {
+        const omnisharpConfig = getWorkspaceConfiguration();
+        omnisharpConfig.update('useMono', false);
+        const vscode = getVSCode(omnisharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.useGlobalMono.should.equal("auto");
+    });
+
+    test('BACK-COMPAT: "csharp.omnisharpUsesMono": true == "omnisharp.useGlobalMono": "always"', () =>
+    {
+        const csharpConfig = getWorkspaceConfiguration();
+        csharpConfig.update('omnisharpUsesMono', true);
+        const vscode = getVSCode(undefined, csharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.useGlobalMono.should.equal("always");
+    });
+
+    test('BACK-COMPAT: "csharp.omnisharpUsesMono": false == "omnisharp.useGlobalMono": "auto"', () =>
+    {
+        const csharpConfig = getWorkspaceConfiguration();
+        csharpConfig.update('omnisharpUsesMono', false);
+        const vscode = getVSCode(undefined, csharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.useGlobalMono.should.equal("auto");
+    });
+
+    test('BACK-COMPAT: "csharp.omnisharp" is used if it is set and "omnisharp.path" is not', () =>
+    {
+        const csharpConfig = getWorkspaceConfiguration();
+        csharpConfig.update('omnisharp', 'OldPath');
+        const vscode = getVSCode(undefined, csharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.path.should.equal("OldPath");
+    });
+
+    test('BACK-COMPAT: "csharp.omnisharp" is not used if "omnisharp.path" is set', () =>
+    {
+        const omnisharpConfig = getWorkspaceConfiguration();
+        omnisharpConfig.update('path', 'NewPath');
+        const csharpConfig = getWorkspaceConfiguration();
+        csharpConfig.update('omnisharp', 'OldPath');
+        const vscode = getVSCode(omnisharpConfig, csharpConfig);
+
+        const options = Options.Read(vscode);
+
+        options.path.should.equal("NewPath");
+    });
 });