Deleted unused classes.

1 files changed, 12 insertions, 10 deletions

diff --git a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
index 23d79ab..0956ee8 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
@@ -3,7 +3,6 @@ package uk.ac.ox.cs.pagoda.global_tests;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.Pagoda;
-import uk.ac.ox.cs.pagoda.tester.PagodaTester;
 import uk.ac.ox.cs.pagoda.util.TestUtil;
 
 import java.io.File;
@@ -11,16 +10,13 @@ import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static uk.ac.ox.cs.pagoda.util.TestUtil.combinePaths;
-
 public class TestPagodaUOBM {
 
-
         private static final int N_1 = 1;
         private static final int N_2 = 10;
 
-        @DataProvider(name = "uobmNumbers")
-        public static Object[][] uobmNumbers() {
+        @DataProvider(name = "UOBMNumbers")
+        private static Object[][] UOBMNumbers() {
                 Integer[][] integers = new Integer[N_2 - N_1 + 1][1];
                 for(int i = 0; i < N_2 - N_1 + 1; i++)
                         integers[i][0] = N_1 + i;
@@ -42,6 +38,7 @@ public class TestPagodaUOBM {
                                                           .build();
                 pagoda.run();
 
+                // TODO use HermitReasoner for computing correct answers if they are missing
                 String given_answers = "uobm/uobm" + number + ".json";
                 CheckAnswers.assertSameAnswers(computedAnswers, Paths.get(ontoDir, given_answers));
         }
@@ -51,12 +48,17 @@ public class TestPagodaUOBM {
                 answersCorrectness(1);
         }
 
-        @Test(groups = {"heavy"}, dataProvider = "uobmNumbers")
+        @Test(groups = {"heavy"}, dataProvider = "UOBMNumbers")
         public void justExecute(int number) {
                 String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                PagodaTester.main(combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
-                                                  combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
-                                                  combinePaths(ontoDir, "uobm/queries/answersCorrectness.sparql"));
+                Pagoda pagoda = Pagoda.builder()
+                                                          .ontology(Paths.get(ontoDir, "uobm/univ-bench-dl.owl"))
+                                                          .data(Paths.get(ontoDir, "uobm/data/uobm" + number + ".ttl"))
+                                                          .query(Paths.get(ontoDir, "uobm/queries/test.sparql"))
+                                                          .classify(true)
+                                                          .hermit(true)
+                                                          .build();
+                pagoda.run();
         }
         
 }