From cd7fdfcbef1ca6e9fc389e0bb3cb9060d4f7ae00 Mon Sep 17 00:00:00 2001
From: Axel Bocciarelli <axelboc@gmail.com>
Date: Wed, 24 Jan 2024 16:06:36 +0100
Subject: [PATCH] Test new type metadata

---
 CONTRIBUTING.md   |  2 +-
 setup.cfg         |  5 +++--
 tasks.py          |  4 ++--
 test/base_test.py | 31 ++++++++++++++++++++++++++-----
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 355e641..c573ae6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@
 pip install -e .[dev]
 ```
 
-will install `h5grove` in editable mode with all the linting/formating/testing packages. This will also install the [flask](https://flask.palletsprojects.com/en/) and [tornado](https://www.tornadoweb.org/en/stable/) packages as they are needed to build the documentation.
+will install `h5grove` in editable mode with all the linting/formating/testing packages. This will also install the [fastapi](https://fastapi.tiangolo.com/), [flask](https://flask.palletsprojects.com/en/) and [tornado](https://www.tornadoweb.org/en/stable/) packages as they are needed to build the documentation and test the project.
 
 ## Linting
 
diff --git a/setup.cfg b/setup.cfg
index d8d1ee5..aebce7e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,7 +26,7 @@ install_requires =
 
 [options.extras_require]
 fastapi = 
-    fastapi
+	fastapi
 	pydantic > 2
 	pydantic-settings
 	uvicorn
@@ -35,7 +35,7 @@ flask =
 	Flask-Compress
 	Flask-Cors
 tornado =
-    tornado
+	tornado
 dev = 
 	black
 	bump2version
@@ -43,6 +43,7 @@ dev =
 	flake8
 	h5grove[fastapi]
 	h5grove[flask]
+	h5grove[tornado]
 	invoke
 	mypy
 	myst-parser
diff --git a/tasks.py b/tasks.py
index 0a2fa1b..a80eca1 100644
--- a/tasks.py
+++ b/tasks.py
@@ -32,9 +32,9 @@ def lint(c):
 
 
 @task
-def test(c):
+def test(c, verbose=False, keyword=""):
     """Test without benchmark"""
-    c.run("pytest --benchmark-skip")
+    c.run("pytest --benchmark-skip" + (" -vv" if verbose else "") + ((" -k" + keyword) if keyword else ""))
 
 
 @task
diff --git a/test/base_test.py b/test/base_test.py
index b07ad1f..162a4ce 100644
--- a/test/base_test.py
+++ b/test/base_test.py
@@ -134,11 +134,11 @@ def test_meta_on_chunked_compressed_dataset(self, server):
         assert content == {
             "attributes": [],
             "chunks": [5, 5],
-            "dtype": "<f8",
             "filters": [{"id": 2, "name": "shuffle"}, {"id": 1, "name": "deflate"}],
             "kind": "dataset",
             "name": "data",
             "shape": [10, 10],
+            "type": {"class": 1, "dtype": "<f8", "size": 8, "order": 0},
         }
 
     def test_meta_on_compound_dataset(self, server):
@@ -161,11 +161,32 @@ def test_meta_on_compound_dataset(self, server):
         assert content == {
             "attributes": [],
             "chunks": None,
-            "dtype": {"name": "|S10", "age": "<i4", "weight": "<f4"},
             "filters": None,
+            "kind": "dataset",
             "name": "dogs",
             "shape": [2],
-            "type": "dataset",
+            "type": {
+                "class": 6,
+                "dtype": {"age": "<i4", "name": "|S10", "weight": "<f4"},
+                "size": 18,
+                "members": {
+                    "age": {
+                        "class": 0,
+                        "dtype": "<i4",
+                        "size": 4,
+                        "order": 0,
+                        "sign": 1,
+                    },
+                    "name": {
+                        "class": 3,
+                        "dtype": "|S10",
+                        "size": 10,
+                        "cset": 0,
+                        "vlen": False,
+                    },
+                    "weight": {"class": 1, "dtype": "<f4", "size": 4, "order": 0},
+                },
+            },
         }
 
     def test_meta_on_group(self, server):
@@ -221,11 +242,11 @@ def test_meta_on_valid_ext_link(self, server, resolve_links):
             assert content == {
                 "attributes": [],
                 "chunks": None,
-                "dtype": "<f8",
                 "filters": None,
                 "kind": "dataset",
                 "name": "ext_link",
                 "shape": [10],
+                "type": {"class": 1, "dtype": "<f8", "order": 0, "size": 8},
             }
 
     def test_stats_on_negative_scalar(self, server):
@@ -358,9 +379,9 @@ def test_meta_on_broken_soft_link(self, server, resolve_links):
             response = server.get(url)
             content = decode_response(response)
             assert content == {
+                "kind": "soft_link",
                 "name": "link",
                 "target_path": "not_an_entity",
-                "type": "soft_link",
             }
 
     def test_403_on_file_without_read_permission(self, server):