"testRunSettings" option is now available through solution

Author: Toucan4Life

package.json

@@ -826,6 +826,11 @@
           "default": false,
           "description": "(EXPERIMENTAL) Enables support for resolving completion edits asynchronously. This can speed up time to show the completion list, particularly override and partial method completion lists, at the cost of slight delays after inserting a completion item. Most completion items will have no noticeable impact with this feature, but typing immediately after inserting an override or partial method completion, before the insert is completed, can have unpredictable results."
         },
+        "omnisharp.testRunSettings": {
+          "type": "string",
+          "default": null,
+          "description": "Specifies the path to the .runSettings file used to run the unit tests"
+        },
         "razor.plugin.path": {
           "type": [
             "string",

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;
 
@@ -172,8 +173,8 @@ export default class TestManager extends AbstractProvider {
     public async discoverTests(fileName: string, testFrameworkName: string, noBuild: boolean): Promise<protocol.V2.TestInfo[]> {
 
         let targetFrameworkVersion = await this._recordRunAndGetFrameworkVersion(fileName, testFrameworkName);
-        let runSettings = vscode.workspace.getConfiguration('omnisharp').get<string>('testRunSettings');
-
+        let runSettings = this._getRunSettings();
+        
         const request: protocol.V2.DiscoverTestsRequest = {
             FileName: fileName,
             RunSettings: runSettings,
@@ -192,7 +193,7 @@ export default class TestManager extends AbstractProvider {
     }
 
     private _getRunSettings(): string | undefined {
-        return vscode.workspace.getConfiguration('omnisharp').get<string>('testRunSettings');
+        return this.optionProvider.GetLatestOptions().testRunSettings;
     }
 
     public async runDotnetTest(testMethod: string, fileName: string, testFrameworkName: string, noBuild: boolean = false) {

src/omnisharp/extension.ts

@@ -63,7 +63,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

@@ -38,7 +38,8 @@ export class Options {
         public defaultLaunchSolution?: string,
         public monoPath?: string,
         public excludePaths?: string[],
-        public maxProjectFileCountForDiagnosticAnalysis?: number | null) {
+        public maxProjectFileCountForDiagnosticAnalysis?: number | null,
+        public testRunSettings?: string) {
     }
 
     public static Read(vscode: vscode): Options {
@@ -104,6 +105,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(
@@ -138,7 +141,8 @@ export class Options {
             defaultLaunchSolution,
             monoPath,
             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");
+    });
 });