test: test untested cases of chunk normalization

Author: d-v-b

tests/test_chunk_grids.py

@@ -3,7 +3,11 @@
 import numpy as np
 import pytest
 
-from zarr.core.chunk_grids import _guess_regular_chunks, normalize_chunks_nd
+from zarr.core.chunk_grids import (
+    _guess_regular_chunks,
+    normalize_chunks_nd,
+    resolve_outer_and_inner_chunks,
+)
 
 
 @pytest.mark.parametrize(
@@ -42,6 +46,9 @@ def test_guess_chunks(shape: tuple[int, ...], itemsize: int) -> None:
         (((100, 100, 100), (50, 50)), (300, 100), ((100, 100, 100), (50, 50))),
         (((100, 100, 50),), (250,), ((100, 100, 50),)),
         (((100,),), (100,), ((100,),)),
+        # no chunking (False means each dimension is one chunk spanning the full extent)
+        (False, (100,), ((100,),)),
+        (False, (100, 50), ((100,), (50,))),
         # sentinel values
         (-1, (100,), ((100,),)),
         ((30, -1, None), (100, 20, 10), ((30, 30, 30, 30), (20,), (10,))),
@@ -57,6 +64,34 @@ def test_normalize_chunks(
     assert expected == normalize_chunks_nd(chunks, shape)
 
 
+@pytest.mark.parametrize(
+    ("array_shape", "chunks_input", "shard_shape", "expected_outer", "expected_inner"),
+    [
+        # no sharding: outer = chunks, inner = None
+        ((100,), (10,), None, ((10,) * 10,), None),
+        # explicit regular shards
+        ((100,), (10,), (50,), ((50, 50),), ((10,) * 10,)),
+        # rectilinear shards
+        ((100,), (10,), ((60, 40),), ((60, 40),), ((10,) * 10,)),
+        # dict-style shards
+        ((100, 100), (10, 10), {"shape": (50, 50)}, ((50, 50), (50, 50)), ((10,) * 10, (10,) * 10)),
+    ],
+)
+def test_resolve_outer_and_inner_chunks(
+    array_shape: tuple[int, ...],
+    chunks_input: tuple[int, ...],
+    shard_shape: Any,
+    expected_outer: tuple[tuple[int, ...], ...],
+    expected_inner: tuple[tuple[int, ...], ...] | None,
+) -> None:
+    chunks = normalize_chunks_nd(chunks_input, array_shape)
+    result = resolve_outer_and_inner_chunks(
+        array_shape=array_shape, chunks=chunks, shard_shape=shard_shape, item_size=1
+    )
+    assert result.outer_chunks == expected_outer
+    assert result.inner_chunks == expected_inner
+
+
 def test_normalize_chunks_errors() -> None:
     with pytest.raises(ValueError, match="does not accept None"):
         normalize_chunks_nd(None, (100,))