Updated and re-activated test for LoadEmbeddedOntologies

FAIRdom · Mar 17, 2014 · deeff04 · deeff04
1 parent fae277e
commit deeff04
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 24 deletions.
diff --git a/src/test/java/uk/ac/manchester/cs/owl/semspreadsheets/model/OntologyManagerTest.java b/src/test/java/uk/ac/manchester/cs/owl/semspreadsheets/model/OntologyManagerTest.java
@@ -423,30 +423,7 @@ public void testSetOntologyTermValidation() throws Exception {
 
 	}
 
-//	@Test @Ignore("Dependent ontology contains an invalid import. Ontology needs fixing to no longer be reliant on external resources")
-//	public void testLoadEmbeddedOntologies() throws Exception {
-//		workbookManager.loadWorkbook(DocumentsCatalogue.twoOntologiesWorkbookURI());
-//		assertEquals(0, ontologyManager.getLoadedOntologies().size());
-//		assertEquals(0, ontologyManager.getAllOntologies().size());
-//		assertEquals(2,ontologyManager.getOntologyIRIs().size());
-//		assertTrue(ontologyManager.getOntologyIRIs().contains(IRI.create("http://www.mygrid.org.uk/ontology/JERMOntology")));
-//		assertTrue(ontologyManager.getOntologyIRIs().contains(IRI.create("http://mged.sourceforge.net/ontologies/MGEDOntology.owl")));
-//		ontologyManager.loadEmbeddedTermOntologies();
-//		assertEquals(2, ontologyManager.getLoadedOntologies().size());
-//		assertEquals(4, ontologyManager.getAllOntologies().size());
-//		
-//		//now with just properties over free text		
-//		WorkbookManager manager = new WorkbookManager();
-//		manager.loadWorkbook(DocumentsCatalogue.simpleWorkbookWithLiteralsOverRangeURI());
-//		assertEquals(0, manager.getOntologyManager().getLoadedOntologies().size());
-//		assertEquals(0, manager.getOntologyManager().getAllOntologies().size());
-//		assertEquals(1,manager.getOntologyManager().getOntologyIRIs().size());
-//		manager.getOntologyManager().loadEmbeddedTermOntologies();
-//		assertEquals(1, manager.getOntologyManager().getLoadedOntologies().size());
-//		assertEquals(1, manager.getOntologyManager().getAllOntologies().size());
-//		
-//		
-//	}
+
 
 	@Test
 	public void testGetPropertiesForSubclasses() throws Exception {

diff --git a/src/test/java/uk/ac/manchester/cs/owl/semspreadsheets/ui/LoadEmbeddedOntologiesTest.java b/src/test/java/uk/ac/manchester/cs/owl/semspreadsheets/ui/LoadEmbeddedOntologiesTest.java
@@ -0,0 +1,60 @@
+package uk.ac.manchester.cs.owl.semspreadsheets.ui;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.semanticweb.owlapi.model.IRI;
+
+import uk.ac.manchester.cs.owl.semspreadsheets.DocumentsCatalogue;
+import uk.ac.manchester.cs.owl.semspreadsheets.DummyOntologyManagerListener;
+import uk.ac.manchester.cs.owl.semspreadsheets.model.OntologyManager;
+import uk.ac.manchester.cs.owl.semspreadsheets.model.WorkbookManager;
+
+public class LoadEmbeddedOntologiesTest {
+
+	private OntologyManager ontologyManager;
+	private DummyOntologyManagerListener testListener;
+	private WorkbookManager workbookManager;
+
+	@Before
+	public void createOntologyManager() {
+		workbookManager = new WorkbookManager();
+		ontologyManager = workbookManager.getOntologyManager();		
+		testListener=new DummyOntologyManagerListener();		
+		ontologyManager.addListener(testListener);
+	}
+
+	@Test
+	public void testLoadEmbeddedOntologies() throws Exception {
+		LoadEmbeddedTermsOntologies task = new LoadEmbeddedTermsOntologies();
+		workbookManager.loadWorkbook(DocumentsCatalogue.twoOntologiesWorkbookURI());
+		assertEquals(0, ontologyManager.getLoadedOntologies().size());
+		assertEquals(2,ontologyManager.getOntologyIRIs().size());
+		assertTrue(ontologyManager.getOntologyIRIs().contains(IRI.create("http://www.mygrid.org.uk/ontology/JERMOntology")));
+		assertTrue(ontologyManager.getOntologyIRIs().contains(IRI.create("http://mged.sourceforge.net/ontologies/MGEDOntology.owl")));
+
+		task.setup(new WorkbookFrame(workbookManager));
+		task.runTask();
+		assertEquals(2, ontologyManager.getLoadedOntologies().size());
+		assertEquals(3, ontologyManager.getAllOntologies().size());
+
+		//now with just properties over free text		
+		WorkbookManager manager = new WorkbookManager();
+		manager.loadWorkbook(DocumentsCatalogue.simpleWorkbookWithLiteralsOverRangeURI());
+		assertEquals(0, manager.getOntologyManager().getLoadedOntologies().size());
+		assertEquals(0, manager.getOntologyManager().getAllOntologies().size());
+		assertEquals(1,manager.getOntologyManager().getOntologyIRIs().size());
+		task = new LoadEmbeddedTermsOntologies();
+
+		task.setup(new WorkbookFrame(manager));
+		task.runTask();
+
+		assertEquals(1, manager.getOntologyManager().getLoadedOntologies().size());
+		assertEquals(1, manager.getOntologyManager().getAllOntologies().size());
+
+
+	}	
+
+}