Move the tests from test_runtime.py to TestRuntime.cs

Rickard Holmberg · Rickard Holmberg · commit c9d7b71fd9d4 · 2017-06-16T13:42:17.000+02:00
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -84,6 +84,7 @@
     <Compile Include="pyimport.cs" />
     <Compile Include="pyinitialize.cs" />
     <Compile Include="pyrunstring.cs" />
+    <Compile Include="TestClrMethod.cs" />
     <Compile Include="TestConverter.cs" />
     <Compile Include="TestCustomMarshal.cs" />
     <Compile Include="TestExample.cs" />
diff --git a/src/embed_tests/TestClrMethod.cs b/src/embed_tests/TestClrMethod.cs
@@ -0,0 +1,80 @@
+﻿using System;
+using NUnit.Framework;
+using Python.Runtime;
+
+namespace Python.EmbeddingTest
+{
+    public class TestClrMethod
+    {
+        private IntPtr globals;
+
+        [OneTimeSetUp]
+        public void SetUp()
+        {
+            PythonEngine.Initialize();
+            globals = Runtime.Runtime.PyDict_New();
+            Runtime.Runtime.PyDict_SetItemString(globals, "__builtins__", Runtime.Runtime.PyEval_GetBuiltins());
+            Runtime.Runtime.PyDict_SetItemString(globals, "clr", ImportHook.GetCLRModule());
+            Runtime.Runtime.PyDict_SetItemString(globals, "ExampleClrClass", CreateTestClass().Handle);
+        }
+
+        [OneTimeTearDown]
+        public void Dispose()
+        {
+            PythonEngine.Shutdown();
+        }
+
+        [Test]
+        public void SetAndGetPropertyTest()
+        {
+            dynamic a = InstantiateTestClass();
+            Assert.AreEqual(3, (int) a.X);
+            Assert.AreEqual(3 * 2, (int) a.Y);
+            a.X = 4;
+            Assert.AreEqual(4, (int) a.X);
+            Assert.AreEqual(4 * 2, (int) a.Y);
+        }
+
+        [Test]
+        public void CallMethodTest()
+        {
+            dynamic a = InstantiateTestClass();
+            Assert.AreEqual(4 * 2, (int) a.test(4));
+            Assert.AreEqual(5 * 2, (int) a.test(5));
+        }
+
+        private PyObject CreateTestClass()
+        {
+            var locals = new PyDict();
+            PythonEngine.Exec(@"
+import System
+
+class ExampleClrClass(System.Object):
+    __namespace__ = ""PyTest""
+    def __init__(self):
+        self._x = 3
+    @clr.clrmethod(int, [int])
+    def test(self, x):
+        return x*2
+    
+    def get_X(self):
+        return self._x
+    def set_X(self, value):
+        self._x = value
+    X = clr.clrproperty(int, get_X, set_X)
+
+    @clr.clrproperty(int)
+    def Y(self):
+        return self._x * 2
+",
+                globals, locals.Handle);
+
+            return locals.GetItem("ExampleClrClass");
+        }
+
+        private PyObject InstantiateTestClass()
+        {
+            return PythonEngine.Eval(@"ExampleClrClass()", globals);
+        }
+    }
+}
diff --git a/src/embed_tests/TestRuntime.cs b/src/embed_tests/TestRuntime.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using NUnit.Framework;
 using Python.Runtime;
 
@@ -47,5 +47,46 @@ public static void RefCountTest()
 
             Runtime.Runtime.Py_Finalize();
         }
+
+        [Test]
+        public static void PyCheck_Iter_PyObject_IsIterable_Test()
+        {
+            Runtime.Runtime.Py_Initialize();
+
+            // Tests that a python list is an iterable, but not an iterator
+            var pyList = Runtime.Runtime.PyList_New(0);
+            Assert.IsFalse(Runtime.Runtime.PyIter_Check(pyList));
+            Assert.IsTrue(Runtime.Runtime.PyObject_IsIterable(pyList));
+
+            // Tests that a python list iterator is both an iterable and an iterator
+            var pyListIter = Runtime.Runtime.PyObject_GetIter(pyList);
+            Assert.IsTrue(Runtime.Runtime.PyObject_IsIterable(pyListIter));
+            Assert.IsTrue(Runtime.Runtime.PyIter_Check(pyListIter));
+
+            // Tests that a python float is neither an iterable nor an iterator
+            var pyFloat = Runtime.Runtime.PyFloat_FromDouble(2.73);
+            Assert.IsFalse(Runtime.Runtime.PyObject_IsIterable(pyFloat));
+            Assert.IsFalse(Runtime.Runtime.PyIter_Check(pyFloat));
+
+            Runtime.Runtime.Py_Finalize();
+        }
+
+        [Test]
+        public static void PyCheck_Iter_PyObject_IsIterable_ThreadingLock_Test()
+        {
+            Runtime.Runtime.Py_Initialize();
+
+            // Create an instance of threading.Lock, which is one of the very few types that does not have the
+            // TypeFlags.HaveIter set in Python 2. This tests a different code path in PyObject_IsIterable and PyIter_Check.
+            var threading = Runtime.Runtime.PyImport_ImportModule("threading");
+            var threadingDict = Runtime.Runtime.PyModule_GetDict(threading);
+            var lockType = Runtime.Runtime.PyDict_GetItemString(threadingDict, "Lock");
+            var lockInstance = Runtime.Runtime.PyObject_CallObject(lockType, Runtime.Runtime.PyTuple_New(0));
+
+            Assert.IsFalse(Runtime.Runtime.PyObject_IsIterable(lockInstance));
+            Assert.IsFalse(Runtime.Runtime.PyIter_Check(lockInstance));
+
+            Runtime.Runtime.Py_Finalize();
+        }
     }
 }
diff --git a/src/tests/test_runtime.py b/src/tests/test_runtime.py
