Making the output machine-readable (JSON).

1 files changed, 25 insertions, 20 deletions

diff --git a/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java b/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java
index 29006de..932c178 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java
@@ -2,7 +2,7 @@ package uk.ac.ox.cs.pagoda.test_units;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
-import uk.ac.ox.cs.pagoda.util.Utility;
+import uk.ac.ox.cs.pagoda.util.TestUtil;
 
 import java.io.IOException;
 
@@ -11,52 +11,57 @@ public class LightEvaluation {
         @Test
         public void uobm1() throws IOException {
                 int number = 1;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
-                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard.sparql"
+                                TestUtil.combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/queries/standard.sparql")
                 );
-                Utility.copyFile("log4j.log", "output/jair/uobm1.out");
+                TestUtil.copyFile("log4j.log", "output/jair/uobm1.out");
         }
         
         @Test
         public void lubm100() throws IOException {
                 int number = 100;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "lubm/univ-bench.owl",
-                                PagodaTester.onto_dir + "lubm/data/lubm" + number + ".ttl",
-                                PagodaTester.onto_dir + "lubm/queries/test.sparql"
+                                TestUtil.combinePaths(ontoDir, "lubm/univ-bench.owl"),
+                                TestUtil.combinePaths(ontoDir, "lubm/data/lubm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "lubm/queries/test.sparql")
                 );
-                Utility.copyFile("log4j.log", "results-backup/current/lubm100.out");
+                TestUtil.copyFile("log4j.log", "results-backup/current/lubm100.out");
         }
         
         @Test
         public void fly() throws IOException {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl",
-                                PagodaTester.onto_dir + "fly/queries/fly.sparql" 
+                                TestUtil.combinePaths(ontoDir, "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl"),
+                                TestUtil.combinePaths(ontoDir, "fly/queries/fly.sparql")
                 );
-                Utility.copyFile("log4j.log", "results-backup/current/fly.out");
+                TestUtil.copyFile("log4j.log", "results-backup/current/fly.out");
         }
         
         @Test 
         public void dbpedia() throws IOException {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "dbpedia/integratedOntology-all-in-one-minus-datatype.owl", 
-                                PagodaTester.onto_dir + "dbpedia/data/dbpedia-minus-datatype-new.ttl",
-                                PagodaTester.onto_dir + "dbpedia/atomic.sparql"
+                                TestUtil.combinePaths(ontoDir, "dbpedia/integratedOntology-all-in-one-minus-datatype.owl"),
+                                TestUtil.combinePaths(ontoDir, "dbpedia/data/dbpedia-minus-datatype-new.ttl"),
+                                TestUtil.combinePaths(ontoDir, "dbpedia/atomic.sparql")
                 );
-                Utility.copyFile("log4j.log", "results-backup/current/dbpedia.out");
+                TestUtil.copyFile("log4j.log", "results-backup/current/dbpedia.out");
         }
         
         @Test
         public void npdWithoutDataType() throws IOException {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "npd/npd-all-minus-datatype.owl", 
-                                PagodaTester.onto_dir + "npd/data/npd-data-dump-minus-datatype-new.ttl", 
-                                PagodaTester.onto_dir + "npd/queries/atomic.sparql"
+                                TestUtil.combinePaths(ontoDir, "npd/npd-all-minus-datatype.owl"),
+                                TestUtil.combinePaths(ontoDir, "npd/data/npd-data-dump-minus-datatype-new.ttl"),
+                                TestUtil.combinePaths(ontoDir, "npd/queries/atomic.sparql")
                 );
-                Utility.copyFile("log4j.log", "results-backup/current/npd_minus.out");
+                TestUtil.copyFile("log4j.log", "results-backup/current/npd_minus.out");
         }
         
 }