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

[TouchRunner] Fix running multiple test assemblies in NUnitLite mode. #76

Merged
merged 1 commit into from
Jul 14, 2020
Merged

[TouchRunner] Fix running multiple test assemblies in NUnitLite mode. #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions NUnitLite/TouchRunner/TouchRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,15 +474,21 @@ SettingsDictionary CreateSettings (SettingsDictionary settings)
}

#if NUNITLITE_NUGET
NUnitTestAssemblyRunner runner = new NUnitTestAssemblyRunner (new DefaultTestAssemblyBuilder ());
// we need one runner per test assembly
DefaultTestAssemblyBuilder builder = new DefaultTestAssemblyBuilder ();
List<NUnitTestAssemblyRunner> runners = new List<NUnitTestAssemblyRunner> ();

public bool Load (string assemblyName, IDictionary<string, object> settings = null)
{
var runner = new NUnitTestAssemblyRunner (builder);
runners.Add (runner);
return AddSuite ((TestSuite) runner.Load (assemblyName, CreateSettings (settings)));
}

public bool Load (Assembly assembly, IDictionary<string, object> settings = null)
{
var runner = new NUnitTestAssemblyRunner (builder);
runners.Add (runner);
return AddSuite ((TestSuite) runner.Load (assembly, CreateSettings (settings)));
}
#else
Expand Down Expand Up @@ -517,7 +523,9 @@ public TestResult Run (Test test)
Result = null;

#if NUNITLITE_NUGET
runner.Run (this, new MatchTestFilter { MatchTest = test });
var filter = new MatchTestFilter { MatchTest = test };
foreach (var runner in runners)
runner.Run (this, filter);

// The TestResult we get back from the runner is for the top-most test suite,
// which isn't necessarily the test that we ran. So look for the TestResult
Expand All @@ -534,7 +542,13 @@ ITestResult find_result (ITestResult tr)
return null;
}

Result = (TestResult) (find_result (runner.Result) ?? runner.Result);
var tsr = new TestSuiteResult (suite);
foreach (var runner in runners) {
var rv = (TestResult) (find_result (runner.Result) ?? runner.Result);
if (rv != null)
tsr.AddResult (rv);
}
Result = tsr;
#else
TestExecutionContext current = TestExecutionContext.CurrentContext;
current.WorkDirectory = Environment.CurrentDirectory;
Expand Down