Added more tests.

Querying of the upper bound is currently unstable.

1 files changed, 9 insertions, 22 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 0956ee8..558ac1f 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
@@ -13,7 +13,7 @@ import java.nio.file.Paths;
 public class TestPagodaUOBM {
 
         private static final int N_1 = 1;
-        private static final int N_2 = 10;
+        private static final int N_2 = 4;
 
         @DataProvider(name = "UOBMNumbers")
         private static Object[][] UOBMNumbers() {
@@ -23,42 +23,29 @@ public class TestPagodaUOBM {
                 return integers;
         }
 
-        public void answersCorrectness(int number) throws IOException {
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                Path computedAnswers = Paths.get(File.createTempFile("answers", ".json").getAbsolutePath());
-                new File(computedAnswers.toString()).deleteOnExit();
-
-                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"))
-                                                          .answer(computedAnswers)
-                                                          .classify(true)
-                                                          .hermit(true)
-                                                          .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));
-        }
-
         @Test(groups = {"light"})
         public void answersCorrectness_1() throws IOException {
                 answersCorrectness(1);
         }
 
         @Test(groups = {"heavy"}, dataProvider = "UOBMNumbers")
-        public void justExecute(int number) {
+        public void answersCorrectness(int number) throws IOException {
                 String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
+                Path answers = Paths.get(File.createTempFile("answers", ".json").getAbsolutePath());
+                new File(answers.toString()).deleteOnExit();
+                Path givenAnswers = TestUtil.getAnswersFilePath("answers/pagoda-uobm" + number + ".json");
+
                 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"))
+                                                          .answer(answers)
                                                           .classify(true)
                                                           .hermit(true)
                                                           .build();
+
                 pagoda.run();
+                CheckAnswers.assertSameAnswers(answers, givenAnswers);
         }
         
 }