migrated tests

Author: flexatone

src/lib.rs

@@ -1,6 +1,8 @@
 use numpy::PyReadonlyArray1;
 use pyo3::prelude::*;
 use wide::*;
+use pyo3::types::PyBool;
+use pyo3::types::PyAny;
 
 #[pyfunction]
 fn first_true_1d_a(array: PyReadonlyArray1<bool>) -> isize {
@@ -237,14 +239,17 @@ fn first_true_1d_f(py: Python, array: PyReadonlyArray1<bool>) -> isize {
 
 #[pyfunction]
 #[pyo3(signature = (array, forward=true))]
-fn first_true_1d(py: Python, array: PyReadonlyArray1<bool>, forward: bool) -> isize {
+fn first_true_1d(py: Python,
+    array: PyReadonlyArray1<bool>,
+    forward: &PyBool
+) -> isize {
     if let Ok(slice) = array.as_slice() {
         py.allow_threads(|| {
             let len = slice.len();
             let ptr = slice.as_ptr() as *const u8;
             let ones = u8x32::splat(1);
 
-            if forward {
+            if forward.is_true()? {
                 let mut i = 0;
                 unsafe {
                     // Process 32 bytes at a time with SIMD
@@ -299,7 +304,7 @@ fn first_true_1d(py: Python, array: PyReadonlyArray1<bool>, forward: bool) -> is
     } else {
         let array_view = array.as_array();
         py.allow_threads(|| {
-            if forward {
+            if forward.is_true()? {
                 array_view
                     .iter()
                     .position(|&v| v)

tests/test_basic.py

@@ -9,72 +9,3 @@ def test_first_true_1d():
     b = np.array([False, False, False])
     assert first_true_1d(b) == -1
 
-
-#--------------------------------------------------------------------------
-def test_first_true_1d_a() -> None:
-    a1 = np.arange(100) == 50
-    post = first_true_1d(a1, forward=True)
-    assert post == 50
-
-# def test_first_true_1d_b() -> None:
-#     with self.assertRaises(TypeError):
-#         a1 = [2, 4, 5,]
-#         first_true_1d(a1, forward=True)
-
-# def test_first_true_1d_c() -> None:
-#     with self.assertRaises(ValueError):
-#         a1 = np.arange(100) == 50
-#         first_true_1d(a1, forward=a1)
-
-def test_first_true_1d_d() -> None:
-    a1 = np.arange(100) < 0
-    post = first_true_1d(a1, forward=True)
-    assert post == -1
-
-# def test_first_true_1d_e() -> None:
-#     a1 = np.arange(100)
-#     # only a Boolean array
-#     with self.assertRaises(ValueError):
-#         post = first_true_1d(a1, forward=True)
-
-# def test_first_true_1d_f() -> None:
-#     a1 = (np.arange(100) == 0)[:50:2]
-#     # only a contiguous array
-#     with self.assertRaises(ValueError):
-#         post = first_true_1d(a1, forward=True)
-
-# def test_first_true_1d_g() -> None:
-#     a1 = (np.arange(100) == 0).reshape(10, 10)
-#     # only a contiguous array
-#     with self.assertRaises(ValueError):
-#         post = first_true_1d(a1, forward=True)
-
-def test_first_true_1d_reverse_a() -> None:
-    a1 = np.arange(100) == 50
-    post = first_true_1d(a1, forward=False)
-    assert post == 50
-
-def test_first_true_1d_reverse_b() -> None:
-    a1 = np.arange(100) == 0
-    post = first_true_1d(a1, forward=False)
-    assert post == 0
-
-def test_first_true_1d_reverse_c() -> None:
-    a1 = np.arange(100) == -1
-    post = first_true_1d(a1, forward=False)
-    assert post == -1
-
-def test_first_true_1d_reverse_d() -> None:
-    a1 = np.arange(100) == 99
-    post = first_true_1d(a1, forward=False)
-    assert post == 99
-
-def test_first_true_1d_multi_a() -> None:
-    a1 = np.isin(np.arange(100), (50, 70, 90))
-    assert first_true_1d(a1, forward=True) == 50
-    assert first_true_1d(a1, forward=False) == 90
-
-def test_first_true_1d_multi_b() -> None:
-    a1 = np.isin(np.arange(100), (10, 30, 50))
-    assert first_true_1d(a1, forward=True) == 10
-    assert first_true_1d(a1, forward=False) == 50

tests/test_first_true_1d.py

@@ -0,0 +1,70 @@
+from arrayredox import first_true_1d
+import numpy as np
+
+import pytest
+
+#--------------------------------------------------------------------------
+def test_first_true_1d_a() -> None:
+    a1 = np.arange(100) == 50
+    post = first_true_1d(a1, forward=True)
+    assert post == 50
+
+def test_first_true_1d_b() -> None:
+    with pytest.raises(TypeError):
+        a1 = [2, 4, 5,]
+        first_true_1d(a1, forward=True)
+
+def test_first_true_1d_c() -> None:
+    with pytest.raises(TypeError):
+        a1 = np.arange(100) == 50
+        first_true_1d(a1, forward=0) # bad Boolean
+
+def test_first_true_1d_d() -> None:
+    a1 = np.arange(100) < 0
+    post = first_true_1d(a1, forward=True)
+    assert post == -1
+
+def test_first_true_1d_e() -> None:
+    a1 = np.arange(100)
+    # only a Boolean array
+    with pytest.raises(TypeError):
+        post = first_true_1d(a1, forward=True)
+
+def test_first_true_1d_f() -> None:
+    a1 = (np.arange(100) == 3)[:50:2]
+    assert first_true_1d(a1), 4
+
+def test_first_true_1d_g() -> None:
+    a1 = (np.arange(100) == 0).reshape(10, 10)
+    with pytest.raises(TypeError):
+        post = first_true_1d(a1, forward=True)
+
+def test_first_true_1d_reverse_a() -> None:
+    a1 = np.arange(100) == 50
+    post = first_true_1d(a1, forward=False)
+    assert post == 50
+
+def test_first_true_1d_reverse_b() -> None:
+    a1 = np.arange(100) == 0
+    post = first_true_1d(a1, forward=False)
+    assert post == 0
+
+def test_first_true_1d_reverse_c() -> None:
+    a1 = np.arange(100) == -1
+    post = first_true_1d(a1, forward=False)
+    assert post == -1
+
+def test_first_true_1d_reverse_d() -> None:
+    a1 = np.arange(100) == 99
+    post = first_true_1d(a1, forward=False)
+    assert post == 99
+
+def test_first_true_1d_multi_a() -> None:
+    a1 = np.isin(np.arange(100), (50, 70, 90))
+    assert first_true_1d(a1, forward=True) == 50
+    assert first_true_1d(a1, forward=False) == 90
+
+def test_first_true_1d_multi_b() -> None:
+    a1 = np.isin(np.arange(100), (10, 30, 50))
+    assert first_true_1d(a1, forward=True) == 10
+    assert first_true_1d(a1, forward=False) == 50