java-decompiler: post-import cleanup (tests reorganized)

master
Roman Shevchenko 10 years ago
parent 1a4e48d11d
commit 3854b67daa
  1. 24
      build.xml
  2. 5
      src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
  3. 124
      test/org/jetbrains/java/decompiler/SingleClassesTest.java
  4. 95
      test/unit/TestSingleClasses.java
  5. 13
      test/unit/classes/TestClassFields.java
  6. 16
      test/unit/classes/TestClassSwitch.java
  7. BIN
      testData/classes/pkg/TestClassFields.class
  8. BIN
      testData/classes/pkg/TestClassLambda.class
  9. BIN
      testData/classes/pkg/TestClassLoop.class
  10. BIN
      testData/classes/pkg/TestClassSwitch.class
  11. BIN
      testData/classes/pkg/TestClassTypes.class
  12. BIN
      testData/classes/pkg/TestClassVar.class
  13. 3
      testData/results/TestClassFields.dec
  14. 2
      testData/results/TestClassLambda.dec
  15. 2
      testData/results/TestClassLoop.dec
  16. 2
      testData/results/TestClassSwitch.dec
  17. 2
      testData/results/TestClassTypes.dec
  18. 2
      testData/results/TestClassVar.dec
  19. 28
      testData/src/pkg/TestClassFields.java
  20. 17
      testData/src/pkg/TestClassLambda.java
  21. 17
      testData/src/pkg/TestClassLoop.java
  22. 31
      testData/src/pkg/TestClassSwitch.java
  23. 17
      testData/src/pkg/TestClassTypes.java
  24. 17
      testData/src/pkg/TestClassVar.java

@ -3,13 +3,19 @@
<target name="init"> <target name="init">
<property name="src" value="${basedir}/src"/> <property name="src" value="${basedir}/src"/>
<property name="out" value="${basedir}/out"/> <property name="out" value="${basedir}/out/production"/>
<property name="dist" value="${basedir}/fernflower.jar"/> <property name="dist" value="${basedir}/fernflower.jar"/>
<property name="test-src" value="${basedir}/test"/>
<property name="test-out" value="${basedir}/out/test"/>
<!-- external dependencies, adjust to your own -->
<property name="junit" value="${basedir}/../../../lib/junit-4.11.jar"/>
<property name="hamcrest" value="${basedir}/../../../lib/hamcrest-core-1.3.jar"/>
</target> </target>
<target name="clean" depends="init"> <target name="clean" depends="init">
<delete includeemptydirs="true" failonerror="false"> <delete includeemptydirs="true" failonerror="false">
<fileset dir="${out}"/> <fileset dir="${out}"/>
<fileset dir="${test-out}"/>
<fileset file="${dist}"/> <fileset file="${dist}"/>
</delete> </delete>
</target> </target>
@ -27,4 +33,20 @@
</jar> </jar>
</target> </target>
<target name="test-compile" depends="init,compile">
<mkdir dir="${test-out}"/>
<javac srcdir="${test-src}" destdir="${test-out}" source="1.6" target="1.6" encoding="UTF-8" debug="true" includeantruntime="false">
<classpath path="${out}:${junit}:${hamcrest}"/>
</javac>
</target>
<target name="test" depends="init,test-compile">
<junit printsummary="true" haltonfailure="true">
<classpath path="${test-out}:${out}:${junit}:${hamcrest}"/>
<batchtest>
<fileset dir="${test-src}" includes="**/*Test.java"/>
</batchtest>
</junit>
</target>
</project> </project>

@ -133,8 +133,13 @@ public class ConsoleDecompiler implements IBytecodeProvider, IDecompilatSaver {
public void decompileContext(File root) { public void decompileContext(File root) {
this.root = root; this.root = root;
try {
fernflower.decompileContext(); fernflower.decompileContext();
} }
finally {
fernflower.clearContext();
}
}
// ******************************************************************* // *******************************************************************
// Interface IBytecodeProvider // Interface IBytecodeProvider

@ -0,0 +1,124 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.java.decompiler;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.*;
import java.util.HashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class SingleClassesTest {
private File tempDir;
private ConsoleDecompiler decompiler;
@Before
public void setUp() throws IOException {
tempDir = File.createTempFile("decompiler_test_", "_dir");
assertTrue(tempDir.delete());
assertTrue(tempDir.mkdirs());
decompiler = new ConsoleDecompiler(new HashMap<String, Object>() {{
boolean win = System.getProperty("os.name", "").startsWith("Windows");
put(IFernflowerPreferences.LOG_LEVEL, "warn");
put(IFernflowerPreferences.RENAME_ENTITIES, "1");
put(IFernflowerPreferences.HIDE_DEFAULT_CONSTRUCTOR, "1");
put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "0");
put(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION, "1");
put(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS, "0");
put(IFernflowerPreferences.USE_DEBUG_VARNAMES, "0");
put(IFernflowerPreferences.NEW_LINE_SEPARATOR, (win ? "0" : "1"));
}});
}
@After
public void tearDown() {
decompiler = null;
delete(tempDir);
tempDir = null;
}
@Test public void testClassFields() { doTest("TestClassFields"); }
@Test public void testClassLambda() { doTest("TestClassLambda"); }
@Test public void testClassLoop() { doTest("TestClassLoop"); }
@Test public void testClassSwitch() { doTest("TestClassSwitch"); }
@Test public void testClassTypes() { doTest("TestClassTypes"); }
@Test public void testClassVar() { doTest("TestClassVar"); }
private void doTest(String testName) {
try {
File testDataDir = new File("testData");
if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData");
if (!isTestDataDir(testDataDir)) testDataDir = new File("plugins/java-decompiler/engine/testData");
assertTrue(isTestDataDir(testDataDir));
File classFile = new File(testDataDir, "/classes/pkg/" + testName + ".class");
assertTrue(classFile.isFile());
decompiler.addSpace(classFile, true);
decompiler.decompileContext(tempDir);
File decompiledFile = new File(tempDir, testName + ".java");
assertTrue(decompiledFile.isFile());
File referenceFile = new File(testDataDir, "results/" + testName + ".dec");
assertTrue(referenceFile.isFile());
String decompiledContent = getContent(decompiledFile);
String referenceContent = getContent(referenceFile);
assertEquals(referenceContent, decompiledContent);
}
catch (Exception e) {
throw new RuntimeException(e);
}
}
private static boolean isTestDataDir(File dir) {
return dir.isDirectory() && new File(dir, "classes").isDirectory() && new File(dir, "results").isDirectory();
}
private static String getContent(File file) throws IOException {
Reader reader = new InputStreamReader(new FileInputStream(file), "UTF-8");
try {
char[] buff = new char[16 * 1024];
StringBuilder content = new StringBuilder();
int n;
while ((n = reader.read(buff)) > 0) {
content.append(buff, 0, n);
}
return content.toString();
}
finally {
reader.close();
}
}
private static void delete(File file) {
if (file.isDirectory()) {
File[] files = file.listFiles();
if (files != null) {
for (File f : files) delete(f);
}
}
else {
assertTrue(file.delete());
}
}
}

@ -1,95 +0,0 @@
package unit;
import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Date;
import java.util.HashMap;
import org.junit.Test;
import de.fernflower.main.decompiler.ConsoleDecompiler;
import de.fernflower.main.extern.IFernflowerPreferences;
public class TestSingleClasses {
@Test
public void test() throws IOException {
Date start = new Date();
String current_path = new File(".").getCanonicalPath().toString();
iterateDirectory(new File(current_path + "/bin/unit/classes/"));
System.out.println("\n\nTime elapsed " + (new Date().getTime() - start.getTime())/1000);
}
private void iterateDirectory(File dir) throws IOException {
for (File file : dir.listFiles()) {
if (file.isDirectory()) {
iterateDirectory(file);
} else if(file.getName().endsWith(".class")) {
decompileAndCheckFile(file);
}
}
}
private void decompileAndCheckFile(File file) throws IOException {
try {
ConsoleDecompiler decompiler = new ConsoleDecompiler(new HashMap<String, Object>(){{
put("log", "warn");
put("ren", "1");
put(IFernflowerPreferences.HIDE_DEFAULT_CONSTRUCTOR, "1");
put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "0");
put(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION, "1");
put(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS, "0");
put(IFernflowerPreferences.USE_DEBUG_VARNAMES, "0");
put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "0");
}});
decompiler.addSpace(file, true);
// files
String current_path = new File(".").getCanonicalPath().toString();
String file_class_name = file.getName();
String file_name = file_class_name.substring(0, file_class_name.lastIndexOf(".class"));
String file_java_name = file_name+".java";
File reference_file = new File(current_path + "/test/unit/results/" + file_name + ".dec");
if(!reference_file.exists()) {
return; // no reference file for some reason, not yet created
}
File temp_dir = new File(Files.createTempDirectory("tempdec_"+file_name).toString());
// decompile it
decompiler.decompileContext(temp_dir);
// get both the decompiled file content and the reference
// NOTE: reference files are saved with Windows-style line endings. Convert them if you are decompiling to Unix.
File decompiled_file = new File(temp_dir, file_java_name);
String decompiled_content = new String(Files.readAllBytes(decompiled_file.toPath()), "UTF-8");
String reference_content = new String(Files.readAllBytes(reference_file.toPath()), "UTF-8");
// clean up
decompiled_file.delete();
temp_dir.delete();
// compare file content with the reference
assertEquals(decompiled_content, reference_content);
} catch(Exception ex) {
System.out.println("ERROR: testing file " + file.getCanonicalPath());
ex.printStackTrace();
}
}
}

@ -1,13 +0,0 @@
package unit.classes;
public class TestClassFields {
private static int[] sizes;
private static String[] names;
static {
names = new String[]{"name1", "name2"};
sizes = new int[names.length];
}
}

@ -1,16 +0,0 @@
package unit.classes;
public class TestClassSwitch {
public void testCaseOrder(int a) {
switch(a) {
case 13:
System.out.println(13);
return;
case 5:
System.out.println(5);
}
}
}

@ -1,4 +1,4 @@
package unit.classes; package pkg;
public class TestClassFields { public class TestClassFields {
@ -10,5 +10,4 @@ public class TestClassFields {
static { static {
sizes = new int[names.length]; sizes = new int[names.length];
} }
} }

@ -1,4 +1,4 @@
package unit.classes; package pkg;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

@ -1,4 +1,4 @@
package unit.classes; package pkg;
public class TestClassLoop { public class TestClassLoop {

@ -1,4 +1,4 @@
package unit.classes; package pkg;
public class TestClassSwitch { public class TestClassSwitch {

@ -1,4 +1,4 @@
package unit.classes; package pkg;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

@ -1,4 +1,4 @@
package unit.classes; package pkg;
public class TestClassVar { public class TestClassVar {

@ -0,0 +1,28 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pkg;
public class TestClassFields {
private static int[] sizes;
private static String[] names;
static {
names = new String[]{"name1", "name2"};
sizes = new int[names.length];
}
}

@ -1,4 +1,19 @@
package unit.classes; /*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pkg;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

@ -1,4 +1,19 @@
package unit.classes; /*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pkg;
public class TestClassLoop { public class TestClassLoop {

@ -0,0 +1,31 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pkg;
public class TestClassSwitch {
public void testCaseOrder(int a) {
switch(a) {
case 13:
System.out.println(13);
return;
case 5:
System.out.println(5);
}
}
}

@ -1,4 +1,19 @@
package unit.classes; /*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pkg;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

@ -1,4 +1,19 @@
package unit.classes; /*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package pkg;
public class TestClassVar { public class TestClassVar {
Loading…
Cancel
Save