fix broken path

Author: andrewelamb

tests/unit/synapseclient/extensions/conftest.py

@@ -60,11 +60,20 @@ def helpers():
 
 @pytest.fixture(name="dmge", scope="function")
 def DMGE(helpers: Helpers) -> DataModelGraphExplorer:
-    """Fixture to instantiate a DataModelGraphExplorer object using the data model with column types"""
+    """Fixture to instantiate a DataModelGraphExplorer object using the csv data model"""
     dmge = helpers.get_data_model_graph_explorer(path="data_models/example.model.csv")
     return dmge
 
 
+@pytest.fixture(name="dmge_json_ld", scope="function")
+def dmge_json_ld(helpers: Helpers) -> DataModelGraphExplorer:
+    """Fixture to instantiate a DataModelGraphExplorer object using the jsonls data model"""
+    dmge = helpers.get_data_model_graph_explorer(
+        path="data_models_jsonld/example.model.jsonld"
+    )
+    return dmge
+
+
 @pytest.fixture(name="dmr")
 def fixture_dmr():
     "Returns a DataModelRelationships instance"
@@ -82,7 +91,9 @@ def fixture_dmp(helpers: Helpers) -> DataModelParser:
 @pytest.fixture(name="dmp_jsonld")
 def fixture_dmp_json_ld(helpers: Helpers) -> DataModelParser:
     "Returns a DataModelParser using the jsonld data model"
-    data_model_path = helpers.get_schema_file_path("data_models/example.model.jsonld")
+    data_model_path = helpers.get_schema_file_path(
+        "data_models_jsonld/example.model.jsonld"
+    )
     dmp = DataModelParser(data_model_path, logger=Mock())
     return dmp
 

tests/unit/synapseclient/extensions/unit_test_create_json_schema.py

@@ -638,6 +638,51 @@ def test_create_json_schema_with_display_names(
     assert expected_json == test_json
 
 
+@pytest.mark.parametrize(
+    "datatype",
+    [
+        ("Biospecimen"),
+        ("BulkRNA-seqAssay"),
+        ("JSONSchemaComponent"),
+        ("MockComponent"),
+        ("MockFilename"),
+        ("MockRDB"),
+        ("Patient"),
+    ],
+    ids=[
+        "Biospecimen",
+        "BulkRNA-seqAssay",
+        "JSONSchemaComponent",
+        "MockComponent",
+        "MockFilename",
+        "MockRDB",
+        "Patient",
+    ],
+)
+def test_create_json_schema_with_class_label_using_jsonld(
+    dmge_json_ld: DataModelGraphExplorer, datatype: str, test_directory: str
+) -> None:
+    """Tests for JSONSchemaGenerator.create_json_schema"""
+    test_path = get_test_schema_path(test_directory, datatype)
+    expected_path = get_expected_schema_path(datatype)
+    logger = logging.getLogger(__name__)
+
+    create_json_schema(
+        dmge=dmge_json_ld,
+        datatype=datatype,
+        schema_name=f"{datatype}_validation",
+        schema_path=test_path,
+        use_property_display_names=False,
+        logger=logger,
+    )
+    with open(expected_path, encoding="utf-8") as file1, open(
+        test_path, encoding="utf-8"
+    ) as file2:
+        expected_json = json.load(file1)
+        test_json = json.load(file2)
+    assert expected_json == test_json
+
+
 @pytest.mark.parametrize(
     "instance_filename, datatype",
     [

tests/unit/synapseclient/extensions/unit_test_data_model_parser.py

@@ -96,7 +96,7 @@ def test_gather_jsonld_attributes_relationships(
     ):
         """The output of the function is a attributes relationship dictionary, check that it is formatted properly."""
         path_to_data_model = helpers.get_schema_file_path(
-            "data_models/example.model.jsonld"
+            "data_models_jsonld/example.model.jsonld"
         )
         model_jsonld = load_json(path_to_data_model)
         attr_rel_dict = jsonld_dmp.gather_jsonld_attributes_relationships(
@@ -117,7 +117,7 @@ def test_parse_jsonld_model(
     ):
         """The output of the function is a attributes relationship dictionary, check that it is formatted properly."""
         path_to_data_model = helpers.get_schema_file_path(
-            "data_models/example.model.jsonld"
+            "data_models_jsonld/example.model.jsonld"
         )
         attr_rel_dictionary = jsonld_dmp.parse_jsonld_model(
             path_to_data_model=path_to_data_model,