Simplify the sys.path setting in the PyImportTests.

filmor · vmuriart · commit 4d8a8e9654d7 · 2017-01-30T15:51:17.000-07:00
diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using Python.Runtime;
+using System.IO;
 
 namespace Python.EmbeddingTest
 {
@@ -17,34 +18,19 @@ public void SetUp()
             PythonEngine.Initialize();
             gs = PythonEngine.AcquireLock();
 
-            //string here = Environment.CurrentDirectory;
-            //trunk\pythonnet\src\embed_tests\bin\x86\DebugWin
-
             /*
              * Append the tests directory to sys.path
              * using reflection to circumvent the private modifires placed on most Runtime methods.
              */
             const string s = @"../../../../tests";
 
-            Type RTClass = typeof(Runtime.Runtime);
-
-            /* pyStrPtr = PyString_FromString(s); */
-            MethodInfo PyString_FromString = RTClass.GetMethod("PyString_FromString",
-                BindingFlags.NonPublic | BindingFlags.Static);
-            object[] funcArgs = new object[1];
-            funcArgs[0] = s;
-            IntPtr pyStrPtr = (IntPtr)PyString_FromString.Invoke(null, funcArgs);
-
-            /* SysDotPath = sys.path */
-            MethodInfo PySys_GetObject = RTClass.GetMethod("PySys_GetObject",
-                BindingFlags.NonPublic | BindingFlags.Static);
-            funcArgs[0] = "path";
-            IntPtr SysDotPath = (IntPtr)PySys_GetObject.Invoke(null, funcArgs);
+            var testPath = Path.Combine(
+                TestContext.CurrentContext.TestDirectory, s
+                );
 
-            /* SysDotPath.append(*pyStrPtr) */
-            MethodInfo PyList_Append = RTClass.GetMethod("PyList_Append", BindingFlags.NonPublic | BindingFlags.Static);
-            funcArgs = new object[] { SysDotPath, pyStrPtr };
-            int r = (int)PyList_Append.Invoke(null, funcArgs);
+            IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
+            IntPtr path = Runtime.Runtime.PySys_GetObject("path");
+            Runtime.Runtime.PyList_Append(path, str);
         }
 
         [TearDown]
