tests

Author: normanrz

tests/test_v2.py

@@ -135,8 +135,9 @@ def test_v2_filters_codecs(filters: Any, order: Literal["C", "F"]) -> None:
     np.testing.assert_array_equal(result, array_fixture)
 
 
-@pytest.mark.parametrize("order", ["C", "F"])
-def test_v2_non_contiguous(order: Literal["C", "F"]) -> None:
+@pytest.mark.parametrize("array_order", ["C", "F"])
+@pytest.mark.parametrize("data_order", ["C", "F"])
+def test_v2_non_contiguous(array_order: Literal["C", "F"], data_order: Literal["C", "F"]) -> None:
     arr = zarr.Array.create(
         MemoryStore({}),
         shape=(10, 8),
@@ -145,22 +146,34 @@ def test_v2_non_contiguous(order: Literal["C", "F"]) -> None:
         dtype="float64",
         zarr_format=2,
         exists_ok=True,
-        order=order,
+        order=array_order,
     )
-    a = np.arange(arr.shape[0] * arr.shape[1]).reshape(arr.shape)
+
+    # Non-contiguous write
+    a = np.arange(arr.shape[0] * arr.shape[1]).reshape(arr.shape, order=data_order)
     arr[slice(6, 9, None), slice(3, 6, None)] = a[
         slice(6, 9, None), slice(3, 6, None)
     ]  # The slice on the RHS is important
     np.testing.assert_array_equal(
         arr[slice(6, 9, None), slice(3, 6, None)], a[slice(6, 9, None), slice(3, 6, None)]
     )
 
-    a = np.arange(9).reshape((3, 3), order="F")
-    assert a.flags.f_contiguous
-    arr[slice(6, 9, None), slice(3, 6, None)] = a
-    np.testing.assert_array_equal(arr[slice(6, 9, None), slice(3, 6, None)], a)
+    arr = zarr.Array.create(
+        MemoryStore({}),
+        shape=(10, 8),
+        chunks=(3, 3),
+        fill_value=np.nan,
+        dtype="float64",
+        zarr_format=2,
+        exists_ok=True,
+        order=array_order,
+    )
 
-    a = np.arange(9).reshape((3, 3), order="C")
-    assert a.flags.c_contiguous
+    # Contiguous write
+    a = np.arange(9).reshape((3, 3), order=data_order)
+    if data_order == "F":
+        assert a.flags.f_contiguous
+    else:
+        assert a.flags.c_contiguous
     arr[slice(6, 9, None), slice(3, 6, None)] = a
     np.testing.assert_array_equal(arr[slice(6, 9, None), slice(3, 6, None)], a)