In unit tests, check that the decompiled source code can be recompiled.

Author: emmanue1

src/test/java/org/jd/core/v1/ClassFileToJavaSourceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -22,7 +22,7 @@
 import org.jd.core.v1.service.converter.classfiletojavasyntax.processor.ConvertClassFileProcessor;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.*;
 import org.jd.core.v1.service.deserializer.classfile.DeserializeClassFileProcessor;
-import org.jd.core.v1.util.ControlFlowGraphPlantUMLWriter;
+import org.jd.core.v1.cfg.ControlFlowGraphPlantUMLWriter;
 import org.junit.Test;
 
 import java.io.FileInputStream;

src/test/java/org/jd/core/v1/ControlFlowGraphTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -19,7 +19,7 @@
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
 import org.jd.core.v1.services.tokenizer.javafragmenttotoken.TestTokenizeJavaFragmentProcessor;
 import org.jd.core.v1.util.DefaultList;
-import org.jd.core.v1.util.PatternMaker;
+import org.jd.core.v1.regex.PatternMaker;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/org/jd/core/v1/JavaFragmentToTokenTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -18,7 +18,7 @@
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
 import org.jd.core.v1.services.tokenizer.javafragmenttotoken.TestTokenizeJavaFragmentProcessor;
-import org.jd.core.v1.util.PatternMaker;
+import org.jd.core.v1.regex.PatternMaker;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/org/jd/core/v1/LayoutFragmentProcessorTest.java

@@ -1,16 +1,17 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
  */
 
-package org.jd.core.v1.util;
+package org.jd.core.v1.cfg;
 
 import org.jd.core.v1.model.classfile.Method;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.cfg.BasicBlock;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.cfg.ControlFlowGraph;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.ByteCodeWriter;
+import org.jd.core.v1.util.DefaultList;
 
 import java.util.Comparator;
 import java.util.HashSet;

…util/ControlFlowGraphPlantUMLWriter.java …/cfg/ControlFlowGraphPlantUMLWriter.javasrc/test/java/org/jd/core/v1/util/ControlFlowGraphPlantUMLWriter.java renamed to src/test/java/org/jd/core/v1/cfg/ControlFlowGraphPlantUMLWriter.java src/test/java/org/jd/core/v1/util/ControlFlowGraphPlantUMLWriter.java renamed to src/test/java/org/jd/core/v1/cfg/ControlFlowGraphPlantUMLWriter.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.core.v1.compiler;
+
+import javax.tools.*;
+import java.io.File;
+import java.io.StringWriter;
+import java.util.Arrays;
+
+public class CompilerUtil {
+    protected static final File DESTINATION_DIRECTORY = new File("build/test-recompiled");
+    protected static final String DESTINATION_DIRECTORY_PATH = DESTINATION_DIRECTORY.getAbsolutePath();
+
+    public static boolean compile(String javaVersion, JavaFileObject... JavaFileObjects) throws Exception {
+        boolean compilationSuccess = false;
+
+        DESTINATION_DIRECTORY.mkdirs();
+
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        StringWriter writer = new StringWriter();
+        DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>();
+
+        try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null)) {
+            Iterable<String> options = Arrays.asList("-source", javaVersion, "-target", javaVersion, "-d", DESTINATION_DIRECTORY_PATH);
+            Iterable<? extends JavaFileObject> compilationUnits = Arrays.asList(JavaFileObjects);
+            compilationSuccess = compiler.getTask(writer, fileManager, diagnostics, options, null, compilationUnits).call();
+
+            for (Diagnostic d : diagnostics.getDiagnostics()) {
+                if (d.getLineNumber() > 0) {
+                    System.err.print(String.format("%-7s - line %-4d- %s%n", d.getKind(), d.getLineNumber(), d.getMessage(null)));
+                } else {
+                    System.err.print(String.format("%-7s -          - %s%n", d.getKind(), d.getMessage(null)));
+                }
+            }
+        }
+
+        return compilationSuccess;
+    }
+}

src/test/java/org/jd/core/v1/compiler/CompilerUtil.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.core.v1.compiler;
+
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import java.net.URI;
+
+public class JavaSourceFileObject extends SimpleJavaFileObject {
+    /**
+     * The source code of this "file".
+     */
+    final String code;
+
+    /**
+     * Constructs a new JavaSourceFromString.
+     * @param name the name of the compilation unit represented by this file object
+     * @param code the source code for the compilation unit represented by this file object
+     */
+    public JavaSourceFileObject(String name, String code) {
+        super(URI.create("string:///" + name.replace('.','/') + JavaFileObject.Kind.SOURCE.extension), JavaFileObject.Kind.SOURCE);
+        this.code = code;
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return code;
+    }
+}

src/test/java/org/jd/core/v1/compiler/JavaSourceFileObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -11,10 +11,10 @@
 import org.jd.core.v1.api.printer.Printer;
 
 public class PlainTextPrinter implements Printer {
-	protected static final String TAB = "  ";
-	protected static final String NEWLINE = "\n";
+    protected static final String TAB = "  ";
+    protected static final String NEWLINE = "\n";
 
-	protected int indentationCount;
+    protected int indentationCount;
     protected StringBuilder sb = new StringBuilder();
     protected int realLineNumber = 0;
     protected String format;
@@ -117,10 +117,10 @@ public void startMarker(int type) {}
     public void endMarker(int type) {}
 
     protected void printLineNumber(int lineNumber) {
-        sb.append('[');
+        sb.append("/*");
         sb.append(String.format(format, ++realLineNumber));
         sb.append(':');
         sb.append(String.format(format, lineNumber));
-        sb.append("] ");
+        sb.append(" */ ");
     }
 }

src/test/java/org/jd/core/v1/printer/PlainTextPrinter.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
  */
 
-package org.jd.core.v1.util;
+package org.jd.core.v1.regex;
 
 public class PatternMaker {
     public static String make (String first, String... next) {