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

chore: resolve deprecations in tests

Browse Source
This commit is contained in:
Skylot
2020-07-13 09:21:59 +01:00
parent c616b5b03b
commit 631a855bac
21 changed files with 82 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
-5
View File
@@ -42,11 +42,6 @@ public abstract class SmaliTest extends IntegrationTest {
return getClassNodeFromSmali(getTestPkg() + File.separatorChar + getTestName(), fullClsName);
}
@Deprecated
protected ClassNode getClassNodeFromSmali(String clsName) {
return getClassNodeFromSmali(clsName, clsName);
}
protected ClassNode getClassNodeFromSmaliWithPath(String path, String clsName) {
return getClassNodeFromSmali(path + File.separatorChar + clsName, clsName);
}
jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop3.java
+1 -3
View File
@@ -3,8 +3,6 @@ package jadx.tests.integration.loops;
import java.io.File;
import java.io.FileOutputStream;
import org.junit.jupiter.api.Test;
import jadx.NotYetImplemented;
import jadx.tests.api.IntegrationTest;
@@ -53,7 +51,7 @@ public class TestBreakInLoop3 extends IntegrationTest {
}
}
@Test
// @Test
@NotYetImplemented
public void test43() throws Exception {
getClassNode(TestCls.class);
jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java → jadx-core/src/test/java/jadx/tests/integration/others/TestArgInline.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java → jadx-core/src/test/java/jadx/tests/integration/others/TestClassGen.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/others/TestConstructor.java
+30
View File
@@ -0,0 +1,30 @@
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
public class TestConstructor extends SmaliTest {
// @formatter:off
/*
private SomeObject test(double r23, double r25, SomeObject r27) {
SomeObject r17 = new SomeObject
r0 = r17
r1 = r27
r0.<init>(r1)
return r17
}
*/
// @formatter:on
@Test
public void test() {
disableCompilation();
assertThat(getClassNodeFromSmali())
.code()
.containsOne("new SomeObject(arg3);")
.doesNotContain("= someObject");
}
}
jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java → jadx-core/src/test/java/jadx/tests/integration/others/TestDuplicateCast.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import java.util.List;
jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java → jadx-core/src/test/java/jadx/tests/integration/others/TestFloatValue.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/others/TestInlineVarArg.java
+18
View File
@@ -0,0 +1,18 @@
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
public class TestInlineVarArg extends SmaliTest {
@Test
public void test() {
noDebugInfo();
assertThat(getClassNodeFromSmali())
.code()
.containsOne("f(\"a\", \"b\", \"c\");");
}
}
jadx-core/src/test/java/jadx/tests/integration/others/TestN21.java
+17
View File
@@ -0,0 +1,17 @@
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
public class TestN21 extends SmaliTest {
@Test
public void test() {
assertThat(getClassNodeFromSmali())
.code()
.countString(2, "while (");
}
}
jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java → jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantBrackets.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java → jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantReturn.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java → jadx-core/src/test/java/jadx/tests/integration/others/TestReturnWrapping.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java → jadx-core/src/test/java/jadx/tests/integration/others/TestStaticFieldsInit.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java → jadx-core/src/test/java/jadx/tests/integration/others/TestStaticMethod.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java → jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode.java
+1 -1
View File
@@ -1,4 +1,4 @@
package jadx.tests.integration;
package jadx.tests.integration.others;
import org.junit.jupiter.api.Test;
jadx-core/src/test/java/jadx/tests/smali/TestConstructor.java
-24
View File
@@ -1,24 +0,0 @@
package jadx.tests.smali;
import org.junit.jupiter.api.Test;
import jadx.core.dex.nodes.ClassNode;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.JadxMatchers.containsOne;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
public class TestConstructor extends SmaliTest {
@Test
public void test() {
disableCompilation();
ClassNode cls = getClassNodeFromSmali("TestConstructor");
String code = cls.getCode().toString();
assertThat(code, containsOne("new SomeObject(arg3);"));
assertThat(code, not(containsString("= someObject")));
}
}
jadx-core/src/test/java/jadx/tests/smali/TestInlineVarArg.java
-21
View File
@@ -1,21 +0,0 @@
package jadx.tests.smali;
import org.junit.jupiter.api.Test;
import jadx.core.dex.nodes.ClassNode;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.JadxMatchers.containsOne;
import static org.hamcrest.MatcherAssert.assertThat;
public class TestInlineVarArg extends SmaliTest {
@Test
public void test() {
noDebugInfo();
ClassNode cls = getClassNodeFromSmali("TestInlineVarArg");
String code = cls.getCode().toString();
assertThat(code, containsOne("f(\"a\", \"b\", \"c\");"));
}
}
jadx-core/src/test/java/jadx/tests/smali/TestN21.java
-16
View File
@@ -1,16 +0,0 @@
package jadx.tests.smali;
import org.junit.jupiter.api.Test;
import jadx.core.dex.nodes.ClassNode;
import jadx.tests.api.SmaliTest;
public class TestN21 extends SmaliTest {
@Test
public void test() {
ClassNode cls = getClassNodeFromSmali("TestN21");
String code = cls.getCode().toString();
System.out.println(code);
}
}
jadx-core/src/test/smali/TestConstructor.smali → jadx-core/src/test/smali/others/TestConstructor.smali
+3 -1
View File
@@ -1,4 +1,4 @@
.class public LTestConstructor;
.class public Lothers/TestConstructor;
.super Ljava/lang/Object;
.method private test(DDLSomeObject;)LSomeObject;
@@ -20,4 +20,6 @@
.line 59
.local v17, "localSomeObject":LSomeObject;
return-object v17
.end method
jadx-core/src/test/smali/TestInlineVarArg.smali → jadx-core/src/test/smali/others/TestInlineVarArg.smali
+2 -2
View File
@@ -1,4 +1,4 @@
.class public LTestInlineVarArg;
.class public Lothers/TestInlineVarArg;
.super Ljava/lang/Object;
.method public static varargs f([Ljava/lang/String;)V
@@ -35,7 +35,7 @@
move-object v1, v0
invoke-static {v1}, LTestInlineVarArg;->f([Ljava/lang/String;)V
invoke-static {v1}, Lothers/TestInlineVarArg;->f([Ljava/lang/String;)V
return-void
.end method
jadx-core/src/test/smali/TestN21.smali → jadx-core/src/test/smali/others/TestN21.smali
+1 -1
View File
@@ -1,4 +1,4 @@
.class public LTestN21;
.class public Lothers/TestN21;
.super Ljava/lang/Object;
.method private static test([BI)I