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

use assertJ instead of hamcrest

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-07-26 15:15:04 +02:00
parent 9d5a863e4d
commit d586edbb3f
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java-decompiler-engine.iml
View File

@@ -9,6 +9,6 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="library" scope="TEST" name="hamcrest" level="project" /> <orderEntry type="library" name="assertJ" level="project" />
</component> </component>
</module> </module>

14
test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
View File

@@ -15,7 +15,6 @@
*/ */
package org.jetbrains.java.decompiler; package org.jetbrains.java.decompiler;
import org.hamcrest.Matchers;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler; import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
import org.jetbrains.java.decompiler.util.InterpreterUtil; import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -26,8 +25,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static org.junit.Assert.assertEquals; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public class DecompilerTestFixture { public class DecompilerTestFixture {
@@ -37,7 +35,7 @@ public class DecompilerTestFixture {
private ConsoleDecompiler decompiler; private ConsoleDecompiler decompiler;
public void setUp(String... optionPairs) throws IOException { public void setUp(String... optionPairs) throws IOException {
assertEquals(0, optionPairs.length % 2); assertThat(optionPairs.length % 2).isEqualTo(0);
testDataDir = new File("testData"); testDataDir = new File("testData");
if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData"); if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData");
@@ -49,10 +47,10 @@ public class DecompilerTestFixture {
//noinspection SSBasedInspection //noinspection SSBasedInspection
tempDir = File.createTempFile("decompiler_test_", "_dir"); tempDir = File.createTempFile("decompiler_test_", "_dir");
assertTrue(tempDir.delete()); assertThat(tempDir.delete()).isTrue();
targetDir = new File(tempDir, "decompiled"); targetDir = new File(tempDir, "decompiled");
assertTrue(targetDir.mkdirs()); assertThat(targetDir.mkdirs()).isTrue();
Map<String, Object> options = new HashMap<String, Object>(); Map<String, Object> options = new HashMap<String, Object>();
options.put(IFernflowerPreferences.LOG_LEVEL, "warn"); options.put(IFernflowerPreferences.LOG_LEVEL, "warn");
@@ -106,13 +104,13 @@ public class DecompilerTestFixture {
public static void assertFilesEqual(File expected, File actual) { public static void assertFilesEqual(File expected, File actual) {
if (expected.isDirectory()) { if (expected.isDirectory()) {
String[] children = Objects.requireNonNull(expected.list()); String[] children = Objects.requireNonNull(expected.list());
assertThat(actual.list(), Matchers.arrayContainingInAnyOrder(children)); assertThat(actual.list()).contains(children);
for (String name : children) { for (String name : children) {
assertFilesEqual(new File(expected, name), new File(actual, name)); assertFilesEqual(new File(expected, name), new File(actual, name));
} }
} }
else { else {
assertEquals(getContent(expected), getContent(actual)); assertThat(getContent(actual)).isEqualTo(getContent(expected));
} }
} }