(wip)

BadSingleton · BadSingleton · commit 005a476e7bb8 · 2020-10-22T13:32:09.000-04:00
diff --git a/src/domain_tests/Python.DomainReloadTests.15.csproj b/src/domain_tests/Python.DomainReloadTests.15.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
diff --git a/src/domain_tests/TestRunner.cs b/src/domain_tests/TestRunner.cs
@@ -92,7 +92,7 @@ public static int Main()
             }}
             catch (PythonException pe)
             {{
-                throw new ArgumentException(message:pe.Message);
+                throw new ArgumentException(message:pe.Message+""    ""+pe.StackTrace);
             }}
             return 0;
         }}
@@ -103,11 +103,13 @@ public static int Main()
 
         public static int Main(string[] args)
         {
-            Console.WriteLine($"Testing with arguments: {string.Join(", ", args)}");
             if (args.Length < 3)
             {
-                return 123;
+                args = new string[] { "public static int TestMember = 2;", "", "TestMember" };
+                // return 123;
             }
+            Console.WriteLine($"Testing with arguments: {string.Join(", ", args)}");
+
             var tempFolderPython = Path.Combine(Path.GetTempPath(), "Python.Runtime.dll");
             if (File.Exists(tempFolderPython))
             {
@@ -173,6 +175,7 @@ static string CreateCaseRunnerAssembly(string shutdownMode = "ShutdownMode.Reloa
 
         static string CreateAssembly(string name, string code, bool exe = false)
         {
+            //Console.WriteLine(code);
             // Never return or hold the Assembly instance. This will cause
             // the assembly to be loaded into the current domain and this
             // interferes with the tests. The Domain can execute fine from a 
diff --git a/src/domain_tests/test_domain_reload.py b/src/domain_tests/test_domain_reload.py
@@ -10,13 +10,13 @@ def runit(m1, m2, member):
 def test_remove_method():
 
     m1 = 'public static void TestMethod() {Console.WriteLine("from test method");}'
-    m2 = ''
+    m2 = 'public static void TestMethod2() {Console.WriteLine("from test method");}'
     member = 'TestMethod'
     runit(m1, m2, member)
 
 def test_remove_member():
 
     m1 = 'public static int TestMember = -1;'
-    m2 = ''
+    m2 = 'public static int TestMember2 = -1;'
     member = 'TestMember'
     runit(m1, m2, member)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?xml version="1.0" encoding="utf-8"?>`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`3`	`3`	`<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />`
`4`	`4`	`<PropertyGroup>`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public static int Main()`
`92`	`92`	`}}`
`93`	`93`	`catch (PythonException pe)`
`94`	`94`	`{{`
`95`		`- throw new ArgumentException(message:pe.Message);`
	`95`	`+ throw new ArgumentException(message:pe.Message+"" ""+pe.StackTrace);`
`96`	`96`	`}}`
`97`	`97`	`return 0;`
`98`	`98`	`}}`
`@@ -103,11 +103,13 @@ public static int Main()`
`103`	`103`
`104`	`104`	`public static int Main(string[] args)`
`105`	`105`	`{`
`106`		`- Console.WriteLine($"Testing with arguments: {string.Join(", ", args)}");`
`107`	`106`	`if (args.Length < 3)`
`108`	`107`	`{`
`109`		`- return 123;`
	`108`	`+ args = new string[] { "public static int TestMember = 2;", "", "TestMember" };`
	`109`	`+ // return 123;`
`110`	`110`	`}`
	`111`	`+ Console.WriteLine($"Testing with arguments: {string.Join(", ", args)}");`
	`112`	`+`
`111`	`113`	`var tempFolderPython = Path.Combine(Path.GetTempPath(), "Python.Runtime.dll");`
`112`	`114`	`if (File.Exists(tempFolderPython))`
`113`	`115`	`{`
`@@ -173,6 +175,7 @@ static string CreateCaseRunnerAssembly(string shutdownMode = "ShutdownMode.Reloa`
`173`	`175`
`174`	`176`	`static string CreateAssembly(string name, string code, bool exe = false)`
`175`	`177`	`{`
	`178`	`+ //Console.WriteLine(code);`
`176`	`179`	`// Never return or hold the Assembly instance. This will cause`
`177`	`180`	`// the assembly to be loaded into the current domain and this`
`178`	`181`	`// interferes with the tests. The Domain can execute fine from a`