Merge pull request #4602 from Toucan4Life/master

"testRunSettings" option is now available through solution

Author: JoeRobich

src/features/dotnetTest.ts

@@ -19,6 +19,7 @@ import LaunchConfiguration from './launchConfiguration';
 import Disposable from '../Disposable';
 import CompositeDisposable from '../CompositeDisposable';
 import { LanguageMiddlewareFeature } from '../omnisharp/LanguageMiddlewareFeature';
+import OptionProvider from '../observers/OptionProvider';
 
 const TelemetryReportingDelay = 2 * 60 * 1000; // two minutes
 
@@ -29,7 +30,7 @@ export default class TestManager extends AbstractProvider {
     private _telemetryIntervalId: NodeJS.Timer = undefined;
     private _eventStream: EventStream;
 
-    constructor(server: OmniSharpServer, eventStream: EventStream, languageMiddlewareFeature: LanguageMiddlewareFeature) {
+    constructor(private optionProvider: OptionProvider, server: OmniSharpServer, eventStream: EventStream, languageMiddlewareFeature: LanguageMiddlewareFeature) {
         super(server, languageMiddlewareFeature);
         this._eventStream = eventStream;
 
@@ -192,7 +193,7 @@ export default class TestManager extends AbstractProvider {
     }
 
     private _getRunSettings(filename: string): string | undefined {
-        const testSettingsPath = vscode.workspace.getConfiguration('omnisharp').get<string>('testRunSettings');
+        const testSettingsPath = this.optionProvider.GetLatestOptions().testRunSettings;
         if (!testSettingsPath) {
             return undefined;
         }

src/omnisharp/extension.ts

@@ -67,7 +67,7 @@ export async function activate(context: vscode.ExtensionContext, packageJSON: an
     languageMiddlewareFeature.register();
     disposables.add(languageMiddlewareFeature);
     let localDisposables: CompositeDisposable;
-    const testManager = new TestManager(server, eventStream, languageMiddlewareFeature);
+    const testManager = new TestManager(optionProvider, server, eventStream, languageMiddlewareFeature);
     const completionProvider = new CompletionProvider(server, languageMiddlewareFeature);
 
     disposables.add(server.onServerStart(() => {

src/omnisharp/options.ts

@@ -40,7 +40,8 @@ export class Options {
         public monoPath?: string,
         public dotnetPath?: string,
         public excludePaths?: string[],
-        public maxProjectFileCountForDiagnosticAnalysis?: number | null) {
+        public maxProjectFileCountForDiagnosticAnalysis?: number | null,
+        public testRunSettings?: string) {
     }
 
     public static Read(vscode: vscode): Options {
@@ -108,6 +109,8 @@ export class Options {
 
         const maxProjectFileCountForDiagnosticAnalysis = csharpConfig.get<number | null>('maxProjectFileCountForDiagnosticAnalysis', 1000);
 
+        const testRunSettings = omnisharpConfig.get<string>('testRunSettings', undefined);
+
         const excludePaths = this.getExcludedPaths(vscode);
 
         return new Options(
@@ -144,7 +147,8 @@ export class Options {
             monoPath,
             dotnetPath,
             excludePaths,
-            maxProjectFileCountForDiagnosticAnalysis
+            maxProjectFileCountForDiagnosticAnalysis,
+            testRunSettings
         );
     }
 

test/unitTests/options.test.ts

@@ -34,6 +34,7 @@ suite("Options tests", () => {
         options.enableEditorConfigSupport.should.equal(false);
         options.enableDecompilationSupport.should.equal(false);
         options.enableImportCompletion.should.equal(false);
+        expect(options.testRunSettings).to.be.undefined;
         expect(options.defaultLaunchSolution).to.be.undefined;
     });
 
@@ -143,4 +144,13 @@ suite("Options tests", () => {
 
         options.defaultLaunchSolution.should.equal("some_valid_solution.sln");
     });
+
+    test('"omnisharp.testRunSettings" is used if set', () => {
+        const vscode = getVSCodeWithConfig();
+        updateConfig(vscode, 'omnisharp', 'testRunSettings', 'some_valid_path\\some_valid_runsettings_files.runsettings');
+
+        const options = Options.Read(vscode);
+
+        options.testRunSettings.should.equal("some_valid_path\\some_valid_runsettings_files.runsettings");
+    });
 });