From 0eaf76ca81df8fcabd45d015fe0aee463617df6f Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpar@microsoft.com>
Date: Thu, 20 Aug 2015 15:54:02 -0700
Subject: [PATCH] Distinguish between Run and RunAll

---
 xunit.runner.data/Constants.cs              | 2 +-
 xunit.runner.worker/Program.cs              | 4 ++--
 xunit.runner.worker/RunUtil.cs              | 4 ++--
 xunit.runner.wpf/ITestUtil.cs               | 2 +-
 xunit.runner.wpf/Impl/RemoteTestUtil.cs     | 8 ++++----
 xunit.runner.wpf/ViewModel/MainViewModel.cs | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xunit.runner.data/Constants.cs b/xunit.runner.data/Constants.cs
index 8b942cf..64dbfa9 100644
--- a/xunit.runner.data/Constants.cs
+++ b/xunit.runner.data/Constants.cs
@@ -9,7 +9,7 @@ namespace xunit.runner.data
     public static class Constants
     {
         public const string ActionDiscover = "discover";
-        public const string ActionRun = "run";
+        public const string ActionRunAll = "runall";
         public static readonly Encoding Encoding = Encoding.UTF8;
     }
 }
diff --git a/xunit.runner.worker/Program.cs b/xunit.runner.worker/Program.cs
index 2883617..1cdb80c 100644
--- a/xunit.runner.worker/Program.cs
+++ b/xunit.runner.worker/Program.cs
@@ -39,7 +39,7 @@ namespace xunit.runner.worker
                         case Constants.ActionDiscover:
                             Discover(stream, argument);
                             break;
-                        case Constants.ActionRun:
+                        case Constants.ActionRunAll:
                             Run(stream, argument);
                             break;
                         default:
@@ -81,7 +81,7 @@ namespace xunit.runner.worker
         private static void Run(Stream stream, string assemblyPath)
         {
             Console.WriteLine($"run started: {assemblyPath}");
-            RunUtil.Go(assemblyPath, stream);
+            RunUtil.RunAll(assemblyPath, stream);
             Console.WriteLine("run ended");
         }
 
diff --git a/xunit.runner.worker/RunUtil.cs b/xunit.runner.worker/RunUtil.cs
index bf0814d..87f463b 100644
--- a/xunit.runner.worker/RunUtil.cs
+++ b/xunit.runner.worker/RunUtil.cs
@@ -63,12 +63,12 @@ namespace xunit.runner.worker
             }
         }
 
-        internal static void Go(string assemblyPath, Stream stream)
+        internal static void RunAll(string assemblyPath, Stream stream)
         {
             using (AssemblyHelper.SubscribeResolve())
             using (var xunit = new XunitFrontController(
                 assemblyFileName: assemblyPath,
-                useAppDomain: true,
+                useAppDomain: false,
                 shadowCopy: false,
                 diagnosticMessageSink: new MessageVisitor()))
             using (var writer = new ClientWriter(stream))
diff --git a/xunit.runner.wpf/ITestUtil.cs b/xunit.runner.wpf/ITestUtil.cs
index cff9d75..85aa860 100644
--- a/xunit.runner.wpf/ITestUtil.cs
+++ b/xunit.runner.wpf/ITestUtil.cs
@@ -21,7 +21,7 @@ namespace xunit.runner.wpf
         /// <summary>
         /// Begin a run of a unit test for the given assembly.
         /// </summary>
-        ITestRunSession Run(string assemblyPath, CancellationToken cancellationToken = default(CancellationToken));
+        ITestRunSession RunAll(string assemblyPath, CancellationToken cancellationToken = default(CancellationToken));
     }
 
     internal interface ITestSession
diff --git a/xunit.runner.wpf/Impl/RemoteTestUtil.cs b/xunit.runner.wpf/Impl/RemoteTestUtil.cs
index 3c64cce..1e2dc6f 100644
--- a/xunit.runner.wpf/Impl/RemoteTestUtil.cs
+++ b/xunit.runner.wpf/Impl/RemoteTestUtil.cs
@@ -51,9 +51,9 @@ namespace xunit.runner.wpf.Impl
             return new DiscoverSession(connection, _dispatcher, cancellationToken);
         }
 
-        private RunSession Run(string assemblyPath, CancellationToken cancellationToken)
+        private RunSession RunAll(string assemblyPath, CancellationToken cancellationToken)
         {
-            var connection = StartWorkerProcess(Constants.ActionRun, assemblyPath);
+            var connection = StartWorkerProcess(Constants.ActionRunAll, assemblyPath);
             return new RunSession(connection, _dispatcher, cancellationToken);
         }
 
@@ -64,9 +64,9 @@ namespace xunit.runner.wpf.Impl
             return Discover(assemblyPath, cancellationToken);
         }
 
-        ITestRunSession ITestUtil.Run(string assemblyPath, CancellationToken cancellationToken)
+        ITestRunSession ITestUtil.RunAll(string assemblyPath, CancellationToken cancellationToken)
         {
-            return Run(assemblyPath, cancellationToken);
+            return RunAll(assemblyPath, cancellationToken);
         }
 
         #endregion
diff --git a/xunit.runner.wpf/ViewModel/MainViewModel.cs b/xunit.runner.wpf/ViewModel/MainViewModel.cs
index 4a5cda5..02b63c3 100644
--- a/xunit.runner.wpf/ViewModel/MainViewModel.cs
+++ b/xunit.runner.wpf/ViewModel/MainViewModel.cs
@@ -336,7 +336,7 @@ namespace xunit.runner.wpf.ViewModel
             this.cancellationTokenSource = new CancellationTokenSource();
             foreach (var assemblyPath in TestCases.Select(x => x.AssemblyFileName).Distinct())
             {
-                var session = this.testUtil.Run(assemblyPath, this.cancellationTokenSource.Token);
+                var session = this.testUtil.RunAll(assemblyPath, this.cancellationTokenSource.Token);
                 session.TestFinished += OnTestFinished;
                 session.SessionFinished += delegate { OnTestSessionFinished(session); };
                 this.testSessionList.Add(session);