diff --git a/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs b/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs index 76de782081..b99e7dd789 100644 --- a/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs +++ b/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs @@ -144,9 +144,6 @@ private ICollection GetTestsInIsolation(string fullFilePath, IR var assemblyEnumerator = isolationHost.CreateInstanceForType( typeof(AssemblyEnumerator), new object[] { MSTestSettings.CurrentSettings }) as AssemblyEnumerator; - // After loading adapter reset the child-domain's appbase to point to test source location - isolationHost.UpdateAppBaseToTestSourceLocation(); - return assemblyEnumerator.EnumerateAssembly(fullFilePath, out warnings); } } diff --git a/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs b/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs index c44f9af324..d7f27bc823 100644 --- a/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs +++ b/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs @@ -222,9 +222,6 @@ private void ExecuteTestsInSource(IEnumerable tests, IRunContext runCo typeof(UnitTestRunner), new object[] { MSTestSettings.CurrentSettings }) as UnitTestRunner; - // After loading adapter reset the chils-domain's appbase to point to test source location - isolationHost.UpdateAppBaseToTestSourceLocation(); - PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("Created unit-test runner {0}", source); // Default test set is filtered tests based on user provided filter criteria @@ -247,11 +244,22 @@ private void ExecuteTestsInSource(IEnumerable tests, IRunContext runCo sourceLevelParameters = sourceLevelParameters.Concat(this.sessionParameters).ToDictionary(x => x.Key, x => x.Value); } - var sourceSettingsProvider = isolationHost.CreateInstanceForType( - typeof(TestAssemblySettingsProvider), - null) as TestAssemblySettingsProvider; + TestAssemblySettingsProvider sourceSettingsProvider = null; + + try + { + sourceSettingsProvider = isolationHost.CreateInstanceForType( + typeof(TestAssemblySettingsProvider), + null) as TestAssemblySettingsProvider; + } + catch (Exception ex) + { + PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo( + "Could not create TestAssemblySettingsProvider instance in child app-domain", + ex); + } - var sourceSettings = sourceSettingsProvider.GetSettings(source); + var sourceSettings = (sourceSettingsProvider != null) ? sourceSettingsProvider.GetSettings(source) : new TestAssemblySettings(); var parallelWorkers = sourceSettings.Workers; var parallelScope = sourceSettings.Scope; diff --git a/src/Adapter/PlatformServices.Desktop/Services/DesktopTestSourceHost.cs b/src/Adapter/PlatformServices.Desktop/Services/DesktopTestSourceHost.cs index 205955f374..8bb64e98c1 100644 --- a/src/Adapter/PlatformServices.Desktop/Services/DesktopTestSourceHost.cs +++ b/src/Adapter/PlatformServices.Desktop/Services/DesktopTestSourceHost.cs @@ -64,7 +64,6 @@ internal TestSourceHost(string sourceFileName, IRunSettings runSettings, IFramew this.sourceFileName = sourceFileName; this.runSettings = runSettings; this.frameworkHandle = frameworkHandle; - this.appDomain = appDomain; // Set the environment context. @@ -109,10 +108,7 @@ public void SetupHost() this.targetFrameworkVersion = this.GetTargetFrameworkVersionString(this.sourceFileName); AppDomainUtilities.SetAppDomainFrameworkVersionBasedOnTestSource(appDomainSetup, this.targetFrameworkVersion); - // Temporarily set appbase to the location from where adapter should be picked up from. We will later reset this to test source location - // once adapter gets loaded in the child app domain. - appDomainSetup.ApplicationBase = Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location); - + appDomainSetup.ApplicationBase = this.GetAppBaseAsPerPlatform(); var configFile = this.GetConfigFileForTestSource(this.sourceFileName); AppDomainUtilities.SetConfigurationFile(appDomainSetup, configFile); @@ -214,17 +210,11 @@ public void Dispose() } /// - /// Updates child-domain's appbase to point to test source location. + /// Gets child-domain's appbase to point to appropriate location. /// - public void UpdateAppBaseToTestSourceLocation() + /// Appbase path that should be set for child appdomain + internal string GetAppBaseAsPerPlatform() { - // Simply return if no child-appdomain was created - if (this.isAppDomainCreationDisabled) - { - return; - } - - // After adapter has been loaded, reset child-appdomains appbase. // The below logic of preferential setting the appdomains appbase is needed because: // 1. We set this to the location of the test source if it is built for Full CLR -> Ideally this needs to be done in all situations. // 2. We set this to the location where the current adapter is being picked up from for UWP and .Net Core scenarios -> This needs to be @@ -234,14 +224,12 @@ public void UpdateAppBaseToTestSourceLocation() // there would be a mismatch of platform service assemblies during discovery. if (this.targetFrameworkVersion.Contains(PlatformServices.Constants.DotNetFrameWorkStringPrefix)) { - this.domain.SetData("APPBASE", Path.GetDirectoryName(this.sourceFileName) ?? Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location)); + return Path.GetDirectoryName(this.sourceFileName) ?? Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location); } else { - this.domain.SetData("APPBASE", Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location)); + return Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location); } - - EqtTrace.Info("DesktopTestSourceHost.UpdateAppBaseToTestSourceLocation(): Updating domain's appbase path for source {0} to {1}.", this.sourceFileName, this.domain.SetupInformation.ApplicationBase); } /// diff --git a/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs b/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs index 6875bca5b8..f404a05d9c 100644 --- a/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs +++ b/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs @@ -27,10 +27,5 @@ public interface ITestSourceHost : IDisposable /// An instance of the type created in the host. /// If a type is to be created in isolation then it needs to be a MarshalByRefObject. object CreateInstanceForType(Type type, object[] args); - - /// - /// Updates child-domain's appbase to point to test source location - /// - void UpdateAppBaseToTestSourceLocation(); } } diff --git a/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs b/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs index bde6958a33..453d1ec797 100644 --- a/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs +++ b/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs @@ -64,14 +64,6 @@ public object CreateInstanceForType(Type type, object[] args) return Activator.CreateInstance(type, args); } - /// - /// Updates child-domain's appbase to point to test source location - /// - public void UpdateAppBaseToTestSourceLocation() - { - // Do nothing. - } - /// /// Sets context required for running tests. /// diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestSourceHost.cs b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestSourceHost.cs index 4deeb0da2c..5967600f70 100644 --- a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestSourceHost.cs +++ b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestSourceHost.cs @@ -53,14 +53,6 @@ public void Dispose() { // Do nothing. } - - /// - /// Updates child-domain's appbase to point to test source location - /// - public void UpdateAppBaseToTestSourceLocation() - { - // Do nothing. - } } #pragma warning restore SA1649 // SA1649FileNameMustMatchTypeName diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestSourceHostTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestSourceHostTests.cs index 22af3fe0d8..1a60530989 100644 --- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestSourceHostTests.cs +++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestSourceHostTests.cs @@ -106,7 +106,7 @@ public void CreateInstanceForTypeShouldCreateTheTypeInANewAppDomain() } [TestMethod] - public void SetupHostShouldSetChildDomainsAppBaseToAdapterLocation() + public void SetupHostShouldSetChildDomainsAppBaseToTestSourceLocation() { // Arrange DummyClass dummyclass = new DummyClass(); @@ -121,7 +121,7 @@ public void SetupHostShouldSetChildDomainsAppBaseToAdapterLocation() var expectedObject = sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass; // Assert - Assert.AreEqual(Path.GetDirectoryName(location), expectedObject.AppDomainAppBase); + Assert.AreEqual(Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location), expectedObject.AppDomainAppBase); } finally { @@ -185,66 +185,6 @@ public void SetupHostShouldSetResolutionsPaths() } } - /// - /// This test should ideally be choosing a different path for the test source. Currently both the test source and the adapter - /// are in the same location. However when we move to run these tests with the V2 itself, then this would be valid. - /// Leaving the test running till then. - /// - [TestMethod] - public void UpdateAppBaseToTestSourceLocationShouldSetDomainsAppBaseToTestSourceLocationForFullCLRTestss() - { - // Arrange - DummyClass dummyclass = new DummyClass(); - - var location = typeof(DesktopTestSourceHostTests).Assembly.Location; - var sourceHost = new Mock(location, null, null) { CallBase = true }; - try - { - sourceHost.Setup(tsh => tsh.GetTargetFrameworkVersionString(location)) - .Returns(".NETFramework,Version=v4.5.1"); - - // Act - sourceHost.Object.SetupHost(); - var expectedObject = - sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass; - sourceHost.Object.UpdateAppBaseToTestSourceLocation(); - - // Assert - Assert.AreEqual(Path.GetDirectoryName(location), expectedObject.AppDomainAppBase); - } - finally - { - sourceHost.Object.Dispose(); - } - } - - [TestMethod] - public void UpdateAppBaseToTestSourceLocationShouldSetDomainsAppBaseToAdaptersLocationForNonFullCLRTests() - { - // Arrange - DummyClass dummyclass = new DummyClass(); - - var location = typeof(TestSourceHost).Assembly.Location; - Mock sourceHost = new Mock(location, null, null) { CallBase = true }; - - try - { - sourceHost.Setup(tsh => tsh.GetTargetFrameworkVersionString(location)).Returns(".NETCore,Version=v5.0"); - - // Act - sourceHost.Object.SetupHost(); - var expectedObject = sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass; - sourceHost.Object.UpdateAppBaseToTestSourceLocation(); - - // Assert - Assert.AreEqual(Path.GetDirectoryName(location), expectedObject.AppDomainAppBase); - } - finally - { - sourceHost.Object.Dispose(); - } - } - [TestMethod] public void DisposeShouldSetTestHostShutdownOnIssueWithAppDomainUnload() {