Switch from JUnit to TestNG.

Plus minor fixes.

3 files changed, 16 insertions, 20 deletions

diff --git a/src/log4j.properties b/src/log4j.properties
deleted file mode 100644
index 25da4d4..0000000
--- a/src/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#log4j.rootLogger=INFO, CONSOLE
-log4j.rootLogger=DEBUG, CONSOLE, FILE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %-5p %c{1}- %m%n
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.Threshold=INFO
-
-#log = ./output
-log = .
-log4j.appender.FILE=org.apache.log4j.RollingFileAppender
-log4j.appender.FILE.File=${log}/log4j.log 
-log4j.appender.FILE.MaxFileSize=10MB
-log4j.appender.FILE.MaxBackupIndex=3
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.conversionPattern=%m%n
-log4j.appender.FILE.append=false
diff --git a/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java b/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java
index f95ac12..f10b761 100644
--- a/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java
+++ b/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java
@@ -67,7 +67,7 @@ public class ConjunctiveQueryWalker {
                 assert (prefixList.getType() == ConjunctiveQueryLexer.PREFIX_LIST);
                 Prefixes prefixes = walkPrefixList(prefixList);
                 CommonTree rulebody = iterator.next();
-                assert (prefixList.getType() == ConjunctiveQueryLexer.RULE);
+                assert (rulebody.getType() == ConjunctiveQueryLexer.RULE);
                 return walkRuleNode(rulebody, prefixes);
 
         }
diff --git a/src/uk/ac/ox/cs/pagoda/util/Utility.java b/src/uk/ac/ox/cs/pagoda/util/Utility.java
index cb05de4..7138ca9 100644
--- a/src/uk/ac/ox/cs/pagoda/util/Utility.java
+++ b/src/uk/ac/ox/cs/pagoda/util/Utility.java
@@ -10,6 +10,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;

 import java.io.OutputStreamWriter;

 import java.io.PrintStream;

+import java.nio.file.Files;

+import java.nio.file.Paths;

 import java.text.SimpleDateFormat;

 import java.time.LocalDateTime;

 import java.time.format.DateTimeFormatter;

@@ -24,9 +26,11 @@ import java.util.Stack;
 import org.apache.log4j.Logger;

 import org.semanticweb.HermiT.model.Atom;

 

+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;

+

 public class Utility {

         

-        private static final Logger LOGS = null; // Logger.getLogger(""); 

+        private static final Logger LOGS = Logger.getLogger("PAGOdA");

         

         public static final String JAVA_FILE_SEPARATOR = "/";

         public static final String FILE_SEPARATOR = System.getProperty("file.separator");

@@ -255,4 +259,14 @@ public class Utility {
                 return iri.replace(FILE_SEPARATOR, JAVA_FILE_SEPARATOR).replace(" ", "%20");

         }

 

+        public static String combinePaths(String path1, String path2) {

+                File file1 = new File(path1);

+                File file2 = new File(file1, path2);

+                return file2.getPath();

+        }

+

+        public static void copyFile(String src, String dst) throws IOException {

+                Files.copy(Paths.get(src), Paths.get(dst), REPLACE_EXISTING);

+        }

+

 }