1 files changed, 15 insertions, 26 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 1d9f1e6..d0f0b9a 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaUOBM.java
@@ -24,12 +24,12 @@ public class TestPagodaUOBM {
                 return integers;
         }
 
-        @Test(groups = {"light"})
+        @Test(groups = {"light", "correctness"})
         public void answersCorrectness_1() throws IOException {
                 answersCorrectness(1);
         }
 
-        @Test(groups = {"heavy"}, dataProvider = "UOBMNumbers")
+        @Test(groups = {"heavy", "correctness"}, dataProvider = "UOBMNumbers")
         public void answersCorrectness(int number) throws IOException {
                 String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 Path answers = Paths.get(File.createTempFile("answers", ".json").getAbsolutePath());
@@ -65,13 +65,11 @@ public class TestPagodaUOBM {
                                                           .ontology(Paths.get(ontoDir, "uobm/univ-bench-dl.owl"))
                                                           .data(Paths.get(ontoDir, "uobm/data/uobm" + number + ".ttl"))
                                 .query(Paths.get(ontoDir, "uobm/queries/uobm_sygenia.sparql"))
-//                                                        .answer(answers)
                                 .classify(true)
                                 .hermit(true)
                                 .build();
 
                 pagoda.run();
-//              CheckAnswers.assertSameAnswers(answers, givenAnswers);
         }
 
         @Test(groups = {"sygenia"})
@@ -82,21 +80,14 @@ public class TestPagodaUOBM {
         @Test(groups = {"heavy"}, dataProvider = "UOBMNumbers")
         public void answersCorrectness_sygenia_allBlanks(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/uobm_sygenia_all-blanks.sparql"))
-//                                                        .answer(answers)
-                                .classify(true)
-                                .hermit(true)
-                                .build();
-
-                pagoda.run();
-//              CheckAnswers.assertSameAnswers(answers, givenAnswers);
+                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/uobm_sygenia_all-blanks.sparql"))
+                          .classify(true)
+                          .hermit(true)
+                          .build().run();
         }
 
         @Test(groups = {"justExecute"})
@@ -104,14 +95,12 @@ public class TestPagodaUOBM {
                 String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
 
                 Pagoda.builder()
-                          .ontology(Paths.get(ontoDir, "uobm/univ-bench-dl.owl"))
+                          .ontology(Paths.get(ontoDir, "uobm/univ-bench-dl-modified.owl"))
                           .data(Paths.get(ontoDir, "uobm/data/uobm1.ttl"))
-                                .query(Paths.get(ontoDir, "uobm/queries/existential_queries.sparql"))
-//                        .answer(answers)
-                                .classify(true)
-                                .hermit(true)
-                                .skolem(false)
-                                .build()
-                                .run();
+                          .query(Paths.get(ontoDir, "uobm/queries/existential_queries.sparql"))
+                          .classify(true)
+                          .hermit(true)
+                          .build()
+                          .run();
         }
 }