Move TestClass into file

SlowLogicBoy · SlowLogicBoy · commit d6cb6f0d38f9 · 2018-03-15T12:17:17.000+02:00
Invoke TestClass using reflection
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -203,24 +203,15 @@ public void ShouldSupportInlineNugetReferencesWithTrailingSemicoloninEvaluatedCo
         [Fact]
         public static void ShouldHandleIssue235()
         {
-            var code = @"#r ""nuget: AgileObjects.AgileMapper, 0.23.0""
-using AgileObjects.AgileMapper;
-public class TestClass
-{
-    public TestClass()
-    {
-        IMapper mapper = Mapper.CreateNew();
-    }
-}";
             var logger = new ScriptLogger(Console.Error, true);
             var runtimeDependencyResolver = new RuntimeDependencyResolver(type => ((level, message) => {}));
             var compiler = new ScriptCompiler(logger, runtimeDependencyResolver);
             //Copied from Execute(string fixture, params string[] arguments)
             //Probably there should be a better place for this
             var workingDirectory = Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "TestFixtures", "Issue235"); 
-            var scriptContext = new ScriptContext(SourceText.From(code), workingDirectory, Enumerable.Empty<string>(), scriptMode: ScriptMode.REPL);
+            var scriptContext = new ScriptContext(SourceText.From(File.ReadAllText(Path.Combine(workingDirectory, "TestClass.csx"))), workingDirectory, Enumerable.Empty<string>(), scriptMode: ScriptMode.REPL);
             var compilationResult = compiler.CreateCompilationContext<object, InteractiveScriptGlobals>(scriptContext);
-            using(var ms = File.OpenWrite(Path.Combine(workingDirectory, "Issue235.dll")))
+            using(var ms = File.OpenWrite(Path.Combine(workingDirectory, "TestClass.dll")))
             {
                 compilationResult.Script.GetCompilation().Emit(ms);
             }
diff --git a/src/Dotnet.Script.Tests/TestFixtures/Issue235/Issue235.csx b/src/Dotnet.Script.Tests/TestFixtures/Issue235/Issue235.csx
@@ -1,9 +1,14 @@
 #! "netcoreapp2.0"
 #r "nuget: AgileObjects.AgileMapper, 0.23.1"
-#r "Issue235.dll"
+#r "TestClass.dll"
 
+using System.Reflection;
+using System.Runtime.CompilerServices;
 using AgileObjects.AgileMapper;
-
+static string GetScriptPath([CallerFilePath] string path = null) => path;
 IMapper mapper = Mapper.CreateNew();
-new Submission#0.TestClass();
+//TODO: Temporary workaround until I figure out how to change TestClass Submission#0 class name
+var testClassAssembly = Assembly.LoadFrom(Path.Combine(Path.GetDirectoryName(GetScriptPath()),"TestClass.dll"));
+var testClass = testClassAssembly.GetType("Submission#0").GetNestedType("TestClass");
+var instance = Activator.CreateInstance(testClass);
 Console.WriteLine("Hello World!");
diff --git a/src/Dotnet.Script.Tests/TestFixtures/Issue235/TestClass.csx b/src/Dotnet.Script.Tests/TestFixtures/Issue235/TestClass.csx
@@ -0,0 +1,9 @@
+#r "nuget: AgileObjects.AgileMapper, 0.23.0"
+using AgileObjects.AgileMapper;
+public class TestClass
+{
+    public TestClass()
+    {
+        IMapper mapper = Mapper.CreateNew();
+    }
+}
