Skip to content
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

Jump to bottom

Fixing Key collision for test run parameters #328

Merged
merged 8 commits into from
Dec 6, 2017
Merged

Fixing Key collision for test run parameters #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96faa96
Base commit
jayaranigarg Dec 6, 2017
ed8f27c
Adding Unit Test
jayaranigarg Dec 6, 2017
bf1bf88
Merge branch 'master' into keycollisionfix
jayaranigarg Dec 6, 2017
ddee7e5
PR comments
jayaranigarg Dec 6, 2017
bfd4da6
Merge branch 'keycollisionfix' of https://github.com/jayaranigarg/tes…
jayaranigarg Dec 6, 2017
1dd31e3
Adding logs for diagnostics
jayaranigarg Dec 6, 2017
2953910
Ignoring Test Temporarily
jayaranigarg Dec 6, 2017
fe747b3
Removing ignore
jayaranigarg Dec 6, 2017
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
3 changes: 3 additions & 0 deletions src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,9 @@ private void CacheSessionParameters(IRunContext runContext, ITestExecutionRecord
var testRunParameters = RunSettingsUtilities.GetTestRunParameters(runContext.RunSettings.SettingsXml);
if (testRunParameters != null)
{
// Clear sessionParameters to prevent key collisions of test run parameters in case
// "Keep Test Execution Engine Alive" is selected in VS.
this.sessionParameters.Clear();
foreach (var kvp in testRunParameters)
{
this.sessionParameters.Add(kvp);
Expand Down
34 changes: 33 additions & 1 deletion test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,38 @@ public void RunTestsForTestShouldPassInDeploymentInformationAsPropertiesToTheTes
testablePlatformService.MockSettingsProvider.Verify(sp => sp.GetProperties(It.IsAny<string>()), Times.Once);
}

[TestMethodV1]
public void RunTestsShouldClearSessionParametersAcrossRuns()
{
var testCase = this.GetTestCase(typeof(DummyTestClass), "PassingTest");

TestCase[] tests = new[] { testCase };
this.runContext.MockRunSettings.Setup(rs => rs.SettingsXml).Returns(
@"<RunSettings>
<TestRunParameters>
<Parameter name=""webAppUrl"" value=""http://localhost"" />
<Parameter name = ""webAppUserName"" value=""Admin"" />
</TestRunParameters>
</RunSettings>");

// Trigger First Run
this.TestExecutionManager.RunTests(tests, this.runContext, this.frameworkHandle, new TestRunCancellationToken());

// Update runsettings to have different values for similar keys
this.runContext.MockRunSettings.Setup(rs => rs.SettingsXml).Returns(
@"<RunSettings>
<TestRunParameters>
<Parameter name=""webAppUrl"" value=""http://updatedLocalHost"" />
<Parameter name = ""webAppUserName"" value=""Admin"" />
</TestRunParameters>
</RunSettings>");

// Trigger another Run
this.TestExecutionManager.RunTests(tests, this.runContext, this.frameworkHandle, new TestRunCancellationToken());

Assert.AreEqual(DummyTestClass.TestContextProperties["webAppUrl"], "http://updatedLocalHost");
}

#endregion

#region Run Tests on Sources
Expand Down Expand Up @@ -620,7 +652,7 @@ public void RunTestsForTestShouldRunNonParallelizableTestsSeparately()

Assert.AreEqual(2, DummyTestClassWithDoNotParallelizeMethods.ParallelizableTestsThreadIds.Count);
Assert.AreEqual(1, DummyTestClassWithDoNotParallelizeMethods.UnParallelizableTestsThreadIds.Count);
Assert.IsTrue(DummyTestClassWithDoNotParallelizeMethods.LastParallelizableTestRun.TimeOfDay.TotalMilliseconds < DummyTestClassWithDoNotParallelizeMethods.FirstUnParallelizableTestRun.TimeOfDay.TotalMilliseconds);
Assert.IsTrue(DummyTestClassWithDoNotParallelizeMethods.LastParallelizableTestRun.TimeOfDay.TotalMilliseconds <= DummyTestClassWithDoNotParallelizeMethods.FirstUnParallelizableTestRun.TimeOfDay.TotalMilliseconds);
}
finally
{
Expand Down