Add 5D test datasets and related functionality for OME-Zarr v0.4 and v0.5

* Implement corresponding tests in `DefaultPyramidal5DImageDataTest`.

Author: stefanhahmann

src/test/java/sc/fiji/ome/zarr/pyramid/DefaultPyramidal5DImageDataTest.java

@@ -32,8 +32,10 @@ class DefaultPyramidal5DImageDataTest
 	static Stream< String > omeZarrExamples()
 	{
 		return Stream.of(
-				"sc/fiji/ome/zarr/util/2d_testing/ome_zarr_v4_example"
+				"sc/fiji/ome/zarr/util/2d_testing/ome_zarr_v4_example",
+				"sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v4.ome.zarr"
 		// "sc/fiji/ome/zarr/util/2d_testing/ome_zarr_v5_example" // NB: OME v05 not supported yet
+		// "sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v5.ome.zarr" // NB: OME v05 not supported yet
 		);
 	}
 
@@ -60,8 +62,17 @@ void testAsDataset( String resource ) throws URISyntaxException
 			assertNotNull( ijDataset );
 			ImgPlus< ? > imgPlus = ijDataset.getImgPlus();
 			assertNotNull( imgPlus );
-			assertEquals( 1000, imgPlus.dimension( 0 ) );
-			assertEquals( 1000, imgPlus.dimension( 1 ) );
+			if ( resource.contains( "5d_testing" ) )
+			{
+				assertEquals( 64, imgPlus.dimension( 0 ) );
+				assertEquals( 64, imgPlus.dimension( 1 ) );
+				assertEquals( 16, imgPlus.dimension( 2 ) );
+			}
+			if ( resource.contains( "ome_zarr_v" ) )
+			{
+				assertEquals( 1000, imgPlus.dimension( 0 ) );
+				assertEquals( 1000, imgPlus.dimension( 1 ) );
+			}
 			assertEquals( ZarrTestUtils.IMAGE_NAME, imgPlus.getName() );
 		}
 	}
@@ -85,7 +96,11 @@ void testNumDimensions( String resource ) throws URISyntaxException
 		{
 			DefaultPyramidal5DImageData< ?, ? > dataset = load( resource, context );
 			assertNotNull( dataset );
-			assertEquals( 2, dataset.numDimensions() ); // NB: two spatial dimensions
+			if ( resource.contains( "5d_testing" ) )
+				assertEquals( 5, dataset.numDimensions() ); // NB: xyzct
+			if ( resource.contains( "ome_zarr_v" ) )
+				assertEquals( 2, dataset.numDimensions() ); // NB: xy
+
 		}
 	}
 
@@ -96,7 +111,10 @@ void testNumTimepoints( String resource ) throws URISyntaxException
 		try (Context context = new Context())
 		{
 			Pyramidal5DImageData< ? > pyramidal5DImageData = load( resource, context );
-			assertEquals( 1, pyramidal5DImageData.numTimepoints() );
+			if ( resource.contains( "5d_testing" ) )
+				assertEquals( 2, pyramidal5DImageData.numTimepoints() );
+			if ( resource.contains( "ome_zarr_v" ) )
+				assertEquals( 1, pyramidal5DImageData.numTimepoints() );
 		}
 	}
 
@@ -107,7 +125,10 @@ void testNumChannels( String resource ) throws URISyntaxException
 		try (Context context = new Context())
 		{
 			Pyramidal5DImageData< ? > pyramidal5DImageData = load( resource, context );
-			assertEquals( 1, pyramidal5DImageData.numChannels() );
+			if ( resource.contains( "5d_testing" ) )
+				assertEquals( 2, pyramidal5DImageData.numChannels() );
+			if ( resource.contains( "ome_zarr_v" ) )
+				assertEquals( 1, pyramidal5DImageData.numChannels() );
 		}
 	}
 
@@ -143,7 +164,10 @@ void testGetType( String resource ) throws URISyntaxException
 		{
 			Pyramidal5DImageData< ? > pyramidal5DImageData = load( resource, context );
 			Object type = pyramidal5DImageData.getType();
-			Assertions.assertInstanceOf( LongType.class, type );
+			if ( resource.contains( "5d_testing" ) )
+				Assertions.assertInstanceOf( UnsignedByteType.class, type );
+			if ( resource.contains( "ome_zarr_v" ) )
+				Assertions.assertInstanceOf( LongType.class, type );
 		}
 	}
 

src/test/resources/sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v4.ome.zarr/.zattrs

@@ -0,0 +1,62 @@
+{
+  "multiscales": [
+    {
+      "datasets": [
+        {
+          "path": "0",
+          "coordinateTransformations": [
+            {
+              "type": "scale",
+              "scale": [
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0
+              ]
+            }
+          ]
+        },
+        {
+          "path": "1",
+          "coordinateTransformations": [
+            {
+              "type": "scale",
+              "scale": [
+                1.0,
+                1.0,
+                2.0,
+                2.0,
+                2.0
+              ]
+            }
+          ]
+        }
+      ],
+      "name": "image",
+      "axes": [
+        {
+          "name": "t",
+          "type": "time"
+        },
+        {
+          "name": "c",
+          "type": "channel"
+        },
+        {
+          "name": "z",
+          "type": "space"
+        },
+        {
+          "name": "y",
+          "type": "space"
+        },
+        {
+          "name": "x",
+          "type": "space"
+        }
+      ],
+      "version": "0.4"
+    }
+  ]
+}

src/test/resources/sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v4.ome.zarr/.zgroup

@@ -0,0 +1,3 @@
+{
+  "zarr_format": 2
+}

src/test/resources/sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v4.ome.zarr/0/.zarray

@@ -0,0 +1,29 @@
+{
+  "shape": [
+    2,
+    2,
+    16,
+    64,
+    64
+  ],
+  "chunks": [
+    1,
+    1,
+    16,
+    64,
+    64
+  ],
+  "dtype": "|u1",
+  "fill_value": 0,
+  "order": "C",
+  "filters": null,
+  "dimension_separator": "/",
+  "compressor": {
+    "id": "blosc",
+    "cname": "zstd",
+    "clevel": 5,
+    "shuffle": 1,
+    "blocksize": 0
+  },
+  "zarr_format": 2
+}

src/test/resources/sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v4.ome.zarr/0/.zattrs

@@ -0,0 +1 @@
+{}

src/test/resources/sc/fiji/ome/zarr/util/5d_testing/5d_dataset_v4.ome.zarr/0/0/0/0/0/0

@@ -0,0 +1,29 @@
+{
+  "shape": [
+    2,
+    2,
+    8,
+    32,
+    32
+  ],
+  "chunks": [
+    1,
+    1,
+    16,
+    64,
+    64
+  ],
+  "dtype": "|u1",
+  "fill_value": 0,
+  "order": "C",
+  "filters": null,
+  "dimension_separator": "/",
+  "compressor": {
+    "id": "blosc",
+    "cname": "zstd",
+    "clevel": 5,
+    "shuffle": 1,
+    "blocksize": 0
+  },
+  "zarr_format": 2
+}