jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(tests): migrate from Hamcrest to AssertJ

Browse Source
This commit is contained in:
Skylot
2024-08-11 21:52:56 +01:00
parent a2bfe9bbe8
commit 1051dacb1e
354 changed files with 2620 additions and 4058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/test/java/jadx/gui/TestI18n.java
+34 -39
View File
@@ -4,13 +4,12 @@ import java.io.IOException;
import java.io.Reader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Stream;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -19,10 +18,10 @@ import org.junit.jupiter.api.Test;
import jadx.gui.utils.LangLocale;
import jadx.gui.utils.NLS;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static java.nio.file.Files.exists;
import static java.nio.file.Paths.get;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
public class TestI18n {
@@ -34,10 +33,10 @@ public class TestI18n {
@BeforeAll
public static void init() {
i18nPath = Paths.get("src/main/resources/i18n");
assertTrue(Files.exists(i18nPath));
guiJavaPath = Paths.get("src/main/java");
assertTrue(Files.exists(guiJavaPath));
i18nPath = get("src/main/resources/i18n");
assertThat(exists(i18nPath)).isTrue();
guiJavaPath = get("src/main/java");
assertThat(exists(guiJavaPath)).isTrue();
}
@Test
@@ -52,20 +51,22 @@ public class TestI18n {
@Test
public void filesExactlyMatch() throws IOException {
Files.list(i18nPath).forEach(p -> {
List<String> lines;
try {
lines = Files.readAllLines(p);
if (reference == null) {
reference = lines;
referenceName = p.getFileName().toString();
} else {
compareToReference(p);
try (Stream<Path> list = Files.list(i18nPath)) {
list.forEach(p -> {
List<String> lines;
try {
lines = Files.readAllLines(p);
if (reference == null) {
reference = lines;
referenceName = p.getFileName().toString();
} else {
compareToReference(p);
}
} catch (IOException e) {
Assertions.fail("Error " + e.getMessage());
}
} catch (IOException e) {
Assertions.fail("Error " + e.getMessage());
}
});
});
}
}
private void compareToReference(Path path) throws IOException {
@@ -99,27 +100,21 @@ public class TestI18n {
try (Reader reader = Files.newBufferedReader(i18nPath.resolve("Messages_en_US.properties"))) {
properties.load(reader);
}
Set<String> keys = new HashSet<>();
for (Object key : properties.keySet()) {
keys.add("\"" + key + '"');
}
Files.walk(guiJavaPath).filter(p -> Files.isRegularFile(p)).forEach(p -> {
try {
List<String> lines = Files.readAllLines(p);
for (String line : lines) {
for (Iterator<String> it = keys.iterator(); it.hasNext();) {
if (line.contains(it.next())) {
it.remove();
}
try (Stream<Path> walk = Files.walk(guiJavaPath)) {
walk.filter(Files::isRegularFile).forEach(p -> {
try {
for (String line : Files.readAllLines(p)) {
keys.removeIf(line::contains);
}
} catch (Exception e) {
throw new RuntimeException(e);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
});
assertThat("keys not used", keys, empty());
});
}
assertThat(keys).as("keys not used").isEmpty();
}
}
jadx-gui/src/test/java/jadx/gui/utils/CertificateManagerTest.java
+40 -41
View File
@@ -10,8 +10,7 @@ import java.util.Collection;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
public class CertificateManagerTest {
private static final String CERTIFICATE_TEST_DIR = "certificate-test/";
@@ -45,78 +44,78 @@ public class CertificateManagerTest {
public void decodeNotCertificateFile() throws IOException {
try (InputStream in = new FileInputStream(emptyPath)) {
String result = CertificateManager.decode(in);
assertEquals("", result);
assertThat(result).isEmpty();
}
}
@Test
public void decodeRSAKeyHeader() {
String string = certificateManagerRSA.generateHeader();
assertTrue(string.contains("X.509"));
assertTrue(string.contains("0x4bd68052"));
assertTrue(string.contains("CN=test cert, OU=test unit, O=OOO TestOrg, L=St.Peterburg, ST=Russia, C=123456"));
assertThat(certificateManagerRSA.generateHeader())
.contains("X.509")
.contains("0x4bd68052")
.contains("CN=test cert, OU=test unit, O=OOO TestOrg, L=St.Peterburg, ST=Russia, C=123456");
}
@Test
public void decodeDSAKeyHeader() {
String string = certificateManagerDSA.generateHeader();
assertTrue(string.contains("X.509"));
assertTrue(string.contains("0x16420ba2"));
assertTrue(string.contains("O=\"UJMRFVV CN=EDCVBGT C=TG\""));
assertThat(certificateManagerDSA.generateHeader())
.contains("X.509")
.contains("0x16420ba2")
.contains("O=\"UJMRFVV CN=EDCVBGT C=TG\"");
}
@Test
public void decodeRSAKeySignature() {
String string = certificateManagerRSA.generateSignature();
assertTrue(string.contains("SHA256withRSA"));
assertTrue(string.contains("1.2.840.113549.1.1.11"));
assertThat(certificateManagerRSA.generateSignature())
.contains("SHA256withRSA")
.contains("1.2.840.113549.1.1.11");
}
@Test
public void decodeDSAKeySignature() {
String string = certificateManagerDSA.generateSignature();
assertTrue(string.contains("SHA1withDSA"));
assertTrue(string.contains("1.2.840.10040.4.3"));
assertThat(certificateManagerDSA.generateSignature())
.contains("SHA1withDSA")
.contains("1.2.840.10040.4.3");
}
@Test
public void decodeRSAFingerprint() {
String string = certificateManagerRSA.generateFingerprint();
assertTrue(string.contains("61 18 0A 71 3F C9 55 16 4E 04 E3 C5 45 08 D9 11"));
assertTrue(string.contains("A0 6E A6 06 DB 2C 6F 3A 16 56 7F 75 97 7B AE 85 C2 13 09 37"));
assertTrue(string.contains("12 53 E8 BB C8 AA 27 A8 49 9B F8 0D 6E 68 CE 32 35 50 DE 55 A7 E7 8C 29 51 00 96 D7 56 F4 54 44"));
assertThat(certificateManagerRSA.generateFingerprint())
.contains("61 18 0A 71 3F C9 55 16 4E 04 E3 C5 45 08 D9 11")
.contains("A0 6E A6 06 DB 2C 6F 3A 16 56 7F 75 97 7B AE 85 C2 13 09 37")
.contains("12 53 E8 BB C8 AA 27 A8 49 9B F8 0D 6E 68 CE 32 35 50 DE 55 A7 E7 8C 29 51 00 96 D7 56 F4 54 44");
}
@Test
public void decodeDSAFingerprint() {
String string = certificateManagerDSA.generateFingerprint();
assertTrue(string.contains("D9 06 A6 2D 1F 79 8C 9D A6 EF 40 C7 2E C2 EA 0B"));
assertTrue(string.contains("18 E9 9C D4 A1 40 8F 63 FA EC 2E 62 A0 F2 AE B7 3F C3 C2 04"));
assertTrue(string.contains("74 F9 48 64 EE AC 92 26 53 2C 7A 0E 55 BE 5E D8 2F A7 D9 A9 99 F5 D5 21 2C 51 21 C4 31 AD 73 40"));
assertThat(certificateManagerDSA.generateFingerprint())
.contains("D9 06 A6 2D 1F 79 8C 9D A6 EF 40 C7 2E C2 EA 0B")
.contains("18 E9 9C D4 A1 40 8F 63 FA EC 2E 62 A0 F2 AE B7 3F C3 C2 04")
.contains("74 F9 48 64 EE AC 92 26 53 2C 7A 0E 55 BE 5E D8 2F A7 D9 A9 99 F5 D5 21 2C 51 21 C4 31 AD 73 40");
}
@Test
public void decodeRSAPubKey() {
String string = certificateManagerRSA.generatePublicKey();
assertTrue(string.contains("RSA"));
assertTrue(string.contains("65537"));
assertTrue(string.contains("1681953129031804462554643735709908030601939275292568895111488068832920121318010916"
+ "889038430576806710152191447376363866950356097752126932858298006033288814768019331823126004318941179"
+ "4465899645633586173494259691101582064441956032924396850221679489313043628562082670183392670094163371"
+ "8586841184804093747497905514737738452134274762361473284344272721776230189352829291523087538543142199"
+ "8761760403746876947208990209024335828599173964217021197086277312193991177728010193707324300633538463"
+ "6193260583579409760790138329893534549366882523130765297472656435892831796545149793228897111760122091"
+ "442123535919361963075454640516520743"));
assertThat(certificateManagerRSA.generatePublicKey())
.contains("RSA")
.contains("65537")
.contains("1681953129031804462554643735709908030601939275292568895111488068832920121318010916"
+ "889038430576806710152191447376363866950356097752126932858298006033288814768019331823126004318941179"
+ "4465899645633586173494259691101582064441956032924396850221679489313043628562082670183392670094163371"
+ "8586841184804093747497905514737738452134274762361473284344272721776230189352829291523087538543142199"
+ "8761760403746876947208990209024335828599173964217021197086277312193991177728010193707324300633538463"
+ "6193260583579409760790138329893534549366882523130765297472656435892831796545149793228897111760122091"
+ "442123535919361963075454640516520743");
}
@Test
public void decodeDSAPubKey() {
String string = certificateManagerDSA.generatePublicKey();
assertTrue(string.contains("DSA"));
assertTrue(string.contains("193233676050581546825633012823454532222793121048898990016982096262547255815113"
+ "7546996381246109049596383861577383286736433045701055397423798599190480095839416942148507037843474"
+ "67923797088055637932532829952742936211625049432875384559446523443782422268975073691469424116922209"
+ "22477368782490423187845815262510366"));
assertThat(certificateManagerDSA.generatePublicKey())
.contains("DSA")
.contains("193233676050581546825633012823454532222793121048898990016982096262547255815113"
+ "7546996381246109049596383861577383286736433045701055397423798599190480095839416942148507037843474"
+ "67923797088055637932532829952742936211625049432875384559446523443782422268975073691469424116922209"
+ "22477368782490423187845815262510366");
}
private String getResourcePath(String resName) {
jadx-gui/src/test/java/jadx/gui/utils/JumpManagerTest.java
+30 -32
View File
@@ -5,9 +5,7 @@ import org.junit.jupiter.api.Test;
import jadx.gui.treemodel.TextNode;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.assertj.core.api.Assertions.assertThat;
class JumpManagerTest {
private JumpManager jm;
@@ -19,25 +17,25 @@ class JumpManagerTest {
@Test
public void testEmptyHistory() {
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isNull();
}
@Test
public void testEmptyHistory2() {
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isNull();
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isNull();
assertThat(jm.getPrev()).isNull();
}
@Test
public void testOneElement() {
jm.addPosition(makeJumpPos());
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isNull();
}
@Test
@@ -47,10 +45,10 @@ class JumpManagerTest {
JumpPosition pos2 = makeJumpPos();
jm.addPosition(pos2);
assertThat(jm.getPrev(), sameInstance(pos1));
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), sameInstance(pos2));
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev()).isSameAs(pos1);
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isSameAs(pos2);
assertThat(jm.getNext()).isNull();
}
@Test
@@ -61,15 +59,15 @@ class JumpManagerTest {
JumpPosition pos2 = makeJumpPos();
jm.addPosition(pos2);
// 1 - 2@
assertThat(jm.getPrev(), sameInstance(pos1));
assertThat(jm.getPrev()).isSameAs(pos1);
// 1@ - 2
JumpPosition pos3 = makeJumpPos();
jm.addPosition(pos3);
// 1 - 3@
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev(), sameInstance(pos1));
assertThat(jm.getNext()).isNull();
assertThat(jm.getPrev()).isSameAs(pos1);
// 1@ - 3
assertThat(jm.getNext(), sameInstance(pos3));
assertThat(jm.getNext()).isSameAs(pos3);
}
@Test
@@ -86,25 +84,25 @@ class JumpManagerTest {
JumpPosition pos4 = makeJumpPos();
jm.addPosition(pos4);
// 1 - 2 - 3 - 4@
assertThat(jm.getPrev(), sameInstance(pos3));
assertThat(jm.getPrev()).isSameAs(pos3);
// 1 - 2 - 3@ - 4
assertThat(jm.getPrev(), sameInstance(pos2));
assertThat(jm.getPrev()).isSameAs(pos2);
// 1 - 2@ - 3 - 4
JumpPosition pos5 = makeJumpPos();
jm.addPosition(pos5);
// 1 - 2 - 5@
assertThat(jm.getNext(), nullValue());
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev(), sameInstance(pos2));
assertThat(jm.getNext()).isNull();
assertThat(jm.getNext()).isNull();
assertThat(jm.getPrev()).isSameAs(pos2);
// 1 - 2@ - 5
assertThat(jm.getPrev(), sameInstance(pos1));
assertThat(jm.getPrev()).isSameAs(pos1);
// 1@ - 2 - 5
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), sameInstance(pos2));
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isSameAs(pos2);
// 1 - 2@ - 5
assertThat(jm.getNext(), sameInstance(pos5));
assertThat(jm.getNext()).isSameAs(pos5);
// 1 - 2 - 5@
assertThat(jm.getNext(), nullValue());
assertThat(jm.getNext()).isNull();
}
@Test
@@ -113,8 +111,8 @@ class JumpManagerTest {
jm.addPosition(pos);
jm.addPosition(pos);
assertThat(jm.getPrev(), nullValue());
assertThat(jm.getNext(), nullValue());
assertThat(jm.getPrev()).isNull();
assertThat(jm.getNext()).isNull();
}
private JumpPosition makeJumpPos() {
jadx-gui/src/test/java/jadx/gui/utils/pkgs/TestJRenamePackage.java
+2 -2
View File
@@ -23,12 +23,12 @@ class TestJRenamePackage {
private void valid(String name) {
assertThat(JRenamePackage.isValidPackageName(name))
.as("expect valid: %s", name)
.isEqualTo(true);
.isTrue();
}
private void invalid(String name) {
assertThat(JRenamePackage.isValidPackageName(name))
.as("expect invalid: %s", name)
.isEqualTo(false);
.isFalse();
}
}