[TEST] Better examples and names.

Author: ricardosp4

tests/ndarray/test_transpose.py

@@ -22,43 +22,44 @@ def dtype_fixture(request):
     params=[
         ((10,), (5,), None),
         ((31,), (14,), (9,)),
+        ((9,), (4,), (3,)),
     ]
 )
-def shape_1d_chunks_blocks(request):
+def shape_chunks_blocks_1d(request):
     return request.param
 
 
 @pytest.fixture(
     params=[
-        ((3, 3), (2, 2), (1, 1)),
+        ((4, 4), (3, 3), (2, 2)),
         ((12, 11), (7, 5), (6, 2)),
-        ((1, 5), (1, 4), (1, 3)),
+        ((6, 5), (5, 4), (4, 3)),
         pytest.param(((51, 603), (22, 99), (13, 29)), marks=pytest.mark.heavy),
     ]
 )
-def shape_2d_chunks_blocks(request):
+def shape_chunks_blocks_2d(request):
     return request.param
 
 
 @pytest.fixture(
     params=[
         ((4, 5, 2), (3, 4, 2), (3, 2, 1)),
         ((12, 10, 10), (11, 9, 7), (9, 7, 3)),
-        pytest.param(((37, 63, 55), (12, 5, 41), (10, 5, 11)), marks=pytest.mark.heavy),
+        pytest.param(((37, 63, 55), (12, 30, 41), (10, 5, 11)), marks=pytest.mark.heavy),
     ]
 )
-def shape_3d_chunks_blocks(request):
+def shape_chunks_blocks_3d(request):
     return request.param
 
 
 @pytest.fixture(
     params=[
-        ((3, 3, 5, 7), (2, 3, 2, 4), (1, 1, 1, 4)),
+        ((3, 3, 5, 7), (2, 3, 2, 4), (1, 2, 1, 4)),
         ((4, 6, 5, 2), (3, 3, 4, 2), (3, 2, 2, 1)),
         pytest.param(((10, 10, 10, 11), (7, 8, 9, 11), (6, 7, 8, 5)), marks=pytest.mark.heavy),
     ]
 )
-def shape_4d_chunks_blocks(request):
+def shape_chunks_blocks_4d(request):
     return request.param
 
 
@@ -79,14 +80,13 @@ def shape_4d_chunks_blocks(request):
     },
 )
 def test_scalars(scalar):
-    at = blosc2.permute_dims(scalar)
-    nat = np.transpose(scalar)
-
-    np.testing.assert_allclose(at, nat)
+    scalar_t = blosc2.permute_dims(scalar)
+    np_scalar_t = np.transpose(scalar)
+    np.testing.assert_allclose(scalar_t, np_scalar_t)
 
 
-def test_1d_transpose(shape_1d_chunks_blocks, dtype_fixture):
-    shape, chunks, blocks = shape_1d_chunks_blocks
+def test_1d_permute_dims(shape_chunks_blocks_1d, dtype_fixture):
+    shape, chunks, blocks = shape_chunks_blocks_1d
     a = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype_fixture)
     at = blosc2.permute_dims(a)
 
@@ -100,8 +100,8 @@ def test_1d_transpose(shape_1d_chunks_blocks, dtype_fixture):
     "axes",
     list(permutations([0, 1])),
 )
-def test_2d_transpose(shape_2d_chunks_blocks, dtype_fixture, axes):
-    shape, chunks, blocks = shape_2d_chunks_blocks
+def test_2d_permute_dims(shape_chunks_blocks_2d, dtype_fixture, axes):
+    shape, chunks, blocks = shape_chunks_blocks_2d
     a = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype_fixture)
     at = blosc2.permute_dims(a, axes=axes)
 
@@ -115,8 +115,8 @@ def test_2d_transpose(shape_2d_chunks_blocks, dtype_fixture, axes):
     "axes",
     list(permutations([0, 1, 2])),
 )
-def test_3d_transpose(shape_3d_chunks_blocks, dtype_fixture, axes):
-    shape, chunks, blocks = shape_3d_chunks_blocks
+def test_3d_permute_dims(shape_chunks_blocks_3d, dtype_fixture, axes):
+    shape, chunks, blocks = shape_chunks_blocks_3d
     a = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype_fixture)
     at = blosc2.permute_dims(a, axes=axes)
 
@@ -130,8 +130,8 @@ def test_3d_transpose(shape_3d_chunks_blocks, dtype_fixture, axes):
     "axes",
     list(permutations([0, 1, 2, 3])),
 )
-def test_4d_transpose(shape_4d_chunks_blocks, dtype_fixture, axes):
-    shape, chunks, blocks = shape_4d_chunks_blocks
+def test_4d_permute_dims(shape_chunks_blocks_4d, dtype_fixture, axes):
+    shape, chunks, blocks = shape_chunks_blocks_4d
     a = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype_fixture)
     at = blosc2.permute_dims(a, axes=axes)
 
@@ -150,8 +150,8 @@ def test_4d_transpose(shape_4d_chunks_blocks, dtype_fixture, axes):
     "dtype",
     {np.complex64, np.complex128},
 )
-def test_complex(shape_3d_chunks_blocks, dtype, axes):
-    shape, chunks, blocks = shape_3d_chunks_blocks
+def test_complex(shape_chunks_blocks_3d, dtype, axes):
+    shape, chunks, blocks = shape_chunks_blocks_3d
     real_part = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype)
     imag_part = blosc2.linspace(1, 0, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype)
     complex_matrix = real_part + 3j * imag_part
@@ -176,8 +176,8 @@ def test_complex(shape_3d_chunks_blocks, dtype, axes):
         (0, -4, 1),
     ],
 )
-def test_invalid_axes_raises(shape_3d_chunks_blocks, axes):
-    shape, chunks, blocks = shape_3d_chunks_blocks
+def test_invalid_axes_raises(shape_chunks_blocks_3d, axes):
+    shape, chunks, blocks = shape_chunks_blocks_3d
     a = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks)
 
     with pytest.raises(ValueError, match="not a valid permutation"):
@@ -186,11 +186,7 @@ def test_invalid_axes_raises(shape_3d_chunks_blocks, axes):
 
 @pytest.mark.parametrize(
     "shape",
-    [
-        (2, 3),
-        (4, 5, 6),
-        (2, 4, 8, 5),
-    ],
+    [(2, 3), (4, 5, 6), (2, 4, 8, 5), (7, 3, 9, 9, 5)],
 )
 def test_matrix_transpose(shape):
     arr = blosc2.linspace(0, 1, shape=shape)
@@ -223,13 +219,12 @@ def test_disk():
     nc = np.transpose(na)
 
     np.testing.assert_allclose(c, nc, rtol=1e-6)
-
     blosc2.remove_urlpath("a_test.b2nd")
     blosc2.remove_urlpath("c_test.b2nd")
 
 
-def test_transpose(shape_2d_chunks_blocks, dtype_fixture):
-    shape, chunks, blocks = shape_2d_chunks_blocks
+def test_transpose(shape_chunks_blocks_2d, dtype_fixture):
+    shape, chunks, blocks = shape_chunks_blocks_2d
     a = blosc2.linspace(0, 1, shape=shape, chunks=chunks, blocks=blocks, dtype=dtype_fixture)
     with pytest.warns(DeprecationWarning):
         at = blosc2.transpose(a)