From 2dbf416294d64ae6999b8a26fac268d500aa3528 Mon Sep 17 00:00:00 2001
From: Trevor Manz <trevor.j.manz@gmail.com>
Date: Thu, 15 Apr 2021 13:14:47 -0400
Subject: [PATCH] Extract method to create simple fixure

---
 fixtures/generate_fixtures.py    |  67 ++++++++++++-------------------
 fixtures/simple_gzip_BE.zarr/0.0 | Bin 31 -> 31 bytes
 fixtures/simple_gzip_BE.zarr/3.0 | Bin 25 -> 25 bytes
 fixtures/simple_gzip_LE.zarr/0.0 | Bin 28 -> 28 bytes
 fixtures/simple_gzip_LE.zarr/3.0 | Bin 27 -> 27 bytes
 5 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/fixtures/generate_fixtures.py b/fixtures/generate_fixtures.py
index 8c3dbac..2111bbb 100644
--- a/fixtures/generate_fixtures.py
+++ b/fixtures/generate_fixtures.py
@@ -1,59 +1,56 @@
 import os
 
-import zarr  # 2.7
+import zarr
+from zarr.creation import create  # 2.7
 from zarr.util import json_dumps, json_loads
 
 FIXTURES_FOLDER = "./"
 
 
-def generate_fixtures():
-
-    empty_path = os.path.join(FIXTURES_FOLDER, "empty.zarr")
-    zarr.open(
-        empty_path,
+def create_simple_array(store, dtype, compression=None, write_chunks=False):
+    arr = zarr.open(
+        store=store,
         shape=(8, 8),
         chunks=(2, None),
-        dtype="<i4",
+        dtype=dtype,
         fill_value=0,
         mode="w",
-        compressor=None,
+        compression=compression,
     )
+    if write_chunks:
+        arr[0, 0] = 1
+        arr[0, 1] = 2
+        arr[7, 7] = 3
+
+
+def generate_fixtures():
+
+    # Empty fixture
+    create_simple_array(os.path.join(FIXTURES_FOLDER, "empty.zarr"), dtype="<i4")
 
     # little endian
     for codec in (None, "gzip", "zlib"):
-        simple_path = os.path.join(
+        path = os.path.join(
             FIXTURES_FOLDER, "simple{}_LE.zarr".format(f"_{codec}" if codec else "")
         )
-        simple_zarr_array = zarr.open(
-            simple_path,
-            shape=(8, 8),
-            chunks=(2, None),
+        create_simple_array(
+            store=path,
             dtype="<i4",
-            fill_value=0,
-            mode="w",
             compression=codec,
+            write_chunks=True,
         )
-        simple_zarr_array[0, 0] = 1
-        simple_zarr_array[0, 1] = 2
-        simple_zarr_array[7, 7] = 3
 
     # big endian
     for codec in (None, "gzip", "zlib"):
-        simple_path = os.path.join(
+        path = os.path.join(
             FIXTURES_FOLDER, "simple{}_BE.zarr".format(f"_{codec}" if codec else "")
         )
-        simple_zarr_array = zarr.open(
-            simple_path,
-            shape=(8, 8),
-            chunks=(2, None),
+        create_simple_array(
+            store=path,
             dtype=">i4",
-            fill_value=0,
-            mode="w",
             compression=codec,
+            write_chunks=True,
         )
-        simple_zarr_array[0, 0] = 1
-        simple_zarr_array[0, 1] = 2
-        simple_zarr_array[7, 7] = 3
 
     # nested
     # TODO: Use latest zarr-python once https://github.com/zarr-developers/zarr-python/pull/716 is merged
@@ -62,19 +59,7 @@ def generate_fixtures():
         key_separator="/",
         auto_mkdir=True,
     )
-
-    nested = zarr.open(
-        store,
-        shape=(8, 8),
-        chunks=(2, None),
-        dtype=">i4",
-        fill_value=0,
-        mode="w",
-    )
-    nested[0, 0] = 1
-    nested[0, 1] = 2
-    nested[7, 7] = 3
-
+    create_simple_array(store=store, dtype=">i4", compression='blosc', write_chunks=True)
     # Manually add dimension separator to array meta
     meta = json_loads(store[".zarray"])
     meta["dimension_separator"] = "/"
diff --git a/fixtures/simple_gzip_BE.zarr/0.0 b/fixtures/simple_gzip_BE.zarr/0.0
index e51a433ff7148e9a53e7715e07c80fe1685f312e..9ea6392af971452cf571abcd60570ac7356d9d21 100644
GIT binary patch
literal 31
lcmb2|=3wwBsYqb?pPZ18kOIU^Nt+lL4t9xJIxsLW005yh2|xe<

literal 31
lcmb2|=3uBOtVm$_pPZ18kOIU^Nt+lL4t9xJIxsLW005=-32guX

diff --git a/fixtures/simple_gzip_BE.zarr/3.0 b/fixtures/simple_gzip_BE.zarr/3.0
index 4e513fe9b243486399f690f965b9459196c584be..7a7c4d824e6b883c3c6a10ae93cd128a123e0758 100644
GIT binary patch
literal 25
gcmb2|=3wwBsYqb?pPaCO!+@Eg$Ef9v0|NsC0At|?RsaA1

literal 25
gcmb2|=3uBOtVm$_pPaCO!+@Eg$Ef9v0|NsC0B4m4g8%>k

diff --git a/fixtures/simple_gzip_LE.zarr/0.0 b/fixtures/simple_gzip_LE.zarr/0.0
index 7c119bf334a44d519a4a09d4b0f3be90f1b503f7..144a79222ac4269282ab0cc6e8639402498a6cef 100644
GIT binary patch
literal 28
jcmb2|=3wwBsYqb?pPZ7Akie8w#K`a`G;fOo0|Ns9g82x$

literal 28
jcmb2|=3uBOtVm$_pPZ7Akie8w#K`a`G;fOo0|Ns9hcpQ2

diff --git a/fixtures/simple_gzip_LE.zarr/3.0 b/fixtures/simple_gzip_LE.zarr/3.0
index c68de2155184a557b3b71ce34e66887d0c14cf1f..5b35d97b0bbbb8edbae843ba983449c221f36f12 100644
GIT binary patch
literal 27
icmb2|=3wwBsYqb?pPZl|Z@|2jiQ&c>i*yGD1_l6eg9o_)

literal 27
icmb2|=3uBOtVm$_pPZl|Z@|2jiQ&c>i*yGD1_l6ikq71g