Extract utility method in TestDomainReload

BadSingleton · BadSingleton · commit d1799aad7aa1 · 2020-08-26T14:21:03.000-04:00
Addresses comment: pythonnet#958
diff --git a/src/embed_tests/TestDomainReload.cs b/src/embed_tests/TestDomainReload.cs
@@ -400,6 +400,15 @@ public object Call(string methodName, params object[] args)
                 return method.Invoke(null, args);
             }
         }
+        
+        static T CreateInstanceInstanceAndUnwrap<T>(AppDomain domain)
+        {
+            Type type = typeof(T);
+            var theProxy = (T)domain.CreateInstanceAndUnwrap(
+                    type.Assembly.FullName,
+                    type.FullName);
+            return theProxy;
+        }
 
         /// <summary>
         /// Create a domain, run the assembly in it (the RunPython function),
@@ -412,10 +421,7 @@ static void RunAssemblyAndUnload(string domainName)
             AppDomain domain = CreateDomain(domainName);
             // Create a Proxy object in the new domain, where we want the
             // assembly (and Python .NET) to reside
-            Type type = typeof(Proxy);
-            var theProxy = (Proxy)domain.CreateInstanceAndUnwrap(
-                    type.Assembly.FullName,
-                    type.FullName);
+            var theProxy = CreateInstanceInstanceAndUnwrap<Proxy>(domain);
 
             theProxy.Call("InitPython", ShutdownMode.Soft);
             // From now on use the Proxy to call into the new assembly
@@ -484,14 +490,10 @@ static void RunDomainReloadSteps<T1, T2>() where T1 : CrossCaller where T2 : Cro
                 AppDomain domain = CreateDomain("test_domain_reload_1");
                 try
                 {
-                    var theProxy = (Proxy)domain.CreateInstanceAndUnwrap(
-                            type.Assembly.FullName,
-                            type.FullName);
+                    var theProxy = CreateInstanceInstanceAndUnwrap<Proxy>(domain);
                     theProxy.Call("InitPython", ShutdownMode.Reload);
 
-                    var caller = (T1)domain.CreateInstanceAndUnwrap(
-                            typeof(T1).Assembly.FullName,
-                            typeof(T1).FullName);
+                    var caller = CreateInstanceInstanceAndUnwrap<T1>(domain);
                     arg = caller.Execute(arg);
 
                     theProxy.Call("ShutdownPython");
@@ -506,14 +508,10 @@ static void RunDomainReloadSteps<T1, T2>() where T1 : CrossCaller where T2 : Cro
                 AppDomain domain = CreateDomain("test_domain_reload_2");
                 try
                 {
-                    var theProxy = (Proxy)domain.CreateInstanceAndUnwrap(
-                            type.Assembly.FullName,
-                            type.FullName);
+                    var theProxy = CreateInstanceInstanceAndUnwrap<Proxy>(domain);
                     theProxy.Call("InitPython", ShutdownMode.Reload);
 
-                    var caller = (T2)domain.CreateInstanceAndUnwrap(
-                            typeof(T2).Assembly.FullName,
-                            typeof(T2).FullName);
+                    var caller = CreateInstanceInstanceAndUnwrap<T2>(domain);
                     caller.Execute(arg);
                     theProxy.Call("ShutdownPythonCompletely");
                 }
