From 5be5fd3daa0d50980fb3791e904e035cdbca254f Mon Sep 17 00:00:00 2001 From: RncLsn Date: Thu, 7 May 2015 19:26:24 +0100 Subject: Making the output machine-readable (JSON). --- test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java') diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java index 8fbe793..5f89162 100644 --- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java +++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java @@ -1,43 +1,44 @@ package uk.ac.ox.cs.pagoda.test_units; -import static org.junit.Assert.fail; - import org.junit.Test; - import uk.ac.ox.cs.pagoda.tester.PagodaTester; import uk.ac.ox.cs.pagoda.tester.Statistics; -import uk.ac.ox.cs.pagoda.util.Utility; +import uk.ac.ox.cs.pagoda.util.TestUtil; import java.io.IOException; +import static org.junit.Assert.fail; + public class PagodaNPD { @Test public void testNPDwithoutDataType() 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") ); Statistics stat = new Statistics("output/log4j.log"); String diff = stat.diff("results-backup/benchmark/npd_minus.out"); - Utility.copyFile("output/log4j.log", "results-backup/current/npd_minus.out"); + TestUtil.copyFile("output/log4j.log", "results-backup/current/npd_minus.out"); if (!diff.isEmpty()) fail(diff); } @Test public void testNPD() throws IOException { + String ontoDir = TestUtil.getConfig().getProperty("ontoDir"); PagodaTester.main( - PagodaTester.onto_dir + "npd/npd-all.owl", - PagodaTester.onto_dir + "npd/data/npd-data-dump-processed.ttl", - PagodaTester.onto_dir + "npd/queries/atomic.sparql" + TestUtil.combinePaths(ontoDir, "npd/npd-all.owl"), + TestUtil.combinePaths(ontoDir, "npd/data/npd-data-dump-processed.ttl"), + TestUtil.combinePaths(ontoDir, "npd/queries/atomic.sparql") ); Statistics stat = new Statistics("output/log4j.log"); String diff = stat.diff("results-backup/benchmark/npd.out"); - Utility.copyFile("output/log4j.log", "results-backup/current/npd.out"); + TestUtil.copyFile("output/log4j.log", "results-backup/current/npd.out"); if (!diff.isEmpty()) fail(diff); } -- cgit v1.2.3