ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[java decompiler] restores thread-conscious context access (EA-116270)

Browse Source
This commit is contained in:
Roman Shevchenko
2018-03-06 17:17:29 +01:00
parent bc55d8d9ec
commit 429b667031
8 changed files with 130 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.java.decompiler;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -36,7 +36,7 @@ public class BulkDecompilationTest {
unpack(new File(fixture.getTestDataDir(), "bulk.jar"), classes);
ConsoleDecompiler decompiler = fixture.getDecompiler();
decompiler.addSpace(classes, true);
decompiler.addSource(classes);
decompiler.decompileContext();
assertFilesEqual(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
@@ -55,7 +55,7 @@ public class BulkDecompilationTest {
private void doTestJar(String name) {
ConsoleDecompiler decompiler = fixture.getDecompiler();
String jarName = name + ".jar";
decompiler.addSpace(new File(fixture.getTestDataDir(), jarName), true);
decompiler.addSource(new File(fixture.getTestDataDir(), jarName));
decompiler.decompileContext();
File unpacked = new File(fixture.getTempDir(), "unpacked");

8
test/org/jetbrains/java/decompiler/SingleClassesTest.java
View File

@@ -1,6 +1,4 @@
/*
* Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.java.decompiler;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -125,14 +123,14 @@ public class SingleClassesTest {
File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
assertTrue(classFile.isFile());
for (File file : collectClasses(classFile)) {
decompiler.addSpace(file, true);
decompiler.addSource(file);
}
for (String companionFile : companionFiles) {
File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
assertTrue(companionClassFile.isFile());
for (File file : collectClasses(companionClassFile)) {
decompiler.addSpace(file, true);
decompiler.addSource(file);
}
}