PR feedback

Author: Paul van Brenk

Nodejs/Product/Nodejs/Workspace/PackageJsonTestContainerDiscoverer.cs

@@ -62,22 +62,23 @@ public IEnumerable<ITestContainer> TestContainers
 
         private async Task AttemptUpdateAsync()
         {
-            if (this.currentWorkspace != null)
+            var workspace = this.currentWorkspace;
+            if (workspace != null)
             {
-                var indexServce = this.currentWorkspace.GetIndexWorkspaceService();
-                var filesDataValues = await indexServce.GetFilesDataValuesAsync<string>(NodejsConstants.TestRootDataValueGuid);
+                var indexService = workspace.GetIndexWorkspaceService();
+                var filesDataValues = await indexService.GetFilesDataValuesAsync<string>(NodejsConstants.TestRootDataValueGuid);
 
                 lock (this.containerLock)
                 {
                     this.containers.Clear();
                     foreach (var dataValue in filesDataValues)
                     {
-                        var rootFilePath = this.currentWorkspace.MakeRooted(dataValue.Key);
-                        var testRoot = dataValue.Value.Where(f => f.Name == "TestRoot").Select(f => f.Value).FirstOrDefault();
+                        var rootFilePath = workspace.MakeRooted(dataValue.Key);
+                        var testRoot = dataValue.Value.Where(f => f.Name == "TestRoot").FirstOrDefault()?.Value;
 
                         if (!string.IsNullOrEmpty(testRoot))
                         {
-                            var testRootPath = this.currentWorkspace.MakeRooted(testRoot);
+                            var testRootPath = workspace.MakeRooted(testRoot);
                             this.containers.Add(new PackageJsonTestContainer(this, rootFilePath, testRootPath));
                         }
                     }

Nodejs/Product/TestAdapter/JavaScriptTestDiscoverer.cs

@@ -161,7 +161,7 @@ private void DiscoverTests(Dictionary<string, HashSet<TestFileEntry>> testItems,
             var testCount = 0;
             foreach (var testFx in testItems.Keys)
             {
-                var testFramework = FrameworkDiscover.Intance.Get(testFx);
+                var testFramework = FrameworkDiscoverer.Instance.Get(testFx);
                 if (testFramework == null)
                 {
                     logger.SendMessage(TestMessageLevel.Warning, $"Ignoring unsupported test framework '{testFx}'.");

Nodejs/Product/TestAdapter/PackageJsonTestDiscoverer.cs

@@ -52,13 +52,13 @@ private void DiscoverTestFiles(string packageJsonPath, IMessageLogger logger, IT
 
             foreach (var dep in packageJson.AllDependencies)
             {
-                testFx = FrameworkDiscover.Intance.Get(dep.Name);
+                testFx = FrameworkDiscoverer.Instance.Get(dep.Name);
                 if (testFx != null)
                 {
                     break;
                 }
             }
-            testFx = testFx ?? FrameworkDiscover.Intance.Get("ExportRunner");
+            testFx = testFx ?? FrameworkDiscoverer.Instance.Get("ExportRunner");
 
             var nodeExePath = Nodejs.GetPathToNodeExecutableFromEnvironment();
 

Nodejs/Product/TestAdapter/TestExecutorWorker.cs

@@ -356,7 +356,7 @@ private static TestFramework.ArgumentsToRunTests GetInterpreterArgs(TestCase tes
         {
             var testFile = test.GetPropertyValue(JavaScriptTestCaseProperties.TestFile, defaultValue: test.CodeFilePath);
             var testFramework = test.GetPropertyValue<string>(JavaScriptTestCaseProperties.TestFramework, defaultValue: null);
-            return FrameworkDiscover.Intance.Get(testFramework).GetArgumentsToRunTests(test.DisplayName, testFile, workingDir, projectRootDir);
+            return FrameworkDiscoverer.Instance.Get(testFramework).GetArgumentsToRunTests(test.DisplayName, testFile, workingDir, projectRootDir);
         }
 
         private static string GetDebugArgs(Version nodeVersion, out int port)

…pter/TestFrameworks/FrameworkDiscover.cs …er/TestFrameworks/FrameworkDiscoverer.csNodejs/Product/TestAdapter/TestFrameworks/FrameworkDiscover.cs renamed to Nodejs/Product/TestAdapter/TestFrameworks/FrameworkDiscoverer.cs Nodejs/Product/TestAdapter/TestFrameworks/FrameworkDiscover.cs renamed to Nodejs/Product/TestAdapter/TestFrameworks/FrameworkDiscoverer.cs

@@ -6,13 +6,13 @@
 
 namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks
 {
-    public sealed class FrameworkDiscover
+    public sealed class FrameworkDiscoverer
     {
         private readonly Dictionary<string, TestFramework> frameworks = new Dictionary<string, TestFramework>(StringComparer.OrdinalIgnoreCase);
 
-        public static FrameworkDiscover Intance = new FrameworkDiscover();
+        public static FrameworkDiscoverer Instance = new FrameworkDiscoverer();
 
-        private FrameworkDiscover()
+        private FrameworkDiscoverer()
         {
             var testFrameworkDirectories = TestFrameworkDirectories.GetFrameworkDirectories();