Fix resolution of TestFrameworks folder

Author: Paul van Brenk

Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs

@@ -3,59 +3,64 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace Microsoft.NodejsTools.TestFrameworks
 {
     internal class TestFrameworkDirectories
     {
         public const string ExportRunnerFramework = "ExportRunner";
         private const string TestFrameworksDirectory = "TestFrameworks";
+        private const string TestAdapterDirectory = "TestAdapter";
 
-        private readonly Dictionary<string, string> _frameworkDirectories;
+        private readonly Dictionary<string, string> frameworkDirectories;
 
         public TestFrameworkDirectories()
         {
-            this._frameworkDirectories = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            foreach (var directory in Directory.GetDirectories(GetBaseTestframeworkFolder()))
+            this.frameworkDirectories = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            var testFrameworkRoot = GetTestframeworkFolderRoot();
+            if(!Directory.Exists(testFrameworkRoot))
+            {
+                throw new InvalidOperationException("Unable to find test framework folder");
+            }
+
+            foreach (var directory in Directory.GetDirectories(testFrameworkRoot))
             {
                 var name = Path.GetFileName(directory);
-                this._frameworkDirectories.Add(name, directory);
+                this.frameworkDirectories.Add(name, directory);
             }
-            string defaultFx;
-            this._frameworkDirectories.TryGetValue(ExportRunnerFramework, out defaultFx);
-            if (defaultFx == null)
+
+            if (!this.frameworkDirectories.TryGetValue(ExportRunnerFramework, out var defaultFx) || string.IsNullOrEmpty(defaultFx))
             {
                 throw new InvalidOperationException("Missing generic test framework");
             }
         }
 
-        public List<string> GetFrameworkNames()
-        {
-            return new List<string>(this._frameworkDirectories.Keys);
-        }
+        public List<string> GetFrameworkNames() => this.frameworkDirectories.Keys.ToList();
 
-        public List<string> GetFrameworkDirectories()
-        {
-            return new List<string>(this._frameworkDirectories.Values);
-        }
+        public List<string> GetFrameworkDirectories() => this.frameworkDirectories.Values.ToList();
 
-        private static string GetBaseTestframeworkFolder()
+        private static string GetTestframeworkFolderRoot()
         {
-            var installFolder = GetExecutingAssemblyPath();
-            var baseDirectory = Path.Combine(installFolder, TestFrameworksDirectory);
+            // This class is used in 2 different assemblies, installed in 2 locations:
+            //
+            // "C:\Program Files (x86)\Microsoft Visual Studio\Preview\Enterprise\Common7\IDE\Extensions\Microsoft\NodeJsTools\NodeJsTools\Microsoft.NodejsTools.dll"
+            // and
+            // "C:\Program Files (x86)\Microsoft Visual Studio\Preview\Enterprise\Common7\IDE\Extensions\Microsoft\NodeJsTools\TestAdapter\Microsoft.NodejsTools.TestAdapter.dll"
+            //
+            // However in both cases, we should just go up a folder to the nodejstools root, and then into the TestAdapter folder.
+
+            var currentAssembly = typeof(TestFrameworkDirectories).Assembly;
+            var currentAssemblyFolder = Path.GetDirectoryName(currentAssembly.Location);
+            var nodejsRootFolder = Path.GetDirectoryName(currentAssemblyFolder);
+
+            var baseDirectory = Path.Combine(nodejsRootFolder, TestAdapterDirectory, TestFrameworksDirectory);
 #if DEBUG
             // To allow easier debugging of the test adapter, try to use the local directory as a fallback.
             baseDirectory = Directory.Exists(baseDirectory) ? baseDirectory : Path.Combine(Directory.GetCurrentDirectory(), TestFrameworksDirectory);
 #endif
             return baseDirectory;
         }
-
-        private static string GetExecutingAssemblyPath()
-        {
-            var codeBase = System.Reflection.Assembly.GetExecutingAssembly().CodeBase;
-            var uri = new UriBuilder(codeBase);
-            var path = Uri.UnescapeDataString(uri.Path);
-            return Path.GetDirectoryName(path);
-        }
     }
 }

Nodejs/Product/TestAdapter/TestAdapter.csproj

@@ -82,7 +82,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

Nodejs/Product/TestAdapterShim/AssemblyResolver.cs

@@ -20,7 +20,7 @@ internal static string GetVSInstallDir()
             var vsTestFrameworkAssembly = typeof(ITestExecutor).Assembly;
             var testAdapterPath = vsTestFrameworkAssembly.Location;
 
-            // C:\Program Files (x86)\Microsoft Visual Studio\2017\VSUJSLT\Common7\IDE\CommonExtensions\Microsoft\NodeJs Tools Unit Test Adapter\Microsoft.nodejstools.TestAdapter.dll
+            // C:\Program Files (x86)\Microsoft Visual Studio\2017\VSUJSLT\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
             var indexOfCommon7Ide = testAdapterPath.IndexOf("common7", StringComparison.OrdinalIgnoreCase);
             string vsInstallDir = testAdapterPath.Substring(0, indexOfCommon7Ide);
 
@@ -31,12 +31,12 @@ private static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
         {
             // Use the setup API to find the VS install Dir, then build paths to the Private and Public Assemblies folders
             var installPath = GetVSInstallDir();
-            var ideFolder = Path.Combine(installPath, "Common7\\IDE");
+            var ideFolder = Path.Combine(installPath, "Common7", "IDE");
             var paths = new[] {
                 Path.Combine(ideFolder, "PrivateAssemblies"),
                 Path.Combine(ideFolder, "PublicAssemblies"),
-                Path.Combine(installPath, "MSBuild\\15.0\\Bin"),
-                Path.Combine(ideFolder, "CommonExtensions\\Microsoft\\WebClient\\Project System") };
+                Path.Combine(installPath, "MSBuild","15.0","Bin"),
+                Path.Combine(ideFolder, "CommonExtensions","Microsoft","WebClient","Project System") };
 
             // This is what comes in for args.Name, but we really just want the dll file name:
             // "Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
@@ -45,7 +45,7 @@ private static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
             foreach (var path in paths)
             {
                 // Check under privateAssemblies
-                if (AssemblyResolver.ResolveAssemblyPath(path, resolveTargetAssemblyName, out var resolvedAssembly))
+                if (ResolveAssemblyPath(path, resolveTargetAssemblyName, out var resolvedAssembly))
                 {
                     return resolvedAssembly;
                 }