uncommented the previously-bad test

ge-semtk · Mar 20, 2023 · d0bf88f · d0bf88f
1 parent b758e96
commit d0bf88f
Showing 1 changed file with 50 additions and 50 deletions.
diff --git a/...ary/src/test/java/com/ge/research/semtk/servlet/utility/test/StartupUtilitiesTest_IT.java b/...ary/src/test/java/com/ge/research/semtk/servlet/utility/test/StartupUtilitiesTest_IT.java
@@ -13,7 +13,7 @@
 import com.ge.research.semtk.test.TestGraph;
 import com.ge.research.semtk.utility.Utility;
 
-public class TestStartupUtilities_IT {
+public class StartupUtilitiesTest_IT {
 	@BeforeClass
 	public static void setup() throws Exception {
 		IntegrationTestUtility.authenticateJunit();
@@ -32,54 +32,54 @@ public static void cleanup() throws Exception {
 	 *     sei.getVersionOfOntologyLoaded()
 	 * @throws Exception
 	 */
-//	@Test
-//	public void testUploadOwlIfNeeded() throws Exception {
-//		TestGraph.clearGraph();
-//		
-//		OntologyInfoClient oInfoClient = IntegrationTestUtility.getOntologyInfoClient();
-//		SparqlEndpointInterface sei = TestGraph.getSei();
-//
-//		Utility.OwlRdfInfo fileInfo = Utility.getInfoFromOwlRdf(getClass().getResourceAsStream("/pet.owl"));
-//		// test that null is returned when ontology is not yet loaded
-//		assertEquals("Version from triplestore is not null when graph is empty", 
-//				null, sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
-//		
-//		// load ontology with a version 1
-//		StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/pet.owl");
-//		// test that version is returned
-//		assertEquals("Version number from triplestore does not match version in owl", 
-//				fileInfo.getVersion(), sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
-//		
-//		// now try version 2
-//		int triples = sei.getNumTriples();
-//		fileInfo = Utility.getInfoFromOwlRdf(getClass().getResourceAsStream("/pet2.owl"));
-//		StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/pet2.owl");
-//		// version should have changed
-//		assertEquals("Version number from triplestore does not match version in owl", 
-//				fileInfo.getVersion(), sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
-//		
-//		// triples should actually have changed (to smaller number in pet2.owl) also
-//		int triples2 = sei.getNumTriples();
-//		assertTrue("Triples did not change when new smaller version was loaded", triples2 < triples);
-//		
-//		
-//		// try another with no version
-//		fileInfo = Utility.getInfoFromOwlRdf(getClass().getResourceAsStream("/SimpleBoolean.owl"));
-//		String emptyVersion = fileInfo.getVersion();
-//		assertEquals("Owl file with no version didn't get empty string version", "", emptyVersion);
-//		assertEquals("Version number from triplestore is not null when graph is empty", 
-//				null, sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
-//		StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/SimpleBoolean.owl");
-//		assertEquals("Version from triplestore does not match version in owl", 
-//				sei.getVersionOfOntologyLoaded(fileInfo.getBase()), sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
-//		int triples3 = sei.getNumTriples();
-//		assertTrue("Triples did not change when another ontology was loaded", triples3 > triples2);
-//		
-//		// reload exact same file should do nothing
-//		boolean ret = StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/SimpleBoolean.owl");
-//		assertFalse("Wrong return when re-updating same owl", ret);
-//		int triples4 = sei.getNumTriples();
-//		assertTrue("Triples did changed when nothing was reported updated", triples4 == triples3);
-//	}
+	@Test
+	public void testUploadOwlIfNeeded() throws Exception {
+		TestGraph.clearGraph();
+
+		OntologyInfoClient oInfoClient = IntegrationTestUtility.getOntologyInfoClient();
+		SparqlEndpointInterface sei = TestGraph.getSei();
+
+		Utility.OwlRdfInfo fileInfo = Utility.getInfoFromOwlRdf(getClass().getResourceAsStream("/pet.owl"));
+		// test that null is returned when ontology is not yet loaded
+		assertEquals("Version from triplestore is not null when graph is empty", 
+				null, sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
+
+		// load ontology with a version 1
+		StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/pet.owl");
+		// test that version is returned
+		assertEquals("Version number from triplestore does not match version in owl", 
+				fileInfo.getVersion(), sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
+
+		// now try version 2
+		int triples = sei.getNumTriples();
+		fileInfo = Utility.getInfoFromOwlRdf(getClass().getResourceAsStream("/pet2.owl"));
+		StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/pet2.owl");
+		// version should have changed
+		assertEquals("Version number from triplestore does not match version in owl", 
+				fileInfo.getVersion(), sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
+
+		// triples should actually have changed (to smaller number in pet2.owl) also
+		int triples2 = sei.getNumTriples();
+		assertTrue("Triples did not change when new smaller version was loaded", triples2 < triples);
+
+
+		// try another with no version
+		fileInfo = Utility.getInfoFromOwlRdf(getClass().getResourceAsStream("/SimpleBoolean.owl"));
+		String emptyVersion = fileInfo.getVersion();
+		assertEquals("Owl file with no version didn't get empty string version", "", emptyVersion);
+		assertEquals("Version number from triplestore is not null when graph is empty", 
+				null, sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
+		StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/SimpleBoolean.owl");
+		assertEquals("Version from triplestore does not match version in owl", 
+				sei.getVersionOfOntologyLoaded(fileInfo.getBase()), sei.getVersionOfOntologyLoaded(fileInfo.getBase()));
+		int triples3 = sei.getNumTriples();
+		assertTrue("Triples did not change when another ontology was loaded", triples3 > triples2);
+
+		// reload exact same file should do nothing
+		boolean ret = StartupUtilities.updateOwlIfNeeded(sei, oInfoClient, getClass(), "/SimpleBoolean.owl");
+		assertFalse("Wrong return when re-updating same owl", ret);
+		int triples4 = sei.getNumTriples();
+		assertTrue("Triples did changed when nothing was reported updated", triples4 == triples3);
+	}
 
 }