Cleanup (test extracted to make option setting per-class instead of per-test)

This commit is contained in:
Roman Shevchenko
2014-10-16 13:52:44 +02:00
parent 22ceacc969
commit b3681fe952
4 changed files with 40 additions and 30 deletions

View File

@@ -15,24 +15,21 @@
*/
package org.jetbrains.java.decompiler;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
import org.jetbrains.java.decompiler.util.InterpreterUtil;
import org.junit.After;
import org.junit.Before;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.jetbrains.java.decompiler.main.DecompilerContext;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
import org.jetbrains.java.decompiler.util.InterpreterUtil;
import org.junit.After;
import org.junit.Before;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public abstract class SingleClassesTestBase {
private DecompilerTestFixture fixture;
@@ -54,23 +51,12 @@ public abstract class SingleClassesTestBase {
}
protected void doTest(String testFile) {
doTest(testFile, null);
}
protected void doTest(String testFile, Map<String, Object> options) {
try {
File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
assertTrue(classFile.isFile());
String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
ConsoleDecompiler decompiler = fixture.getDecompiler();
if(options != null) {
for(Entry<String, Object> option : options.entrySet()) {
// overwrite with user-supplied value
DecompilerContext.setProperty(option.getKey(), option.getValue());
}
}
for (File file : collectClasses(classFile)) decompiler.addSpace(file, true);
decompiler.decompileContext();