refactor: tests remove np.array_equal and np.all functions

Author: ScottBoyce

tests/test_general_methods.py

@@ -3,14 +3,13 @@
 from NumpyDeque import NumpyDeque
 
 
-@pytest.fixture
-def empty_deque():
-    return NumpyDeque(maxsize=5)
-
-
-@pytest.fixture
-def filled_deque():
-    return NumpyDeque.array([1, 2, 3, 4, 5], maxsize=5)
+def test_custom_dtype():
+    dtype = np.dtype([("field1", np.int32), ("field2", np.float64)])
+    d = NumpyDeque(maxsize=5, dtype=dtype)
+    d.put((1, 2.5))
+    d.put((3, 4.5))
+    assert d[0]["field1"] == 1
+    assert d[1]["field2"] == 4.5
 
 
 def test_buffer_shift():
@@ -24,11 +23,11 @@ def test_buffer_shift():
         d.put(i)
     d.put(11)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([7, 8, 9, 10, 11]))
+    assert (d.deque == np.array([7, 8, 9, 10, 11])).all()
     for i in range(6):
         d.putleft(i)  # shift occurs always
     assert d._i == d._s
-    assert np.all(d.deque == np.array([5, 4, 3, 2, 1]))
+    assert (d.deque == np.array([5, 4, 3, 2, 1])).all()
 
     array_like = [1, 2, 3, 4, 5]
     d = NumpyDeque.array(array_like, priority="right", _force_buffer_size=10)
@@ -40,11 +39,11 @@ def test_buffer_shift():
         d.put(i)
     d.put(10)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([6, 7, 8, 9, 10]))
+    assert (d.deque == np.array([6, 7, 8, 9, 10])).all()
     d.putleft(0)
     d.putleft(1)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([1, 0, 6, 7, 8]))
+    assert (d.deque == np.array([1, 0, 6, 7, 8])).all()
 
     d = NumpyDeque.array(array_like, priority="left", _force_buffer_size=10)
     assert d._s == 3  # buffer shift index
@@ -55,12 +54,12 @@ def test_buffer_shift():
         d.put(i)  # shift occurs
     d.put(8)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([4, 5, 6, 7, 8]))
+    assert (d.deque == np.array([4, 5, 6, 7, 8])).all()
     for i in range(3):
         d.putleft(i)
     d.putleft(3)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([3, 2, 1, 0, 4]))
+    assert (d.deque == np.array([3, 2, 1, 0, 4])).all()
 
     d = NumpyDeque.array(array_like, priority="leftonly", _force_buffer_size=10)
     assert d._s == 5  # buffer shift index
@@ -71,43 +70,46 @@ def test_buffer_shift():
         d.put(i)  # shift occurs always
     d.put(11)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([7, 8, 9, 10, 11]))
+    assert (d.deque == np.array([7, 8, 9, 10, 11])).all()
     for i in range(5):
         d.putleft(i)
     d.putleft(5)  # shift occurs
     assert d._i == d._s
-    assert np.all(d.deque == np.array([5, 4, 3, 2, 1]))
+    assert (d.deque == np.array([5, 4, 3, 2, 1])).all()
 
 
 def test_invalid_priority():
     with pytest.raises(ValueError):
         NumpyDeque(maxsize=5, priority="invalid")
 
 
-def test_clear(filled_deque):
-    filled_deque.clear()
-    assert len(filled_deque) == 0
+def test_clear():
+    d = NumpyDeque.array([1, 2, 3, 4, 5])
+    d.clear()
+    assert len(d) == 0
 
 
-def test_copy(filled_deque):
-    copied_deque = filled_deque.copy()
-    assert len(copied_deque) == len(filled_deque)
-    assert np.array_equal(copied_deque.deque, filled_deque.deque)
-    assert copied_deque is not filled_deque
+def test_copy():
+    d = NumpyDeque.array([1, 2, 3, 4, 5])
+    copied_deque = d.copy()
+    assert len(copied_deque) == len(d)
+    assert (copied_deque.deque == d.deque).all()
+    assert copied_deque is not d
 
 
-def test_reverse(filled_deque):
-    filled_deque.reverse()
-    assert np.array_equal(filled_deque.deque, [5, 4, 3, 2, 1])
+def test_reverse():
+    d = NumpyDeque.array([1, 2, 3, 4, 5])
+    d.reverse()
+    assert (d.deque == [5, 4, 3, 2, 1]).all()
 
 
 def test_abs():
     d = NumpyDeque.array([-1, -2, 3, -4, 5], maxsize=5)
     d.abs()
-    assert np.array_equal(d.deque, [1, 2, 3, 4, 5])
+    assert (d.deque == [1, 2, 3, 4, 5]).all()
 
 
 def test_sort():
     d = NumpyDeque.array([3, 1, 4, 2, 5], maxsize=5)
     d.sort()
-    assert np.array_equal(d.deque, [1, 2, 3, 4, 5])
+    assert (d.deque == [1, 2, 3, 4, 5]).all()

tests/test_initialization.py

@@ -7,12 +7,12 @@ def test_initialization_array():
     d = NumpyDeque.array(array_like)
     assert len(d) == 5
     assert d.maxsize == 5
-    assert np.all(d.deque == np.array(array_like))
+    assert (d.deque == np.array(array_like)).all()
 
     d = NumpyDeque.array(array_like, maxsize=10)
     assert len(d) == 5
     assert d.maxsize == 10
-    assert np.all(d.deque == np.array(array_like))
+    assert (d.deque == np.array(array_like)).all()
 
 
 def test_empty_initialization():
@@ -31,13 +31,13 @@ def test_fill_initialization():
     d = NumpyDeque(maxsize=10, fill=1)
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, fill=2)
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 2)
+    assert (d.deque == 2).all()
     assert len(d.deque) == 100
 
 
@@ -58,14 +58,14 @@ def test_int64_initialization():
     assert d.dtype == np.int64
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, fill=2, dtype=np.int64)
     assert d.dtype == np.int64
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 2)
+    assert (d.deque == 2).all()
     assert len(d.deque) == 100
 
 
@@ -86,14 +86,14 @@ def test_float64_initialization():
     assert d.dtype == np.float64
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1.0)
+    assert (d.deque == 1.0).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, fill=2, dtype=np.float64)
     assert d.dtype == np.float64
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 2.0)
+    assert (d.deque == 2.0).all()
     assert len(d.deque) == 100
 
 
@@ -132,31 +132,31 @@ def test_pad_initialization():
     assert d.buffer_size >= siz + 2 * pad
     assert len(d) == siz
     assert d.maxsize == siz
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
 
     siz = 100
     pad = 10
     d = NumpyDeque(maxsize=siz, fill=2, buffer_padding=pad)
     assert d.buffer_size >= siz + 2 * pad
     assert len(d) == siz
     assert d.maxsize == siz
-    assert np.all(d.deque == 2)
+    assert (d.deque == 2).all()
 
     siz = 10
     pad = 100
     d = NumpyDeque(maxsize=siz, fill=1, buffer_padding=pad)
     assert d.buffer_size >= siz + 2 * pad
     assert len(d) == siz
     assert d.maxsize == siz
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
 
     siz = 100
     pad = 100
     d = NumpyDeque(maxsize=siz, fill=2, buffer_padding=pad)
     assert d.buffer_size >= siz + 2 * pad
     assert len(d) == siz
     assert d.maxsize == siz
-    assert np.all(d.deque == 2)
+    assert (d.deque == 2).all()
 
 
 def test_priority_initialization():
@@ -168,7 +168,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=10, fill=1, priority="right")
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, priority="right")
@@ -179,7 +179,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=100, fill=1, priority="right")
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 100
 
     d = NumpyDeque(maxsize=10, priority="rightonly")
@@ -190,7 +190,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=10, fill=1, priority="rightonly")
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, priority="rightonly")
@@ -201,7 +201,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=100, fill=1, priority="rightonly")
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 100
 
     d = NumpyDeque(maxsize=10, priority="left")
@@ -212,7 +212,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=10, fill=1, priority="left")
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, priority="left")
@@ -223,7 +223,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=100, fill=1, priority="left")
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 100
 
     d = NumpyDeque(maxsize=10, priority="leftonly")
@@ -234,7 +234,7 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=10, fill=1, priority="leftonly")
     assert len(d) == 10
     assert d.maxsize == 10
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 10
 
     d = NumpyDeque(maxsize=100, priority="leftonly")
@@ -245,5 +245,5 @@ def test_priority_initialization():
     d = NumpyDeque(maxsize=100, fill=1, priority="leftonly")
     assert len(d) == 100
     assert d.maxsize == 100
-    assert np.all(d.deque == 1)
+    assert (d.deque == 1).all()
     assert len(d.deque) == 100