test: Use unmodified entsoe model

statnett · Feb 14, 2024 · f637142 · f637142
1 parent 1b68709
commit f637142
Show file tree

Hide file tree

Showing 11 changed files with 39,983 additions and 48,355 deletions.
diff --git a/cimsparql/adaptions.py b/cimsparql/adaptions.py
@@ -69,6 +69,7 @@ def add_dtypes(self) -> None:
             "SvPowerFlow.p": XSD.float,
             ".open": XSD.boolean,
             ".connected": XSD.boolean,
+            ".nominalVoltage": XSD.float,
         }
         for s, predicate, o, g in self.graph.quads():
             with suppress(StopIteration):

diff --git a/tests/data/small/README.md b/tests/data/small/README.md
@@ -0,0 +1,5 @@
+# Model info
+
+Model extracted from
+
+SmallGrid/BusBranch/CGMES_v2.4.15_SmallGridTestConfiguration_BaseCase_Complete_v3.0.0
diff --git a/tests/data/small/SmallGridTestConfiguration_BC_DL_v3.0.0.xml b/tests/data/small/SmallGridTestConfiguration_BC_DL_v3.0.0.xml
diff --git a/tests/data/small/SmallGridTestConfiguration_BC_EQ_v3.0.0.xml b/tests/data/small/SmallGridTestConfiguration_BC_EQ_v3.0.0.xml
diff --git a/tests/data/small/SmallGridTestConfiguration_BC_GL_v3.0.0.xml b/tests/data/small/SmallGridTestConfiguration_BC_GL_v3.0.0.xml
diff --git a/tests/data/small/SmallGridTestConfiguration_BC_SSH_v3.0.0.xml b/tests/data/small/SmallGridTestConfiguration_BC_SSH_v3.0.0.xml
diff --git a/tests/data/small/SmallGridTestConfiguration_BC_SV_v3.0.0.xml b/tests/data/small/SmallGridTestConfiguration_BC_SV_v3.0.0.xml
diff --git a/tests/data/small/SmallGridTestConfiguration_BC_TP_v3.0.0.xml b/tests/data/small/SmallGridTestConfiguration_BC_TP_v3.0.0.xml
diff --git a/tests/data/smallgrid_eq.nq b/tests/data/smallgrid_eq.nq
diff --git a/tests/data/smallgrid_tpsvssh.nq b/tests/data/smallgrid_tpsvssh.nq
diff --git a/tests/t_utils/entsoe_models.py b/tests/t_utils/entsoe_models.py
@@ -125,14 +125,21 @@ def bg_http(url: str, name: str) -> GraphDBClient:
         return new_repo_blazegraph(url, name, "http")
 
     model = None
-    test_folder = Path(__file__).parent.parent / "data"
+    test_folder = Path(__file__).parent.parent / "data/small"
     try:
+        adaptor = XmlModelAdaptor.from_folder(test_folder)
+        adaptor.adapt()
         init_func = t_common.init_repo_rdf4j if api == RestApi.RDF4J else bg_http
         tpsvssh_client = init_func(url, "smallgrid_tpsvssh")
-        tpsvssh_client.upload_rdf(test_folder / "smallgrid_tpsvssh.nq", "n-quads")
+        tpsvssh_ctx = adaptor.tpsvssh_contexts()
+        tpsvssh_client.upload_rdf(adaptor.nq_bytes(tpsvssh_ctx), "n-quads")
+
+        remaining = adaptor.nq_bytes(
+            [ctx for ctx in adaptor.graph.contexts() if ctx not in tpsvssh_ctx]
+        )
 
         eq_client = init_func(url, "smallgrid_eq")
-        eq_client.upload_rdf(test_folder / "smallgrid_eq.nq", "n-quads")
+        eq_client.upload_rdf(remaining, "n-quads")
 
         m_cfg = ModelConfig(
             system_state_repo=tpsvssh_client.service_cfg.url,