PR Feedback

Author: Paul van Brenk

Nodejs/Product/TestAdapter/JavaScriptTestExecutor.cs

@@ -14,13 +14,17 @@ public class JavaScriptTestExecutor : ITestExecutor
         public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
             AssemblyResolver.SetupHandler();
+
+            this.Cancel();
             this.worker = new TestExecutorWorker(runContext, frameworkHandle);
             this.worker.RunTests(tests);
         }
 
         public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
             AssemblyResolver.SetupHandler();
+
+            this.Cancel();
             this.worker = new TestExecutorWorker(runContext, frameworkHandle);
             this.worker.RunTests(sources, new JavaScriptTestDiscoverer());
         }

Nodejs/Product/TestAdapter/PackageJsonTestExecutor.cs

@@ -19,13 +19,17 @@ public void Cancel()
         public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
             AssemblyResolver.SetupHandler();
+
+            this.Cancel();
             this.worker = new TestExecutorWorker(runContext, frameworkHandle);
             this.worker.RunTests(sources, new PackageJsonTestDiscoverer());
         }
 
         public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
             AssemblyResolver.SetupHandler();
+
+            this.Cancel();
             this.worker = new TestExecutorWorker(runContext, frameworkHandle);
             this.worker.RunTests(tests);
         }

Nodejs/Product/TestAdapter/TestAdapter.csproj

@@ -75,7 +75,7 @@
     <Compile Include="JavaScriptTestCaseProperties.cs" />
     <Compile Include="TestFrameworks\NodejsTestInfo.cs" />
     <Compile Include="TestFrameworks\TestFramework.cs" />
-    <Compile Include="TestReceiver.cs" />
+    <Compile Include="TestExecutorWorker.TestReceiver.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">

…dejs/Product/TestAdapter/TestReceiver.cs …apter/TestExecutorWorker.TestReceiver.csNodejs/Product/TestAdapter/TestReceiver.cs renamed to Nodejs/Product/TestAdapter/TestExecutorWorker.TestReceiver.cs Nodejs/Product/TestAdapter/TestReceiver.cs renamed to Nodejs/Product/TestAdapter/TestExecutorWorker.TestReceiver.cs

@@ -6,13 +6,16 @@
 
 namespace Microsoft.NodejsTools.TestAdapter
 {
-    internal sealed class TestReceiver : ITestCaseDiscoverySink
+    internal sealed partial class TestExecutorWorker
     {
-        public readonly List<TestCase> Tests = new List<TestCase>();
-
-        public void SendTestCase(TestCase discoveredTest)
+        private sealed class TestReceiver : ITestCaseDiscoverySink
         {
-            this.Tests.Add(discoveredTest);
+            public readonly List<TestCase> Tests = new List<TestCase>();
+
+            public void SendTestCase(TestCase discoveredTest)
+            {
+                this.Tests.Add(discoveredTest);
+            }
         }
     }
 }

Nodejs/Product/TestAdapter/TestExecutorWorker.cs

@@ -17,7 +17,7 @@
 
 namespace Microsoft.NodejsTools.TestAdapter
 {
-    internal sealed class TestExecutorWorker
+    internal sealed partial class TestExecutorWorker
     {
         private static readonly Version Node8Version = new Version(8, 0);
 
@@ -59,7 +59,8 @@ public void RunTests(IEnumerable<string> sources, ITestDiscoverer discoverer)
             ValidateArg.NotNull(sources, nameof(sources));
             ValidateArg.NotNull(discoverer, nameof(discoverer));
 
-            this.cancelRequested.Reset();
+            // Cancel any running tests before starting a new batch
+            this.Cancel();
 
             var receiver = new TestReceiver();
             discoverer.DiscoverTests(sources, /*discoveryContext*/null, this.frameworkHandle, receiver);
@@ -81,7 +82,9 @@ public void RunTests(IEnumerable<string> sources, ITestDiscoverer discoverer)
         public void RunTests(IEnumerable<TestCase> tests)
         {
             ValidateArg.NotNull(tests, nameof(tests));
-            this.cancelRequested.Reset();
+
+            // Cancel any running tests before starting a new batch
+            this.Cancel();
 
             // .ts file path -> project settings
             var fileToTests = new Dictionary<string, List<TestCase>>();
@@ -97,12 +100,12 @@ public void RunTests(IEnumerable<TestCase> tests)
             }
 
             // where key is the file and value is a list of tests
-            foreach (var entry in fileToTests)
+            foreach (var testcaseList in fileToTests.Values)
             {
-                this.currentTests = entry.Value;
+                this.currentTests = testcaseList;
 
                 // Run all test cases in a given file
-                RunTestCases(entry.Value);
+                RunTestCases(testcaseList);
             }
         }
 
@@ -343,7 +346,6 @@ private void AttachDebugger(int vsProcessId, int port, Version nodeVersion)
 #endif
         }
 
-
         private static int GetFreePort()
         {
             return Enumerable.Range(new Random().Next(49152, 65536), 60000).Except(