Adding (not completed) log of partial answers in Json.

6 files changed, 25 insertions, 21 deletions

diff --git a/test/AllTests.xml b/test/AllTests.xml
index 8ce5fcf..cb8a0e3 100644
--- a/test/AllTests.xml
+++ b/test/AllTests.xml
@@ -9,4 +9,10 @@
         </classes>
     </test>
 
+    <test name="PagodaLUBM">
+        <classes>
+            <class name="uk.ac.ox.cs.pagoda.test_units.PagodaLUBM" />
+        </classes>
+    </test>
+
 </suite>
\ No newline at end of file
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
index 29abc87..1aded5b 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
@@ -13,7 +13,7 @@ public class PagodaLUBM {
                 TestGlobalCorrectness.test(Paths.get(ontoDir, "lubm/univ-bench.owl"),
                                                                    Paths.get(ontoDir, "lubm/data/lubm" + number + ".ttl"),
                                                                    Paths.get(ontoDir, "lubm/queries/test.sparql"),
-                                                                   Paths.get(ontoDir, "lubm/lubm" + number + ".ans"));
+                                                                   Paths.get(ontoDir, "lubm/lubm" + number + ".json"));
         }
 
         @Test
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
index f53ed7e..ee9cf13 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
@@ -13,7 +13,7 @@ public class PagodaUOBM {
                 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 + ".ans"));
+                                                          Paths.get(ontoDir, "uobm/uobm" + number + ".json"));
         }
 
         @Test
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java b/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
index 34ec8cd..ffaf8fc 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
@@ -1,13 +1,12 @@
 package uk.ac.ox.cs.pagoda.test_units;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
 import org.testng.Assert;
-import uk.ac.ox.cs.pagoda.query.AnswerTuple;
 import uk.ac.ox.cs.pagoda.query.QueryRecord;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.util.Utility;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -16,39 +15,37 @@ import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collection;
 import java.util.Set;
 
-/*
+/**
  * This is a unit test for TestNG.
  * <p>
  * It tests the correctness on the final output.
  * */
 public class TestGlobalCorrectness {
 
-    public static final Logger logger = Logger.getLogger(TestGlobalCorrectness.class);
-
     public static void test(Path ontology, Path data, Path queries, Path givenAnswers) {
         try {
-            Path computedAnswers = Paths.get(File.createTempFile("answers", ".tmp").getAbsolutePath());
+            Utility.setLogLevel(Level.DEBUG);
+            Path computedAnswers = Paths.get(File.createTempFile("answers", ".json").getAbsolutePath());
             PagodaTester.main(ontology.toString(), data.toString(), queries.toString(), computedAnswers.toString());
-            Assert.assertTrue(checkSameContent(computedAnswers, givenAnswers));
+            assertSameContent(computedAnswers, givenAnswers);
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    private static boolean checkSameContent(Path computedAnswersFile, Path givenAnswersFile) throws IOException {
+    private static void assertSameContent(Path computedAnswersFile, Path givenAnswersFile) throws IOException {
         BufferedReader computedReader = Files.newBufferedReader(computedAnswersFile);
         BufferedReader givenReader = Files.newBufferedReader(givenAnswersFile);
 
-        Gson gson = new GsonBuilder().create();
+        Gson gson = QueryRecord.GsonCreator.getInstance();
 
-        Type cqType = new TypeToken<Set<AnswerTuple>>() {}.getType();
-        Collection<QueryRecord> computedAnswers = gson.fromJson(computedReader, cqType);
-        Collection<QueryRecord> givenAnswers = gson.fromJson(givenReader, cqType);
+        Type cqType = new TypeToken<Set<QueryRecord>>() {}.getType();
+        Set<QueryRecord> computedAnswers = gson.fromJson(computedReader, cqType);
+        Set<QueryRecord> givenAnswers = gson.fromJson(givenReader, cqType);
 
-        return computedAnswers.equals(givenAnswers);
+        Assert.assertEquals(computedAnswers, givenAnswers);
     }
 
 
diff --git a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
index 7dacdac..5e49f79 100644
--- a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
+++ b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
@@ -37,7 +37,7 @@ public class PagodaTester {
         public static final int uobm_number = 1;
         public static final String uobm_tbox = onto_dir + "uobm/univ-bench-dl.owl";
         public static final String uobm_abox = onto_dir + "uobm/data/uobm" + uobm_number + ".ttl";
-        public static final String uobm_query = onto_dir + "uobm/queries/standard.sparql";
+        public static final String uobm_query = onto_dir + "uobm/queries/test.sparql";
         public static final String uobm_query_temp = onto_dir + "uobm/queries/temp.sparql";
         public static final String uobm_query2 = onto_dir + "uobm/queries/standard_q2.sparql";
         public static final String uobm_query9 = onto_dir + "uobm/queries/standard_q9.sparql";
@@ -93,8 +93,8 @@ public class PagodaTester {
         public static void main(String... args) {
                 if (args.length == 0) {
 //                      args = new String[] {test_tbox, test_abox, test_query};
-                        args = new String[] {lubm_tbox, lubm_abox, lubm_query, "/home/alessandro/Desktop/lubm1.ans"};
-//                      args = new String[] {uobm_tbox, uobm_abox, uobm_query.replace(".sparql", "_all_pagoda.sparql")};
+//                      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[] {dbpedia_tbox, dbpedia_abox, dbpedia_query};
 //                      args = new String[] {travel_tbox, null, dbpedia_query274};
diff --git a/test/uk/ac/ox/cs/pagoda/util/TestUtil.java b/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
index 227398b..06d391a 100644
--- a/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
+++ b/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
@@ -48,7 +48,7 @@ public class TestUtil {
         Files.copy(Paths.get(src), Paths.get(dst), REPLACE_EXISTING);
     }
 
-    /*
+    /**
      * Get the log file, which is assumed unique.
      * */
     public static String getLogFileName() {
@@ -61,4 +61,5 @@ public class TestUtil {
         }
         return null;
     }
+
 }