Merge pull request #11 from German-BioImaging/issue#7-rois_for_testing

Issue#7 rois for testing
German-BioImaging · Dec 16, 2024 · 109c90c · 109c90c
2 parents ebc2913 + 932717e
commit 109c90c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/ome-owl b/ome-owl
diff --git a/test/test_queries.py b/test/test_queries.py
@@ -97,6 +97,7 @@ def test_dataset_type_relations(self):
 """
         response = graph.query(query_string)
 
+        print([r for r in response])
         self.assertEqual(len(response), 1)
         self.assertEqual(int([r.n_types for r in response][0]), 1)
 
@@ -154,9 +155,11 @@ def test_number_of_projects_datasets_images(self):
 
         # Check numbers.
         number_of_objects = [r for r in response][0]
-        self.assertEqual(int(number_of_objects.n_projects), 1)
-        self.assertEqual(int(number_of_objects.n_datasets), 3)
         self.assertEqual(int(number_of_objects.n_images  ),  12)
+        self.assertEqual(int(number_of_objects.n_datasets), 3)
+        self.assertEqual(int(number_of_objects.n_projects), 1)
+
+
 
     def test_project(self):
         """ Test number of projects in the VKG. """

diff --git a/test_infra_ontop/catalog-v001.xml b/test_infra_ontop/catalog-v001.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri id="Imports Wizard Entry" name="http://www.openmicroscopy.org/rdf/2016-06/ome_core/" uri="https://raw.githubusercontent.com/German-BioImaging/ome-owl/refs/heads/main/ontology/owl/ome_core/ome_core.owl.ttl"/>
-    <uri id="Imports Wizard Entry" name="http://www.openmicroscopy.org/rdf/2016-06/ome_core/" uri="file:/home/grotec/Repositories/omero-ontop-mappings/ome-owl/ontology/owl/ome_core/ome_core.owl.ttl"/>
     <uri id="Imports Wizard Entry" name="http://www.openmicroscopy.org/rdf/2016-06/ome_core/" uri="https://raw.githubusercontent.com/German-BioImaging/ome-owl/refs/heads/ome-owl_for_ontop/ontology/owl/ome_core/ome_core.owl.ttl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base=""/>
 </catalog>
diff --git a/test_infra_ontop/omemap.obda b/test_infra_ontop/omemap.obda
@@ -123,7 +123,7 @@ target		ome_instance:RegionOfInterest/{roi_id} a ome_core:RegionOfInterest ; dc:
 source		select id as roi_id from roi;
 
 mappingId	MAPID-roi
-target		ome_instance:RegionOfInterest/{roi_id} a ome_core:RegionOfInterest ; ome_core:image ome_instance:Image/{roi_image_id} ; dc:identifier {roi_id}^^xsd:string . 
+target		ome_instance:RegionOfInterest/{roi_id} a ome_core:RegionOfInterest ; ome_core:image ome_instance:Image/{roi_image_id} ; dc:identifier {roi_id}^^xsd:string . ome_instance:Image/{roi_image_id} ome_core:regionOfInterest ome_instance:RegionOfInterest/{roi_id} . 
 source		select id as roi_id, image as roi_image_id from roi ;
 ]]
 
diff --git a/test_infra_ontop/omemap.properties b/test_infra_ontop/omemap.properties
@@ -1,4 +1,4 @@
-#Thu Nov 14 21:58:37 CET 2024
+#Mon Dec 16 11:49:40 CET 2024
 jdbc.password=postgres
 jdbc.user=postgres
 jdbc.url=jdbc\:postgresql\://localhost\:15432/postgres

diff --git a/test_infra_ontop/omemap.ttl b/test_infra_ontop/omemap.ttl
@@ -75,4 +75,4 @@ ome_core:Image owl:disjointWith ome_core:Project .
 ome_core:StructuredAnnotation rdfs:subClassOf ome_core:Annotation .
 
 
-###  Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi
+###  Generated by the OWL API (version 4.5.29.2024-05-13T12:11:03Z) https://github.com/owlcs/owlapi
+1 −0		.gitignore
+1,142 −1,150		ontology/owl/ome_core/ome_core.owl.ttl
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,4 +75,4 @@ ome_core:Image owl:disjointWith ome_core:Project .
		ome_core:StructuredAnnotation rdfs:subClassOf ome_core:Annotation .


		### Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi
		### Generated by the OWL API (version 4.5.29.2024-05-13T12:11:03Z) https://github.com/owlcs/owlapi