increase codecov

Author: brokkoli71

src/zarr/core/buffer/core.py

@@ -127,16 +127,16 @@ def shape(self) -> tuple[()]:
         return ()
 
     def __len__(self) -> int:
-        raise TypeError("ScalarWrapper object has no len()")
+        raise TypeError("len() of unsized object.")
 
     def __getitem__(self, key: slice) -> Self:
-        if key != slice(None):
-            raise IndexError("Invalid index for scalar")
+        if key != slice(None) and key != Ellipsis and key != ():
+            raise IndexError("Invalid index for scalar.")
         return self
 
     def __setitem__(self, key: slice, value: Any) -> None:
-        if key != slice(None):
-            raise IndexError("Invalid index for scalar")
+        if key != slice(None) and key != Ellipsis and key != ():
+            raise IndexError("Invalid index for scalar.")
         self._value = value
 
     def __array__(
@@ -148,16 +148,19 @@ def reshape(
         self, shape: tuple[int, ...] | Literal[-1], *, order: Literal["A", "C", "F"] = "C"
     ) -> Self:
         if shape != () and shape != -1:
-            raise ValueError("Cannot reshape scalar to non-scalar shape")
+            raise ValueError("Cannot reshape scalar to non-scalar shape.")
         return self
 
     def view(self, dtype: npt.DTypeLike) -> Self:
-        return self
+        return self.astype(dtype)
 
     def astype(
         self, dtype: npt.DTypeLike, order: Literal["K", "A", "C", "F"] = "K", *, copy: bool = True
     ) -> Self:
-        raise TypeError("ScalarWrapper object has no astype()")
+        if copy:
+            return self.__class__(self._value, dtype)
+        self._dtype = dtype
+        return self
 
     def fill(self, value: Any) -> None:
         self._value = value

tests/test_array.py

@@ -4,7 +4,7 @@
 import pickle
 import re
 from itertools import accumulate
-from typing import TYPE_CHECKING, Any, Literal, cast
+from typing import TYPE_CHECKING, Any, Literal
 
 import numcodecs
 import numpy as np
@@ -1258,26 +1258,23 @@ async def test_create_array_v2_no_shards(store: MemoryStore) -> None:
         )
 
 
-@pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1)])
-def test_scalar_array(value: Any) -> None:
-    arr = zarr.array(value)
-    assert arr[...] == value
-    assert arr.shape == ()
-    assert arr.ndim == 0
-
-    x = arr[()]
-    assert isinstance(arr[()], ScalarWrapper)
-    assert isinstance(arr[()], NDArrayLike)
-    assert x.shape == arr.shape
-    assert x.ndim == arr.ndim
+@pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1), False, True])
+def test_scalar_wrapper(value: Any) -> None:
+    x = ScalarWrapper(value)
     assert x == value
     assert value == x
+    assert x == x[()]
+    assert x.view(str) == x
+    assert x.copy() == x
+    assert x.transpose() == x
+    assert x.ravel() == x
+    assert x.all() == bool(value)
     if isinstance(value, (int, float)):
-        x = cast(ScalarWrapper, x)
         assert -x == -value
         assert abs(x) == abs(value)
         assert int(x) == int(value)
         assert float(x) == float(value)
+        assert complex(x) == complex(value)
         assert x + 1 == value + 1
         assert x - 1 == value - 1
         assert x * 2 == value * 2
@@ -1291,5 +1288,34 @@ def test_scalar_array(value: Any) -> None:
         assert hash(x) == hash(value)
         assert str(x) == str(value)
         assert format(x, "") == format(value, "")
+        x.fill(2)
+        x[()] += 1
+        assert x == 3
     elif isinstance(value, str):
         assert str(x) == value
+        with pytest.raises(TypeError, match=re.escape("bad operand type for abs(): 'str'")):
+            abs(x)
+
+    with pytest.raises(ValueError, match="Cannot reshape scalar to non-scalar shape."):
+        x.reshape((1, 2))
+    with pytest.raises(IndexError, match="Invalid index for scalar."):
+        x[10] = value
+    with pytest.raises(IndexError, match="Invalid index for scalar."):
+        x[10]
+    with pytest.raises(TypeError, match=re.escape("len() of unsized object.")):
+        len(x)
+
+
+@pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1)])
+@pytest.mark.parametrize("zarr_format", [2, 3])
+def test_scalar_array(value: Any, zarr_format: ZarrFormat) -> None:
+    arr = zarr.array(value, zarr_format=zarr_format)
+    assert arr[...] == value
+    assert arr.shape == ()
+    assert arr.ndim == 0
+
+    x = arr[()]
+    assert isinstance(arr[()], ScalarWrapper)
+    assert isinstance(arr[()], NDArrayLike)
+    assert x.shape == arr.shape
+    assert x.ndim == arr.ndim

tests/test_buffer.py

@@ -151,3 +151,5 @@ def test_numpy_buffer_prototype() -> None:
     ndbuffer = cpu.buffer_prototype.nd_buffer.create(shape=(1, 2), dtype=np.dtype("int64"))
     assert isinstance(buffer.as_array_like(), np.ndarray)
     assert isinstance(ndbuffer.as_ndarray_like(), np.ndarray)
+    with pytest.raises(ValueError, match="Buffer does not contain a single scalar value"):
+        ndbuffer.as_scalar()