Merge pull request #526 from dandi/json-dict-test

Add tests of json_dict() method
dandi · Mar 30, 2021 · 08a14ff · 08a14ff
2 parents c10a8d9 + 90d24dd
commit 08a14ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/dandi/tests/data/metadata/metadata2asset.json b/dandi/tests/data/metadata/metadata2asset.json
@@ -64,12 +64,14 @@
       },
       "sex": {
         "identifier": "http://purl.obolibrary.org/obo/PATO_0000384",
-        "name": "Male"
+        "name": "Male",
+        "schemaKey": "SexType"
       },
       "genotype": "Typical",
       "species": {
         "identifier": "http://purl.obolibrary.org/obo/NCBITaxon_9606",
-        "name": "Human"
+        "name": "Human",
+        "schemaKey": "SpeciesType"
       },
       "schemaKey": "Participant"
     }

diff --git a/dandi/tests/data/metadata/metadata2asset_simple1.json b/dandi/tests/data/metadata/metadata2asset_simple1.json
@@ -23,7 +23,8 @@
       "sampleType": {
         "name": "tissuesample",
         "schemaKey": "SampleType"
-      }
+      },
+      "schemaKey": "BioSample"
     }
   ],
   "wasGeneratedBy": [

diff --git a/dandi/tests/test_metadata.py b/dandi/tests/test_metadata.py
@@ -111,6 +111,9 @@ def test_metadata2asset(schema_dir):
         data_as_dict = json.load(fp)
     data_as_dict["schemaVersion"] = DANDI_SCHEMA_VERSION
     assert data == BareAssetMeta(**data_as_dict)
+    bare_dict = deepcopy(data_as_dict)
+    bare_dict.pop("identifier")
+    assert data.json_dict() == bare_dict
     validate_asset_json(data_as_dict, schema_dir)
 
 
@@ -148,6 +151,9 @@ def test_metadata2asset_simple1(schema_dir):
         data_as_dict = json.load(fp)
     data_as_dict["schemaVersion"] = DANDI_SCHEMA_VERSION
     assert data == BareAssetMeta(**data_as_dict)
+    bare_dict = deepcopy(data_as_dict)
+    bare_dict.pop("identifier")
+    assert data.json_dict() == bare_dict
     validate_asset_json(data_as_dict, schema_dir)
 
 
@@ -162,4 +168,5 @@ def test_dandimeta_migration(schema_dir):
         data_as_dict = json.load(fp)
     data_as_dict["schemaVersion"] = DANDI_SCHEMA_VERSION
     assert data == DandisetMeta(**data_as_dict)
+    assert data.json_dict() == data_as_dict
     validate_dandiset_json(data_as_dict, schema_dir)