Skip to content

Fix for AppDomain creation should honor runsettings #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jayaranigarg merged 3 commits into from
May 24, 2018
Merged

Fix for AppDomain creation should honor runsettings #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
657071c
Fix for AppDomain creation should honor runsettings
jayaranigarg May 24, 2018
3cc918b
Adding UT
jayaranigarg May 24, 2018
0294b17
PR comments
jayaranigarg May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/Adapter/PlatformServices.Desktop/Services/DesktopTestSourceHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ internal TestSourceHost(string sourceFileName, IRunSettings runSettings, IFramew
this.SetContext(sourceFileName);

// Set isAppDomainCreationDisabled flag
this.AppDomainCreationDisabledInRunSettings();
this.isAppDomainCreationDisabled = (this.runSettings != null) && MSTestAdapterSettings.IsAppDomainCreationDisabled(this.runSettings.SettingsXml);
}

internal AppDomain AppDomain
Expand Down Expand Up @@ -354,16 +354,6 @@ private void ResetContext()
}
}

private void AppDomainCreationDisabledInRunSettings()
{
if (this.runSettings != null && MSTestAdapterSettings.IsAppDomainCreationDisabled(this.runSettings.SettingsXml))
{
this.isAppDomainCreationDisabled = true;
}

this.isAppDomainCreationDisabled = false;
}

private void AddSearchDirectoriesSpecifiedInRunSettingsToAssemblyResolver(AssemblyResolver assemblyResolver, string baseDirectory)
{
// Check if user specified any adapter settings
Expand Down
60 changes: 60 additions & 0 deletions test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestSourceHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,66 @@ public void DisposeShouldSetTestHostShutdownOnIssueWithAppDomainUnload()
// Assert
frameworkHandle.VerifySet(fh => fh.EnableShutdownAfterTestRun = true);
}

[TestMethod]
public void NoAppDomainShouldGetCreatedWhenDisableAppDomainIsSetToTrue()
{
// Arrange
DummyClass dummyclass = new DummyClass();
string runSettingxml =
@"<RunSettings>
<RunConfiguration>
<DisableAppDomain>True</DisableAppDomain>
</RunConfiguration>
</RunSettings>";

var location = typeof(TestSourceHost).Assembly.Location;
var mockRunSettings = new Mock<IRunSettings>();
mockRunSettings.Setup(rs => rs.SettingsXml).Returns(runSettingxml);

Mock<TestSourceHost> testSourceHost = new Mock<TestSourceHost>(location, mockRunSettings.Object, null) { CallBase = true };

try
{
// Act
testSourceHost.Object.SetupHost();
Assert.IsNull(testSourceHost.Object.AppDomain);
}
finally
{
testSourceHost.Object.Dispose();
}
}

[TestMethod]
public void AppDomainShouldGetCreatedWhenDisableAppDomainIsSetToFalse()
{
// Arrange
DummyClass dummyclass = new DummyClass();
string runSettingxml =
@"<RunSettings>
<RunConfiguration>
<DisableAppDomain>False</DisableAppDomain>
</RunConfiguration>
</RunSettings>";

var location = typeof(TestSourceHost).Assembly.Location;
var mockRunSettings = new Mock<IRunSettings>();
mockRunSettings.Setup(rs => rs.SettingsXml).Returns(runSettingxml);

Mock<TestSourceHost> testSourceHost = new Mock<TestSourceHost>(location, mockRunSettings.Object, null) { CallBase = true };

try
{
// Act
testSourceHost.Object.SetupHost();
Assert.IsNotNull(testSourceHost.Object.AppDomain);
}
finally
{
testSourceHost.Object.Dispose();
}
}
}

public class DummyClass : MarshalByRefObject
Expand Down