1 files changed, 7 insertions, 57 deletions

diff --git a/test/uk/ac/ox/cs/pagoda/global_tests/LightEvaluation.java b/test/uk/ac/ox/cs/pagoda/global_tests/LightEvaluation.java
index 3ee268e..b073a26 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/LightEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/LightEvaluation.java
@@ -1,67 +1,17 @@
 package uk.ac.ox.cs.pagoda.global_tests;
 
-import org.junit.Test;
-import uk.ac.ox.cs.pagoda.tester.PagodaTester;
-import uk.ac.ox.cs.pagoda.util.TestUtil;
+import org.testng.annotations.Test;
 
 import java.io.IOException;
 
 public class LightEvaluation {
 
         @Test
-        public void uobm1() throws IOException {
-                int number = 1;
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                PagodaTester.main(
-                                TestUtil.combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
-                                TestUtil.combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
-                                TestUtil.combinePaths(ontoDir, "uobm/queries/standard.sparql")
-                );
-                TestUtil.copyFile("log4j.log", "output/jair/uobm1.out");
+        public void evaluation() throws IOException {
+                new TestPagodaUOBM().test(1);
+                new TestPagodaLUBM().test(100);
+                new TestPagodaFLY().test();
+                new TestPagodaDBPedia().test();
+                new TestPagodaNPD().testNPDwithoutDataType();
         }
-        
-        @Test
-        public void lubm100() throws IOException {
-                int number = 100;
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                PagodaTester.main(
-                                TestUtil.combinePaths(ontoDir, "lubm/univ-bench.owl"),
-                                TestUtil.combinePaths(ontoDir, "lubm/data/lubm" + number + ".ttl"),
-                                TestUtil.combinePaths(ontoDir, "lubm/queries/test.sparql")
-                );
-                TestUtil.copyFile("log4j.log", "results-backup/current/lubm100.out");
-        }
-        
-        @Test
-        public void fly() throws IOException {
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                PagodaTester.main(
-                                TestUtil.combinePaths(ontoDir, "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl"),
-                                TestUtil.combinePaths(ontoDir, "fly/queries/fly.sparql")
-                );
-                TestUtil.copyFile("log4j.log", "results-backup/current/fly.out");
-        }
-        
-        @Test 
-        public void dbpedia() throws IOException {
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                PagodaTester.main(
-                                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")
-                );
-                TestUtil.copyFile("log4j.log", "results-backup/current/dbpedia.out");
-        }
-        
-        @Test
-        public void npdWithoutDataType() throws IOException {
-                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
-                PagodaTester.main(
-                                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")
-                );
-                TestUtil.copyFile("log4j.log", "results-backup/current/npd_minus.out");
-        }
-        
 }