Skip to content

Commit

Permalink
Cover orphans in AnVIL verbatim PFB unit test (#6691)
Browse files Browse the repository at this point in the history
  • Loading branch information
nadove-ucsc committed Nov 14, 2024
1 parent 04714bf commit aeeaceb
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 1 deletion.
37 changes: 37 additions & 0 deletions test/service/data/verbatim/anvil/pfb_entities.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@
"ontology_reference": "",
"properties": [],
"values": {}
},
{
"links": [],
"name": "non_schema_orphan_table",
"ontology_reference": "",
"properties": [],
"values": {}
}
]
},
Expand Down Expand Up @@ -132,6 +139,16 @@
},
"relations": []
},
{
"id": "28ed0f3a-157b-417b-a05a-48f57f9d3a34",
"name": "non_schema_orphan_table",
"object": {
"datarepo_row_id": "28ed0f3a-157b-417b-a05a-48f57f9d3a34",
"non_schema_column": "eggs",
"version": "2022-06-01T00:00:00.000000Z"
},
"relations": []
},
{
"id": "826dea02-e274-4ffe-aabc-eb3db63ad068",
"name": "anvil_biosample",
Expand Down Expand Up @@ -279,6 +296,26 @@
},
"relations": []
},
{
"id": "9687b86d-a2ae-a083-b910-a16bcbef1ba4",
"name": "non_schema_orphan_table",
"object": {
"datarepo_row_id": "9687b86d-a2ae-a083-b910-a16bcbef1ba4",
"non_schema_column": "spam",
"version": "2022-06-01T00:00:00.000000Z"
},
"relations": []
},
{
"id": "9db5952c-c454-49d9-8a62-5abb026701c0",
"name": "non_schema_orphan_table",
"object": {
"datarepo_row_id": "9db5952c-c454-49d9-8a62-5abb026701c0",
"non_schema_column": "baked beans",
"version": "2022-06-01T00:00:00.000000Z"
},
"relations": []
},
{
"id": "15b76f9c-6b46-433f-851d-34e89f1b9ba6",
"name": "anvil_file",
Expand Down
21 changes: 21 additions & 0 deletions test/service/data/verbatim/anvil/pfb_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,27 @@
],
"name": "anvil_variantcallingactivity",
"type": "record"
},
{
"fields": [
{
"name": "datarepo_row_id",
"namespace": "non_schema_orphan_table",
"type": "string"
},
{
"name": "non_schema_column",
"namespace": "non_schema_orphan_table",
"type": "string"
},
{
"name": "version",
"namespace": "non_schema_orphan_table",
"type": "string"
}
],
"name": "non_schema_orphan_table",
"type": "record"
}
]
},
Expand Down
4 changes: 3 additions & 1 deletion test/service/test_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2122,7 +2122,9 @@ def hash_entities(entities: dict[EntityReference, JSON]) -> dict[str, JSON]:
return all_entities_by_hash.values(), linked_entities_by_hash.values()

def test_verbatim_pfb_manifest(self):
response = self._get_manifest(ManifestFormat.verbatim_pfb, filters={})
response = self._get_manifest(ManifestFormat.verbatim_pfb, filters={
'datasets.dataset_id': {'is': ['52ee7665-7033-63f2-a8d9-ce8e32666739']}
})
self.assertEqual(200, response.status_code)
with open(self._data_path('service') / 'verbatim/anvil/pfb_schema.json') as f:
expected_schema = json.load(f)
Expand Down

0 comments on commit aeeaceb

Please sign in to comment.