From c6110ec848f56a74829f53c657bb3578550cbb00 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 29 Jun 2020 15:39:52 -0700 Subject: [PATCH] rename global run settings to not overlap with other test adapter --- .../Helpers/RunSettingsServiceUnderTest.cs | 2 +- .../TestAdapter.Tests/Settings/RunSettingsServiceTests.cs | 4 ++-- .../TestAdapter/Settings/GlobalRunSettingsProvider.cs | 6 +++--- .../TestAdapter/Settings/IGlobalRunSettings.cs | 2 +- .../TestAdapter/Settings/IGlobalRunSettingsInternal.cs | 2 +- .../TestAdapter/Settings/RunSettingsService.cs | 4 ++-- .../VsPackage.GTA/GoogleTestExtensionOptionsPage.cs | 4 ++-- .../VsPackage.Shared/GoogleTestExtensionOptionsPage.cs | 2 +- .../VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs b/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs index 41821dbb1..275b77c19 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs @@ -6,7 +6,7 @@ public class RunSettingsServiceUnderTest : RunSettingsService { private readonly string _solutionRunSettingsFile; - internal RunSettingsServiceUnderTest(IGlobalRunSettings globalRunSettings, string solutionRunSettingsFile) + internal RunSettingsServiceUnderTest(IGlobalRunSettings2 globalRunSettings, string solutionRunSettingsFile) : base(globalRunSettings) { _solutionRunSettingsFile = solutionRunSettingsFile; diff --git a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs b/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs index 0f8f58067..773567c89 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs @@ -305,7 +305,7 @@ private RunSettingsService SetupRunSettingsService(string solutionRunSettingsFil TraitsRegexesBefore = "Global" }; - var mockGlobalRunSettings = new Mock(); + var mockGlobalRunSettings = new Mock(); mockGlobalRunSettings.Setup(grs => grs.RunSettings).Returns(globalRunSettings); return new RunSettingsServiceUnderTest(mockGlobalRunSettings.Object, solutionRunSettingsFile); @@ -345,7 +345,7 @@ private RunSettingsContainer SetupFinalRunSettingsContainer( string userSolutionWorkingDir, string userProject1WorkingDir, string userProject3WorkingDir) { var globalSettings = new RunSettings { ProjectRegex = null, WorkingDir = GlobalWorkingDir }; - var mockGlobalRunSettings = new Mock(); + var mockGlobalRunSettings = new Mock(); mockGlobalRunSettings.Setup(grs => grs.RunSettings).Returns(globalSettings); var solutionSettingsContainer = SetupSettingsContainer(solutionSolutionWorkingDir, solutionProject1WorkingDir, solutionProject2WorkingDir, null); diff --git a/GoogleTestAdapter/TestAdapter/Settings/GlobalRunSettingsProvider.cs b/GoogleTestAdapter/TestAdapter/Settings/GlobalRunSettingsProvider.cs index cc1bf4e95..aa1b96216 100644 --- a/GoogleTestAdapter/TestAdapter/Settings/GlobalRunSettingsProvider.cs +++ b/GoogleTestAdapter/TestAdapter/Settings/GlobalRunSettingsProvider.cs @@ -4,9 +4,9 @@ namespace GoogleTestAdapter.TestAdapter.Settings { - [Export(typeof(IGlobalRunSettings))] - [Export(typeof(IGlobalRunSettingsInternal))] - public class GlobalRunSettingsProvider : IGlobalRunSettingsInternal + [Export(typeof(IGlobalRunSettings2))] + [Export(typeof(IGlobalRunSettingsInternal2))] + public class GlobalRunSettingsProvider : IGlobalRunSettingsInternal2 { public RunSettings RunSettings { get; set; } = new RunSettings(); } diff --git a/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettings.cs b/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettings.cs index 793442bda..b6f7fefff 100644 --- a/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettings.cs +++ b/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettings.cs @@ -3,7 +3,7 @@ namespace GoogleTestAdapter.TestAdapter.Settings { - public interface IGlobalRunSettings + public interface IGlobalRunSettings2 { RunSettings RunSettings { get; } } diff --git a/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettingsInternal.cs b/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettingsInternal.cs index 67b19f5c4..91ae7e5ff 100644 --- a/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettingsInternal.cs +++ b/GoogleTestAdapter/TestAdapter/Settings/IGlobalRunSettingsInternal.cs @@ -3,7 +3,7 @@ namespace GoogleTestAdapter.TestAdapter.Settings { - public interface IGlobalRunSettingsInternal : IGlobalRunSettings + public interface IGlobalRunSettingsInternal2 : IGlobalRunSettings2 { new RunSettings RunSettings { get; set; } } diff --git a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs b/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs index 871ed5679..7aae9a108 100644 --- a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs +++ b/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs @@ -22,10 +22,10 @@ public class RunSettingsService : IRunSettingsService { public string Name => GoogleTestConstants.SettingsName; - private readonly IGlobalRunSettings _globalRunSettings; + private readonly IGlobalRunSettings2 _globalRunSettings; [ImportingConstructor] - public RunSettingsService([Import(typeof(IGlobalRunSettings))] IGlobalRunSettings globalRunSettings) + public RunSettingsService([Import(typeof(IGlobalRunSettings2))] IGlobalRunSettings2 globalRunSettings) { _globalRunSettings = globalRunSettings; } diff --git a/GoogleTestAdapter/VsPackage.GTA/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.GTA/GoogleTestExtensionOptionsPage.cs index faeff3bbc..af8f64e93 100644 --- a/GoogleTestAdapter/VsPackage.GTA/GoogleTestExtensionOptionsPage.cs +++ b/GoogleTestAdapter/VsPackage.GTA/GoogleTestExtensionOptionsPage.cs @@ -30,7 +30,7 @@ protected override void Initialize() if (!_isAsyncLoadSupported) { var componentModel = (IComponentModel)GetGlobalService(typeof(SComponentModel)); - _globalRunSettings = componentModel.GetService(); + _globalRunSettings = componentModel.GetService(); DoInitialize(); } } @@ -46,7 +46,7 @@ IVsTask IAsyncLoadablePackageInitialize.Initialize(IAsyncServiceProvider service return ThreadHelper.JoinableTaskFactory.RunAsync(async () => { var componentModel = await serviceProvider.GetServiceAsync(typeof(SComponentModel)); - _globalRunSettings = componentModel.GetService(); + _globalRunSettings = componentModel.GetService(); await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); diff --git a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs index 0b48ed17d..fd6c5967b 100644 --- a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs +++ b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs @@ -29,7 +29,7 @@ public sealed partial class GoogleTestExtensionOptionsPage : IGoogleTestExtensio { private readonly string _debuggingNamedPipeId = Guid.NewGuid().ToString(); - private IGlobalRunSettingsInternal _globalRunSettings; + private IGlobalRunSettingsInternal2 _globalRunSettings; private GeneralOptionsDialogPage _generalOptions; private ParallelizationOptionsDialogPage _parallelizationOptions; diff --git a/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs index 4dccad96f..6c6207236 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs +++ b/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs @@ -27,7 +27,7 @@ protected override async System.Threading.Tasks.Task InitializeAsync(Cancellatio await base.InitializeAsync(cancellationToken, progress); var componentModel = await GetServiceAsync(typeof(SComponentModel)) as IComponentModel; - _globalRunSettings = componentModel.GetService(); + _globalRunSettings = componentModel.GetService(); await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);