Improve test object helper with assembly resolver

Author: josesimoes

MetadataProcessor.Tests/TestObjectHelper.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Mono.Cecil;
 
@@ -213,30 +214,28 @@ public static AssemblyDefinition GetTestNFAppAssemblyDefinition()
         {
             AssemblyDefinition ret = null;
 
-            ret = AssemblyDefinition.ReadAssembly(TestNFAppFullPath);
+            ret = AssemblyDefinition.ReadAssembly(
+                TestNFAppFullPath,
+                new ReaderParameters { AssemblyResolver = ProvideLoadHints() });
 
             return ret;
         }
 
         public static AssemblyDefinition GetTestNFAppAssemblyDefinitionWithLoadHints()
         {
-            IDictionary<string, string> loadHints = new Dictionary<string, string>(StringComparer.Ordinal)
-            {
-                ["mscorlib"] = GetmscorlibAssemblyDefinition().MainModule.FileName,
-                ["TestNFClassLibrary"] = GetTestNFClassLibraryDefinition().MainModule.FileName
-            };
-
             return AssemblyDefinition.ReadAssembly(
                 TestNFAppFullPath,
-                new ReaderParameters { AssemblyResolver = new LoadHintsAssemblyResolver(loadHints) });
+                new ReaderParameters { AssemblyResolver = ProvideLoadHints() });
         }
 
 
         public static AssemblyDefinition GetTestNFClassLibraryDefinition()
         {
             AssemblyDefinition ret = null;
 
-            ret = AssemblyDefinition.ReadAssembly(TestNFClassLibFullPath);
+            ret = AssemblyDefinition.ReadAssembly(
+                TestNFClassLibFullPath,
+                new ReaderParameters { AssemblyResolver = ProvideLoadHints() });
 
             return ret;
         }
@@ -485,5 +484,13 @@ internal static MethodDefinition GetMethodDefinition(
         public static string NanoClrLocalInstance => Environment.GetEnvironmentVariable(
             _varNameForLocalNanoCLRInstancePath,
             EnvironmentVariableTarget.Process);
+
+        private static DefaultAssemblyResolver ProvideLoadHints()
+        {
+            var resolver = new DefaultAssemblyResolver();
+            resolver.AddSearchDirectory(TestExecutionLocation);
+
+            return resolver;
+        }
     }
 }