@@ -66,97 +66,8 @@ public static void setupUV() {
6666 }
6767 }
6868
69- static ucar .ma2 .Array testdata (dev .zarr .zarrjava .core .DataType dt ) {
70- ucar .ma2 .DataType ma2Type = dt .getMA2DataType ();
71- ucar .ma2 .Array array = ucar .ma2 .Array .factory (ma2Type , new int []{16 , 16 , 16 });
72- for (int i = 0 ; i < array .getSize (); i ++) {
73- switch (ma2Type ) {
74- case BOOLEAN :
75- array .setBoolean (i , i % 2 == 0 );
76- break ;
77- case BYTE :
78- case UBYTE :
79- array .setByte (i , (byte ) i );
80- break ;
81- case SHORT :
82- case USHORT :
83- array .setShort (i , (short ) i );
84- break ;
85- case INT :
86- array .setInt (i , i );
87- break ;
88- case UINT :
89- array .setLong (i , i & 0xFFFFFFFFL );
90- break ;
91- case LONG :
92- case ULONG :
93- array .setLong (i , i );
94- break ;
95- case FLOAT :
96- array .setFloat (i , (float ) i );
97- break ;
98- case DOUBLE :
99- array .setDouble (i , i );
100- break ;
101- default :
102- throw new IllegalArgumentException ("Invalid DataType: " + dt );
103- }
104- }
105- return array ;
106- }
107-
108- static void assertIsTestdata (ucar .ma2 .Array result , dev .zarr .zarrjava .core .DataType dt ) {
109- // expected values are i for index i
110- ucar .ma2 .DataType ma2Type = dt .getMA2DataType ();
111- for (int i = 0 ; i < result .getSize (); i ++) {
112- switch (ma2Type ) {
113- case BOOLEAN :
114- Assertions .assertEquals (i % 2 == 0 , result .getBoolean (i ));
115- break ;
116- case BYTE :
117- case UBYTE :
118- Assertions .assertEquals ((byte ) i , result .getByte (i ));
119- break ;
120- case SHORT :
121- case USHORT :
122- Assertions .assertEquals ((short ) i , result .getShort (i ));
123- break ;
124- case INT :
125- Assertions .assertEquals (i , result .getInt (i ));
126- break ;
127- case UINT :
128- Assertions .assertEquals (i & 0xFFFFFFFFL , result .getLong (i ));
129- break ;
130- case LONG :
131- case ULONG :
132- Assertions .assertEquals (i , result .getLong (i ));
133- break ;
134- case FLOAT :
135- Assertions .assertEquals ((float ) i , result .getFloat (i ), 1e-6 );
136- break ;
137- case DOUBLE :
138- Assertions .assertEquals (i , result .getDouble (i ), 1e-12 );
139- break ;
140- default :
141- throw new IllegalArgumentException ("Invalid DataType: " + dt );
142- }
143- }
144- }
145-
14669 static Stream <Object []> compressorAndDataTypeProviderV3 () {
147- Stream <Object []> datatypeTests = Stream .of (
148- DataType .BOOL ,
149- DataType .INT8 ,
150- DataType .UINT8 ,
151- DataType .INT16 ,
152- DataType .UINT16 ,
153- DataType .INT32 ,
154- DataType .UINT32 ,
155- DataType .INT64 ,
156- DataType .UINT64 ,
157- DataType .FLOAT32 ,
158- DataType .FLOAT64
159- ).flatMap (dt -> Stream .of (
70+ Stream <Object []> datatypeTests = dataTypeProviderV3 ().flatMap (dt -> Stream .of (
16071 new Object []{"sharding" , "end" , dt },
16172 new Object []{"blosc" , "blosclz_shuffle_3" , dt }
16273 ));
@@ -185,19 +96,7 @@ static Stream<Object[]> compressorAndDataTypeProviderV3() {
18596 }
18697
18798 static Stream <Object []> compressorAndDataTypeProviderV2 () {
188- Stream <Object []> datatypeTests = Stream .of (
189- dev .zarr .zarrjava .v2 .DataType .BOOL ,
190- dev .zarr .zarrjava .v2 .DataType .INT8 ,
191- dev .zarr .zarrjava .v2 .DataType .UINT8 ,
192- dev .zarr .zarrjava .v2 .DataType .INT16 ,
193- dev .zarr .zarrjava .v2 .DataType .UINT16 ,
194- dev .zarr .zarrjava .v2 .DataType .INT32 ,
195- dev .zarr .zarrjava .v2 .DataType .UINT32 ,
196- dev .zarr .zarrjava .v2 .DataType .INT64 ,
197- dev .zarr .zarrjava .v2 .DataType .UINT64 ,
198- dev .zarr .zarrjava .v2 .DataType .FLOAT32 ,
199- dev .zarr .zarrjava .v2 .DataType .FLOAT64
200- ).flatMap (dt -> Stream .of (
99+ Stream <Object []> datatypeTests = dataTypeProviderV2 ().flatMap (dt -> Stream .of (
201100 new Object []{"zlib" , "0" , dt },
202101 new Object []{"blosc" , "blosclz_shuffle_3" , dt }
203102 ));
@@ -305,7 +204,7 @@ public void testWriteV3(String codec, String codecParam, DataType dataType) thro
305204 @ MethodSource ("compressorAndDataTypeProviderV2" )
306205 public void testReadV2 (String compressor , String compressorParam , dev .zarr .zarrjava .v2 .DataType dt ) throws IOException , ZarrException , InterruptedException {
307206 StoreHandle storeHandle = new FilesystemStore (TESTOUTPUT ).resolve ("testReadV2" , compressor , compressorParam , dt .name ());
308- run_python_script ("zarr_python_write_v2.py" , compressor , compressorParam , dt .name (). toLowerCase (), storeHandle .toPath ().toString ());
207+ run_python_script ("zarr_python_write_v2.py" , compressor , compressorParam , dt .getValue (), storeHandle .toPath ().toString ());
309208
310209 dev .zarr .zarrjava .v2 .Array array = dev .zarr .zarrjava .v2 .Array .open (storeHandle );
311210 ucar .ma2 .Array result = array .read ();
@@ -361,7 +260,7 @@ public void testWriteV2(String compressor, String compressorParam, dev.zarr.zarr
361260 assertIsTestdata (result , dt );
362261
363262 //read in zarr_python
364- run_python_script ("zarr_python_read_v2.py" , compressor , compressorParam , dt .name (). toLowerCase (), storeHandle .toPath ().toString ());
263+ run_python_script ("zarr_python_read_v2.py" , compressor , compressorParam , dt .getValue (), storeHandle .toPath ().toString ());
365264 }
366265
367266 @ CsvSource ({"0,true" , "0,false" , "5, true" , "10, false" })
0 commit comments