NumPy array iteration test

lostmsu · lostmsu · commit 2b5902f30690 · 2020-12-05T21:02:05.000-08:00
diff --git a/src/embed_tests/NumPyTests.cs b/src/embed_tests/NumPyTests.cs
@@ -21,20 +21,22 @@ public void Dispose()
             PythonEngine.Shutdown();
         }
 
-        [Test]
-        public void TestReadme()
-        {
-            dynamic np;
-            try
-            {
+        static PyObject GetNumPy() {
+            PyObject np;
+            try {
                 np = Py.Import("numpy");
-            }
-            catch (PythonException)
-            {
+            } catch (PythonException) {
                 Assert.Inconclusive("Numpy or dependency not installed");
-                return;
+                throw;
             }
-            
+            return np;
+        }
+
+        [Test]
+        public void TestReadme()
+        {
+            dynamic np = GetNumPy();
+
             Assert.AreEqual("1.0", np.cos(np.pi * 2).ToString());
 
             dynamic sin = np.sin;
@@ -55,19 +57,27 @@ public void TestReadme()
         [Test]
         public void MultidimensionalNumPyArray()
         {
-            PyObject np;
-            try {
-                np = Py.Import("numpy");
-            } catch (PythonException) {
-                Assert.Inconclusive("Numpy or dependency not installed");
-                return;
-            }
+            PyObject np = GetNumPy();
 
             var array = new[,] { { 1, 2 }, { 3, 4 } };
             var ndarray = np.InvokeMethod("asarray", array.ToPython());
             Assert.AreEqual((2,2), ndarray.GetAttr("shape").As<(int,int)>());
             Assert.AreEqual(1, ndarray[(0, 0).ToPython()].As<int>());
             Assert.AreEqual(array[1, 0], ndarray[(1, 0).ToPython()].As<int>());
         }
+
+        [Test]
+        public void Iterate()
+        {
+            PyObject np = GetNumPy();
+
+            var size = new[] { 3, 2 };
+            var ndarray = np.InvokeMethod("zeros", size.ToPython());
+            var iterator = ndarray.GetIterator();
+            Assert.True(iterator.MoveNext());
+            Assert.True(iterator.MoveNext());
+            Assert.True(iterator.MoveNext());
+            Assert.False(iterator.MoveNext());
+        }
     }
 }
diff --git a/src/runtime/pyiter.cs b/src/runtime/pyiter.cs
@@ -25,7 +25,7 @@ public PyIter(IntPtr ptr) : base(ptr)
         {
         }
         /// <summary>
-        /// Creates new <see cref="PyIter"/> from an untyped reference to Python object.
+        /// Creates new <see cref="PyIter"/> from an untyped reference to Python iterator object.
         /// </summary>
         public PyIter(PyObject pyObject) : base(FromPyObject(pyObject)) { }
         static BorrowedReference FromPyObject(PyObject pyObject) {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public PyIter(IntPtr ptr) : base(ptr)`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`	`/// <summary>`
`28`		`- /// Creates new <see cref="PyIter"/> from an untyped reference to Python object.`
	`28`	`+ /// Creates new <see cref="PyIter"/> from an untyped reference to Python iterator object.`
`29`	`29`	`/// </summary>`
`30`	`30`	`public PyIter(PyObject pyObject) : base(FromPyObject(pyObject)) { }`
`31`	`31`	`static BorrowedReference FromPyObject(PyObject pyObject) {`