Testing and fixing. Executed successfully on UOBM{1,2,3,4,5,6,7,8}.

18 files changed, 77 insertions, 53 deletions

diff --git a/test/AllTests.xml b/test/AllTests.xml
index cb8a0e3..c2567a8 100644
--- a/test/AllTests.xml
+++ b/test/AllTests.xml
@@ -5,13 +5,13 @@
 
     <test name="PagodaUOBM">
         <classes>
-            <class name="uk.ac.ox.cs.pagoda.test_units.PagodaUOBM" />
+            <class name="uk.ac.ox.cs.pagoda.global_tests.PagodaUOBM" />
         </classes>
     </test>
 
     <test name="PagodaLUBM">
         <classes>
-            <class name="uk.ac.ox.cs.pagoda.test_units.PagodaLUBM" />
+            <class name="uk.ac.ox.cs.pagoda.global_tests.PagodaLUBM" />
         </classes>
     </test>
 
diff --git a/test/FullEvaluation.xml b/test/FullEvaluation.xml
index f0f047d..c4a3ebe 100644
--- a/test/FullEvaluation.xml
+++ b/test/FullEvaluation.xml
@@ -5,13 +5,13 @@
 
     <test name="LightEvaluation">
         <classes>
-            <class name="uk.ac.ox.cs.pagoda.test_units.LightEvaluation" />
+            <class name="uk.ac.ox.cs.pagoda.global_tests.LightEvaluation" />
         </classes>
     </test>
 
     <test name="CostEvaluation">
         <classes>
-            <class name="uk.ac.ox.cs.pagoda.test_units.CostEvaluation" />
+            <class name="uk.ac.ox.cs.pagoda.global_tests.CostEvaluation" />
         </classes>
     </test>
 
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/ClauseTester.java b/test/uk/ac/ox/cs/pagoda/global_tests/ClauseTester.java
index a0f16d4..abd0741 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/ClauseTester.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/ClauseTester.java
@@ -1,15 +1,9 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
-import org.semanticweb.HermiT.model.Atom;
-import org.semanticweb.HermiT.model.AtomicConcept;
-import org.semanticweb.HermiT.model.AtomicRole;
-import org.semanticweb.HermiT.model.DLClause;
-import org.semanticweb.HermiT.model.Equality;
-import org.semanticweb.HermiT.model.Variable;
+import org.semanticweb.HermiT.model.*;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.semanticweb.owlapi.model.OWLOntologyManager;
-
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.approx.Clause;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java b/test/uk/ac/ox/cs/pagoda/global_tests/CostEvaluation.java
index 968cf01..01e8203 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/CostEvaluation.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.testng.annotations.Test;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/JAIR_PAGOdA.java b/test/uk/ac/ox/cs/pagoda/global_tests/JAIR_PAGOdA.java
index 10ac974..0d77fdb 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/JAIR_PAGOdA.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/JAIR_PAGOdA.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/JAIR_Scalability.java b/test/uk/ac/ox/cs/pagoda/global_tests/JAIR_Scalability.java
index 2cf8446..cdf55bd 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/JAIR_Scalability.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/JAIR_Scalability.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java b/test/uk/ac/ox/cs/pagoda/global_tests/LightEvaluation.java
index 932c178..3ee268e 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/LightEvaluation.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaDBPedia.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaDBPedia.java
index 1673179..2b9cdbd 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaDBPedia.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaDBPedia.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaELU.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaELU.java
index 70d531d..da059f9 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaELU.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaELU.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaFLY.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaFLY.java
index bad533f..d558e0f 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaFLY.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaFLY.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaLUBM.java
index 1aded5b..2014ec1 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaLUBM.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.util.TestUtil;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaNPD.java
index 5f89162..17d1e82 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaNPD.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD_bench.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaNPD_bench.java
index 1aca36a..c908cb4 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD_bench.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaNPD_bench.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaRLU.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaRLU.java
index c365196..88e0835 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaRLU.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaRLU.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/global_tests/PagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaUOBM.java
new file mode 100644
index 0000000..065fb29
--- /dev/null
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/PagodaUOBM.java
@@ -0,0 +1,53 @@
+package uk.ac.ox.cs.pagoda.global_tests;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.util.TestUtil;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+
+import static uk.ac.ox.cs.pagoda.util.TestUtil.combinePaths;
+
+public class PagodaUOBM {
+
+        private void testN(int number ) throws IOException {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
+                TestGlobalCorrectness.test(Paths.get(ontoDir, "uobm/univ-bench-dl.owl"),
+                                                                   Paths.get(ontoDir, "uobm/data/uobm" + number + ".ttl"),
+                                                                   Paths.get(ontoDir, "uobm/queries/test.sparql"),
+                                                                   Paths.get(ontoDir, "uobm/uobm" + number + ".json"));
+        }
+
+        @Test
+        public void test1() throws IOException {
+                testN(1);
+        }
+
+        private static final int N_1 = 8;
+        private static final int N_2 = 10;
+
+
+        @DataProvider(name = "uobmNumbers")
+        public 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;
+                return integers;
+        }
+
+//      @Test
+//      public void justExecute3() {
+//              justExecute(1);
+//      }
+
+        @Test(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/test.sparql"));
+        }
+        
+}
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java b/test/uk/ac/ox/cs/pagoda/global_tests/TestGlobalCorrectness.java
index ffaf8fc..dff2366 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/TestGlobalCorrectness.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.test_units;
+package uk.ac.ox.cs.pagoda.global_tests;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -28,6 +28,7 @@ public class TestGlobalCorrectness {
         try {
             Utility.setLogLevel(Level.DEBUG);
             Path computedAnswers = Paths.get(File.createTempFile("answers", ".json").getAbsolutePath());
+            new File(computedAnswers.toString()).deleteOnExit();
             PagodaTester.main(ontology.toString(), data.toString(), queries.toString(), computedAnswers.toString());
             assertSameContent(computedAnswers, givenAnswers);
         } catch (IOException e) {
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
deleted file mode 100644
index ee9cf13..0000000
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package uk.ac.ox.cs.pagoda.test_units;
-
-import org.testng.annotations.Test;
-import uk.ac.ox.cs.pagoda.util.TestUtil;
-
-import java.io.IOException;
-import java.nio.file.Paths;
-
-public class PagodaUOBM {
-
-        private void testN(int number ) throws IOException {
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                TestGlobalCorrectness.test(Paths.get(ontoDir, "uobm/univ-bench-dl.owl"),
-                                                          Paths.get(ontoDir, "uobm/data/uobm" + number + ".ttl"),
-                                                          Paths.get(ontoDir, "uobm/queries/test.sparql"),
-                                                          Paths.get(ontoDir, "uobm/uobm" + number + ".json"));
-        }
-
-        @Test
-        public void test1() throws IOException {
-                testN(1);
-        }
-        
-}
diff --git a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
index 5e49f79..b97d85e 100644
--- a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
+++ b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
@@ -94,11 +94,11 @@ public class PagodaTester {
                 if (args.length == 0) {
 //                      args = new String[] {test_tbox, test_abox, test_query};
 //                      args = new String[] {lubm_tbox, lubm_abox, lubm_query};
-                        args = new String[] {uobm_tbox, uobm_abox, uobm_query, "/home/alessandro/Desktop/uobm1.ans"};
-//                      args = new String[] {fly, "null", fly_query.replace(".sparql", "_pellet.sparql") };
+//                      args = new String[] {uobm_tbox, uobm_abox, uobm_query};
+//                      args = new String[] {fly, "null", fly_query};
 //                      args = new String[] {dbpedia_tbox, dbpedia_abox, dbpedia_query};
 //                      args = new String[] {travel_tbox, null, dbpedia_query274};
-//                      args = new String[] {fly, null, fly_query};
+                        args = new String[] {fly, fly_query};
 //                      args = new String[] {npd_tbox, npd_abox, npd_query};
 //                      args = new String[] {npd_bench_tbox, npd_bench_abox, npd_bench_query};
 //                      args = new String[] {"../SemFacet/WebContent/WEB-INF/data/dbpedia.owl", "../SemFacet/WebContent/WEB-INF/data/dbpediaA.nt", null}; 
@@ -119,7 +119,7 @@ public class PagodaTester {
 //                      args[2] = args[2].replace(".sparql", "_pellet.sparql");
                 }
 
-                Properties properties = new Properties("config/uobm.conf"); 
+                Properties properties = new Properties("config/uobm.properties");
                 
                 int index = 0; 
                 if (args.length > index) properties.setOntologyPath(args[index++]);   
@@ -157,7 +157,7 @@ public class PagodaTester {
                         if (pagoda != null) pagoda.dispose();
                 }
 
-                Utility.closeCurrentOut();
+//              Utility.closeCurrentOut();
                 
                 if (properties.getShellMode()) System.exit(0);
         }