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

style: enforce code style using checkstyle and spotless with eclipse formatter (PR #650)

Browse Source
This commit is contained in:
skylot
2019-04-30 00:04:16 +03:00
committed by GitHub
parent e1dfb4ee59
commit c7890f2468
272 changed files with 1938 additions and 1368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/test/java/jadx/gui/TestI18n.java
+7 -8
View File
@@ -1,10 +1,5 @@
package jadx.gui;
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 java.io.IOException;
import java.io.Reader;
import java.nio.file.Files;
@@ -20,6 +15,11 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
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;
public class TestI18n {
private static Path guiJavaPath;
@@ -45,8 +45,7 @@ public class TestI18n {
if (reference == null) {
reference = lines;
referenceName = p.getFileName().toString();
}
else {
} else {
compareToReference(p);
}
@@ -97,7 +96,7 @@ public class TestI18n {
try {
List<String> lines = Files.readAllLines(p);
for (String line : lines) {
for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
for (Iterator<String> it = keys.iterator(); it.hasNext();) {
if (line.contains(it.next())) {
it.remove();
}
jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
+4 -7
View File
@@ -15,9 +15,9 @@ import jadx.core.dex.nodes.ClassNode;
import jadx.gui.JadxWrapper;
import static java.util.Arrays.asList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -53,8 +53,7 @@ public class JSourcesTest {
List<JavaPackage> packages = asList(
newPkg("a.b"),
newPkg("a.c"),
newPkg("a.d")
);
newPkg("a.d"));
List<JPackage> out = sources.getHierarchyPackages(packages);
assertThat(out, hasSize(1));
@@ -69,8 +68,7 @@ public class JSourcesTest {
List<JavaPackage> packages = asList(
newPkg("a.b.p1"),
newPkg("a.b.p2"),
newPkg("a.b.p3")
);
newPkg("a.b.p3"));
List<JPackage> out = sources.getHierarchyPackages(packages);
assertThat(out, hasSize(1));
@@ -87,8 +85,7 @@ public class JSourcesTest {
newPkg("a.b.c.p2"),
newPkg("a.b.c.p3"),
newPkg("d.e"),
newPkg("d.f.a")
);
newPkg("d.f.a"));
List<JPackage> out = sources.getHierarchyPackages(packages);
assertThat(out, hasSize(2));
jadx-gui/src/test/java/jadx/gui/utils/CertificateManagerTest.java
+16 -11
View File
@@ -1,8 +1,5 @@
package jadx.gui.utils;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -13,6 +10,9 @@ 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;
public class CertificateManagerTest {
private static final String CERTIFICATE_TEST_DIR = "certificate-test/";
private static final String DSA = "CERT.DSA";
@@ -84,8 +84,7 @@ public class CertificateManagerTest {
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"));
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"));
}
@Test
@@ -93,8 +92,7 @@ public class CertificateManagerTest {
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"));
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"));
}
@Test
@@ -102,16 +100,23 @@ public class CertificateManagerTest {
String string = certificateManagerRSA.generatePublicKey();
assertTrue(string.contains("RSA"));
assertTrue(string.contains("65537"));
assertTrue(string.contains(
"16819531290318044625546437357099080306019392752925688951114880688329201213180109168890384305768067101521914473763638669503560977521269328582980060332888147680193318231260043189411794465899645633586173494259691101582064441956032924396850221679489313043628562082670183392670094163371858684118480409374749790551473773845213427476236147328434427272177623018935282929152308753854314219987617604037468769472089902090243358285991739642170211970862773121939911777280101937073243006335384636193260583579409760790138329893534549366882523130765297472656435892831796545149793228897111760122091442123535919361963075454640516520743"));
assertTrue(string.contains("1681953129031804462554643735709908030601939275292568895111488068832920121318010916"
+ "889038430576806710152191447376363866950356097752126932858298006033288814768019331823126004318941179"
+ "4465899645633586173494259691101582064441956032924396850221679489313043628562082670183392670094163371"
+ "8586841184804093747497905514737738452134274762361473284344272721776230189352829291523087538543142199"
+ "8761760403746876947208990209024335828599173964217021197086277312193991177728010193707324300633538463"
+ "6193260583579409760790138329893534549366882523130765297472656435892831796545149793228897111760122091"
+ "442123535919361963075454640516520743"));
}
@Test
public void decodeDSAPubKey() {
String string = certificateManagerDSA.generatePublicKey();
assertTrue(string.contains("DSA"));
assertTrue(string.contains(
"19323367605058154682563301282345453222279312104889899001698209626254725581511375469963812461090495963838615773832867364330457010553974237985991904800958394169421485070378434746792379708805563793253282995274293621162504943287538455944652344378242226897507369146942411692220922477368782490423187845815262510366"));
assertTrue(string.contains("193233676050581546825633012823454532222793121048898990016982096262547255815113"
+ "7546996381246109049596383861577383286736433045701055397423798599190480095839416942148507037843474"
+ "67923797088055637932532829952742936211625049432875384559446523443782422268975073691469424116922209"
+ "22477368782490423187845815262510366"));
}
private String getResourcePath(String resName) {