From b5f439e1aa8ce996514be8fd721b3d564175ea58 Mon Sep 17 00:00:00 2001 From: Skylot Date: Sun, 19 Oct 2014 17:59:41 +0400 Subject: [PATCH] tests: reformat code --- .../test/java/jadx/tests/integration/TestArgInline.java | 3 +-- .../src/test/java/jadx/tests/integration/TestClassGen.java | 3 +-- .../java/jadx/tests/integration/TestDuplicateCast.java | 2 +- .../test/java/jadx/tests/integration/TestFloatValue.java | 2 +- .../java/jadx/tests/integration/TestRedundantBrackets.java | 3 +-- .../java/jadx/tests/integration/TestRedundantReturn.java | 3 +-- .../java/jadx/tests/integration/TestReturnWrapping.java | 2 +- .../java/jadx/tests/integration/TestStaticFieldsInit.java | 3 +-- .../test/java/jadx/tests/integration/TestStaticMethod.java | 2 +- .../tests/integration/TestStringBuilderElimination.java | 3 +-- .../test/java/jadx/tests/integration/TestWrongCode.java | 7 ++++--- .../tests/integration/annotations/TestAnnotations.java | 3 +-- .../tests/integration/annotations/TestAnnotations2.java | 3 +-- .../integration/annotations/TestParamAnnotations.java | 3 +-- .../integration/annotations/TestVarArgAnnotation.java | 3 +-- .../test/java/jadx/tests/integration/arith/TestArith.java | 3 +-- .../test/java/jadx/tests/integration/arith/TestArith2.java | 3 +-- .../jadx/tests/integration/arith/TestFieldIncrement.java | 3 +-- .../jadx/tests/integration/arith/TestFieldIncrement2.java | 3 +-- .../jadx/tests/integration/arith/TestSpecialValues.java | 3 +-- .../java/jadx/tests/integration/arrays/TestArrayFill.java | 3 +-- .../java/jadx/tests/integration/arrays/TestArrayFill2.java | 3 +-- .../java/jadx/tests/integration/conditions/TestCmpOp.java | 3 +-- .../java/jadx/tests/integration/conditions/TestCmpOp2.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions.java | 3 +-- .../tests/integration/conditions/TestConditions10.java | 3 +-- .../tests/integration/conditions/TestConditions11.java | 3 +-- .../tests/integration/conditions/TestConditions12.java | 3 +-- .../tests/integration/conditions/TestConditions13.java | 3 +-- .../tests/integration/conditions/TestConditions14.java | 3 +-- .../tests/integration/conditions/TestConditions15.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions2.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions3.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions4.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions5.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions6.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions7.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions8.java | 3 +-- .../jadx/tests/integration/conditions/TestConditions9.java | 3 +-- .../java/jadx/tests/integration/conditions/TestElseIf.java | 3 +-- .../jadx/tests/integration/conditions/TestNestedIf.java | 3 +-- .../tests/integration/conditions/TestSimpleConditions.java | 3 +-- .../jadx/tests/integration/conditions/TestTernary.java | 3 +-- .../jadx/tests/integration/conditions/TestTernary2.java | 3 +-- .../jadx/tests/integration/conditions/TestTernaryInIf.java | 3 +-- .../jadx/tests/integration/debuginfo/TestLineNumbers.java | 2 +- .../jadx/tests/integration/debuginfo/TestLineNumbers2.java | 3 +-- .../test/java/jadx/tests/integration/enums/TestEnums.java | 3 +-- .../test/java/jadx/tests/integration/enums/TestEnums2.java | 3 +-- .../java/jadx/tests/integration/generics/TestGenerics.java | 3 +-- .../jadx/tests/integration/generics/TestGenerics2.java | 3 +-- .../jadx/tests/integration/generics/TestGenerics3.java | 3 +-- .../jadx/tests/integration/generics/TestGenerics4.java | 3 +-- .../java/jadx/tests/integration/inline/TestInline.java | 2 +- .../java/jadx/tests/integration/inline/TestInline2.java | 5 ++--- .../java/jadx/tests/integration/inline/TestInline3.java | 3 +-- .../java/jadx/tests/integration/inline/TestInline6.java | 3 +-- .../jadx/tests/integration/inline/TestInlineInLoop.java | 3 +-- .../jadx/tests/integration/inline/TestSyntheticInline.java | 3 +-- .../jadx/tests/integration/inner/TestAnonymousClass.java | 2 +- .../jadx/tests/integration/inner/TestAnonymousClass2.java | 3 +-- .../jadx/tests/integration/inner/TestAnonymousClass3.java | 3 +-- .../jadx/tests/integration/inner/TestAnonymousClass4.java | 3 +-- .../java/jadx/tests/integration/inner/TestInnerClass.java | 3 +-- .../java/jadx/tests/integration/inner/TestInnerClass2.java | 2 +- .../java/jadx/tests/integration/inner/TestInnerClass3.java | 3 +-- .../integration/invoke/TestOverloadedMethodInvoke.java | 2 +- .../jadx/tests/integration/loops/TestArrayForEach.java | 3 +-- .../jadx/tests/integration/loops/TestArrayForEach2.java | 3 +-- .../tests/integration/loops/TestArrayForEachNegative.java | 3 +-- .../java/jadx/tests/integration/loops/TestBreakInLoop.java | 3 +-- .../jadx/tests/integration/loops/TestIndexForLoop.java | 3 +-- .../jadx/tests/integration/loops/TestIterableForEach.java | 3 +-- .../jadx/tests/integration/loops/TestIterableForEach2.java | 3 +-- .../jadx/tests/integration/loops/TestLoopCondition.java | 3 +-- .../jadx/tests/integration/loops/TestLoopCondition2.java | 3 +-- .../jadx/tests/integration/loops/TestLoopCondition3.java | 3 +-- .../jadx/tests/integration/loops/TestLoopCondition4.java | 3 +-- .../tests/integration/loops/TestLoopConditionInvoke.java | 3 +-- .../jadx/tests/integration/loops/TestLoopDetection.java | 3 +-- .../jadx/tests/integration/loops/TestLoopDetection2.java | 3 +-- .../jadx/tests/integration/loops/TestLoopDetection3.java | 3 +-- .../jadx/tests/integration/loops/TestLoopDetection4.java | 3 +-- .../java/jadx/tests/integration/loops/TestNestedLoops.java | 3 +-- .../jadx/tests/integration/loops/TestNestedLoops2.java | 3 +-- .../jadx/tests/integration/loops/TestSequentialLoops.java | 3 +-- .../jadx/tests/integration/names/TestSameMethodsNames.java | 3 +-- .../java/jadx/tests/integration/others/TestIfInTry.java | 3 +-- .../jadx/tests/integration/others/TestIfTryInCatch.java | 3 +-- .../java/jadx/tests/integration/others/TestIssue13a.java | 3 +-- .../java/jadx/tests/integration/others/TestIssue13b.java | 3 +-- .../java/jadx/tests/integration/others/TestLoopInTry.java | 3 +-- .../java/jadx/tests/integration/others/TestLoopInTry2.java | 3 +-- .../java/jadx/tests/integration/switches/TestSwitch.java | 3 +-- .../jadx/tests/integration/switches/TestSwitchLabels.java | 2 +- .../tests/integration/switches/TestSwitchNoDefault.java | 3 +-- .../jadx/tests/integration/switches/TestSwitchSimple.java | 3 +-- .../tests/integration/synchronize/TestSynchronized.java | 3 +-- .../tests/integration/synchronize/TestSynchronized2.java | 3 +-- .../jadx/tests/integration/trycatch/TestInlineInCatch.java | 3 +-- .../tests/integration/trycatch/TestNestedTryCatch.java | 2 +- .../java/jadx/tests/integration/trycatch/TestTryCatch.java | 2 +- .../jadx/tests/integration/trycatch/TestTryCatch2.java | 3 +-- .../jadx/tests/integration/trycatch/TestTryCatch3.java | 3 +-- .../jadx/tests/integration/trycatch/TestTryCatch4.java | 3 +-- .../jadx/tests/integration/trycatch/TestTryCatch5.java | 3 +-- .../jadx/tests/integration/types/TestTypeResolver.java | 3 +-- .../jadx/tests/integration/usethis/TestInlineThis.java | 3 +-- .../jadx/tests/integration/usethis/TestRedundantThis.java | 2 +- .../jadx/tests/integration/variables/TestVariables2.java | 3 +-- .../jadx/tests/integration/variables/TestVariables3.java | 3 +-- .../jadx/tests/integration/variables/TestVariables4.java | 3 +-- .../integration/variables/TestVariablesDefinitions.java | 3 +-- 113 files changed, 117 insertions(+), 215 deletions(-) diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java b/jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java index f026ee12d..cd2e69784 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestArgInline extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("a++;")); assertThat(code, not(containsString("a = a + 1;"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java b/jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java index 642ad255b..5e36eccc7 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -27,7 +27,6 @@ public class TestClassGen extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("public static interface I {")); assertThat(code, containsString(indent(2) + "int test();")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java b/jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java index 64abec451..ef9594c0b 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java @@ -1,11 +1,11 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.instructions.InsnType; import jadx.core.dex.instructions.args.InsnWrapArg; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.nodes.InsnNode; import jadx.core.dex.nodes.MethodNode; +import jadx.tests.api.IntegrationTest; import java.util.List; diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java b/jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java index f2aadf239..1085a8267 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java index 48fd6d4b4..3b3a0bda0 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -46,7 +46,6 @@ public class TestRedundantBrackets extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("(-1)"))); assertThat(code, not(containsString("return;"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java index 6a4338289..bf4f76ed6 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -24,7 +24,6 @@ public class TestRedundantReturn extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("return;"))); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java b/jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java index e3c92c828..d745a7fb9 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java b/jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java index 59303e975..3321b5040 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -32,7 +32,6 @@ public class TestStaticFieldsInit extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("public static final String s2 = null;"))); // TODO: diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java b/jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java index 0fca23ee8..67e22d85e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java b/jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java index 3c12fdabb..45cf8ac98 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -27,7 +27,6 @@ public class TestStringBuilderElimination extends IntegrationTest { public void test() { ClassNode cls = getClassNode(MyException.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("MyException(String str, Exception e) {")); assertThat(code, containsString("super(\"msg:\" + str, e);")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java b/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java index 0158c0f9d..541fdc2b3 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java @@ -1,7 +1,7 @@ package jadx.tests.integration; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -19,7 +19,9 @@ public class TestWrongCode extends IntegrationTest { @SuppressWarnings("empty") private int test2(int a) { - if (a == 0); + if (a == 0) { + ; + } return a; } } @@ -29,7 +31,6 @@ public class TestWrongCode extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("return false.length;"))); assertThat(code, containsString("return null.length;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java index 2d531dc65..9a47496c2 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java @@ -1,7 +1,7 @@ package jadx.tests.integration.annotations; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -50,7 +50,6 @@ public class TestAnnotations extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("@A(a = 255)"))); assertThat(code, containsOne("@A(a = -1)")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java index 39558a6e0..0ba8a4b6b 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.annotations; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -30,7 +30,6 @@ public class TestAnnotations2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("@Target({ElementType.TYPE})")); assertThat(code, containsString("@Retention(RetentionPolicy.RUNTIME)")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java index 1a78a1bcf..2aef62a2c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java @@ -1,7 +1,7 @@ package jadx.tests.integration.annotations; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -37,7 +37,6 @@ public class TestParamAnnotations extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("void test1(@A int i) {")); assertThat(code, containsString("void test2(int i, @A int j) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java index 27a4cbeaf..e1a79c100 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java @@ -1,7 +1,7 @@ package jadx.tests.integration.annotations; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -32,7 +32,6 @@ public class TestVarArgAnnotation extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("void test1(int... a) {")); assertThat(code, containsString("void test2(int i, Object... a) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java index 06381c6ba..e0a67936f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arith; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestArith extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("a += 2;")); assertThat(code, containsString("a++;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java index e34c77198..4e670bfd4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arith; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -26,7 +26,6 @@ public class TestArith2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return (a + 2) * 3;")); assertThat(code, not(containsString("a + 2 * 3"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java index bead13af3..c27913527 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arith; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -32,7 +32,6 @@ public class TestFieldIncrement extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("instanceField++;")); assertThat(code, containsString("staticField--;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java index 83216bcaf..e0c52acf2 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arith; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -30,7 +30,6 @@ public class TestFieldIncrement2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("this.a.f += n;")); assertThat(code, containsString("a.f *= n;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java index ad8cfd37c..1f3b172d5 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arith; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -48,7 +48,6 @@ public class TestSpecialValues extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("Float.NaN, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY, " + "Float.MIN_VALUE, Float.MAX_VALUE, Float.MIN_NORMAL")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java index 536ca32a2..8eabe8e03 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arrays; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -21,7 +21,6 @@ public class TestArrayFill extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return new String[]{\"1\", \"2\", \"3\"};")); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java index ef2f72132..4a3deb1fb 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.arrays; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -26,7 +26,6 @@ public class TestArrayFill2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return new int[]{1, a + 1, 2};")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java index 59688d708..f78eb517c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -52,7 +52,6 @@ public class TestCmpOp extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return a > 3.0f;")); assertThat(code, containsString("return b < 2.0f;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java index 7908c19a3..d63ef1656 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -24,7 +24,6 @@ public class TestCmpOp2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return a > b;")); assertThat(code, containsString("return ((double) c) < d;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java index 1dce8fde2..a39d81470 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -21,7 +21,6 @@ public class TestConditions extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("(!a || !b) && !c"))); assertThat(code, containsString("return (a && b) || c;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java index a0ec68de7..5a3dd6c8f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -31,7 +31,6 @@ public class TestConditions10 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("return"))); assertThat(code, containsOne("if (a || b > 2) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java index d8daf3382..aba8bf53e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -28,7 +28,6 @@ public class TestConditions11 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("if (a || b > 2) {")); assertThat(code, containsOne("f();")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java index 582dc195f..bff2390e0 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -56,7 +56,6 @@ public class TestConditions12 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("if (quality >= 10 && raw != 0) {")); assertThat(code, containsOne("} else if (raw == 0 || quality < 6 || !qualityReading) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java index aa3ed8c07..b92b5457c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -31,7 +31,6 @@ public class TestConditions13 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("if (quality >= 10 && raw != 0) {")); assertThat(code, containsOne("System.out.println(\"OK\" + raw);")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java index c366e3048..2f2b63442 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -26,7 +26,6 @@ public class TestConditions14 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("boolean r = a == null ? b != null : !a.equals(b);")); assertThat(code, containsOne("if (r) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java index ca0c8abaa..c65149734 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -61,7 +61,6 @@ public class TestConditions15 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("\"1\".equals(name)")); assertThat(code, containsOne("\"30\".equals(name)")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java index d8edf77c9..4e4e3fbc9 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -27,7 +27,6 @@ public class TestConditions2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); // assertThat(code, containsString("return;")); // assertThat(code, not(containsString("else"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java index 7461b5d44..4502adf97 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.List; import java.util.regex.Pattern; @@ -61,7 +61,6 @@ public class TestConditions3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return null;")); assertThat(code, not(containsString("else"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java index 821271c95..7711f723e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -22,7 +22,6 @@ public class TestConditions4 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("num >= 59 && num <= 66")); assertThat(code, containsString("return inRange ? num + 1 : num;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java index 78b4c428a..d24c0f61e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -39,7 +39,6 @@ public class TestConditions5 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("if (a1 == null) {")); assertThat(code, containsString("if (a2 != null) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java index f5dbcb6d1..5aae93c7f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.List; @@ -26,7 +26,6 @@ public class TestConditions6 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return l1.size() == 0;")); assertThat(code, not(containsString("else"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java index 7a44ccad5..a3dcd8fe5 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -23,7 +23,6 @@ public class TestConditions7 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("if (i >= 0 && i < a.length) {")); assertThat(code, not(containsString("||"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java index 390048066..687aecb1f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -63,7 +63,6 @@ public class TestConditions8 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("showMore();")); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java index 4ec669c9e..c1aa9fff9 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -26,7 +26,6 @@ public class TestConditions9 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("if (!a || (b >= 0 && b <= 11)) {")); assertThat(code, containsOne("System.out.println('1');")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java index 31b78dc2a..db4e70764 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -35,7 +35,6 @@ public class TestElseIf extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("} else if (str.equals(\"b\")) {")); assertThat(code, containsOne("} else {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java index 616f7e99d..46b29034d 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -35,7 +35,6 @@ public class TestNestedIf extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("if (this.a0) {")); assertThat(code, containsOne("if (this.a1 == 0 || this.a2 == 0) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java index 3217d7ee4..7b445b205 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -24,7 +24,6 @@ public class TestSimpleConditions extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("return (a[0] && a[1] && a[2]) || (a[3] && a[4]);")); assertThat(code, containsString("return a[0] || a[1] || a[2] || a[3];")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java index 7f73e6c9d..96aa26ffb 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -30,7 +30,6 @@ public class TestTernary extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("else"))); assertThat(code, containsString("return a != 2;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java index d835dcf7a..7e109cbd3 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestTernary2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertEquals(1, count(code, "assertTrue")); assertEquals(1, count(code, "f(1, 0)")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java index ce4115c60..cfa1f1be6 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java @@ -1,7 +1,7 @@ package jadx.tests.integration.conditions; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -26,7 +26,6 @@ public class TestTernaryInIf extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("return a ? b : c;")); assertThat(code, containsOne("return (a ? b : c) ? 1 : 2;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java index 33c665c44..9a6a03408 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java +++ b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java @@ -1,11 +1,11 @@ package jadx.tests.integration.debuginfo; -import jadx.tests.api.IntegrationTest; import jadx.core.codegen.CodeWriter; import jadx.core.dex.attributes.nodes.LineAttrNode; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.nodes.FieldNode; import jadx.core.dex.nodes.MethodNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java index e7468f0c8..407f103b5 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java @@ -1,8 +1,8 @@ package jadx.tests.integration.debuginfo; -import jadx.tests.api.IntegrationTest; import jadx.core.codegen.CodeWriter; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.lang.ref.WeakReference; import java.util.Map; @@ -38,7 +38,6 @@ public class TestLineNumbers2 extends IntegrationTest { ClassNode cls = getClassNode(TestCls.class); CodeWriter codeWriter = cls.getCode(); String code = codeWriter.toString(); - System.out.println(code); Map lineMapping = codeWriter.getLineMapping(); assertEquals("{8=18, 11=22, 12=23, 13=24, 14=28, 16=25, 17=26, 18=28, 21=31, 22=32}", diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java index 4851b91e4..086adc52c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java +++ b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java @@ -1,7 +1,7 @@ package jadx.tests.integration.enums; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -42,7 +42,6 @@ public class TestEnums extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsLines(1, "public enum EmptyEnum {", "}")); assertThat(code, containsLines(1, diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java index 280e7d506..4037ad8dd 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.enums; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import jadx.tests.api.utils.JadxMatchers; import org.junit.Test; @@ -32,7 +32,6 @@ public class TestEnums2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, JadxMatchers.containsLines(1, "public enum Operation {", diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java index 475468112..f1b3bbbc2 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java @@ -1,7 +1,7 @@ package jadx.tests.integration.generics; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.List; @@ -30,7 +30,6 @@ public class TestGenerics extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("mthWildcard(List list)")); assertThat(code, containsString("mthExtends(List list)")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java index a79f75f2a..a98d91838 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.generics; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -38,7 +38,6 @@ public class TestGenerics2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("public ItemReference(V item, Object id, ReferenceQueue queue) {")); assertThat(code, containsString("public V get(Object id) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java index 52d6a8ac6..97be7c1f2 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.generics; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.List; @@ -31,7 +31,6 @@ public class TestGenerics3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("mthExtendsArray(List list)")); assertThat(code, containsString("mthSuperArray(List list)")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java index 099fbb198..f3b137634 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.generics; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -23,7 +23,6 @@ public class TestGenerics4 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("Class[] a =")); assertThat(code, not(containsString("Class[] a ="))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java index eaa147c77..c5c8e6b88 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inline; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java index 43be62f7f..145257da6 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inline; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -14,7 +14,7 @@ public class TestInline2 extends IntegrationTest { public int test() throws InterruptedException { int[] a = new int[]{1, 2, 4, 6, 8}; int b = 0; - for (int i = 0; i < a.length; i+=2) { + for (int i = 0; i < a.length; i += 2) { b += a[i]; } for (long i = b; i > 0; i--) { @@ -28,7 +28,6 @@ public class TestInline2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("int[] a = new int[]{1, 2, 4, 6, 8};")); assertThat(code, containsOne("for (int i = 0; i < a.length; i += 2) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java index a0c24fec2..16e9a6e1a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inline; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -30,7 +30,6 @@ public class TestInline3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("this(b1, b2, 0, 0, 0);")); assertThat(code, containsString("super(a, a);")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java index 52f198713..1d14ddb06 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inline; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -26,7 +26,6 @@ public class TestInline6 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("System.out.println(System.nanoTime() - start);")); assertThat(code, not(containsString("System.out.println(System.nanoTime() - System.nanoTime());"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java index f7e97fda1..05c013db4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inline; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -36,7 +36,6 @@ public class TestInlineInLoop extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("int c")); assertThat(code, containsOne("c = b + 1")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java index d11b11505..feebd6a2e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inline; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -37,7 +37,6 @@ public class TestSyntheticInline extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("synthetic"))); assertThat(code, not(containsString("access$"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java index d038c4f8c..360314f3d 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.File; import java.io.FilenameFilter; diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java index eda2b7de8..00f8f646e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -50,7 +50,6 @@ public class TestAnonymousClass2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("synthetic"))); assertThat(code, not(containsString("AnonymousClass_"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java index 9207c738e..b9530d996 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -43,7 +43,6 @@ public class TestAnonymousClass3 extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString(indent(4) + "public void run() {")); assertThat(code, containsString(indent(3) + "}.start();")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java index 4ba19cbdb..d2032cd95 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -35,7 +35,6 @@ public class TestAnonymousClass4 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne(indent(3) + "new Thread() {")); assertThat(code, containsOne(indent(4) + "{")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java index 60ee2d975..5e2c95c3a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -22,7 +22,6 @@ public class TestInnerClass extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("Inner {")); assertThat(code, containsString("Inner2 extends Thread {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java index e42594ab4..b8c4a3a00 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.Timer; import java.util.TimerTask; diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java index 7bd2b6116..adeabda9a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.inner; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -30,7 +30,6 @@ public class TestInnerClass3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("synthetic"))); assertThat(code, not(containsString("access$"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java index 2d37a36da..7d9ec516e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java +++ b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java @@ -19,7 +19,7 @@ public class TestOverloadedMethodInvoke extends IntegrationTest { public void method(Throwable th) { c++; if (th != null) { - c+=100; + c += 100; } } diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java index 263b8d49c..4e8698ecd 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestArrayForEach extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsLines(2, "int sum = 0;", diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java index 8934e21b8..6cc5a4028 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestArrayForEach2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsLines(2, "for (String s : str.split(\"\\n\")) {", diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java index 6169b6ff1..e2569c43b 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -49,7 +49,6 @@ public class TestArrayForEachNegative extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString(":"))); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java index 68f868304..e42a0a0e7 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -29,7 +29,6 @@ public class TestBreakInLoop extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("for (int i = 0; i < a.length; i++) {")); // assertThat(code, containsOne("a[i]++;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java index 16f16eeb8..590e9efbc 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestIndexForLoop extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsLines(2, "int sum = 0;", diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java index dc0b97226..e89358967 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -24,7 +24,6 @@ public class TestIterableForEach extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsLines(2, "StringBuilder sb = new StringBuilder();", diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java index 3395961ba..a2215eeab 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.IOException; import java.util.List; @@ -44,7 +44,6 @@ public class TestIterableForEach2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("for (Authorization auth : service.getAuthorizations()) {")); assertThat(code, containsOne("if (isValid(auth)) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java index e0a4341de..31e944d54 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -46,7 +46,6 @@ public class TestLoopCondition extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("i < this.f.length()")); assertThat(code, containsOne("list.set(i, \"ABC\")")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java index e9c432953..889d3b1bb 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestLoopCondition2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("int i = 0;")); assertThat(code, containsOne("while (a && i < 10) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java index 517100f51..729394668 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -33,7 +33,6 @@ public class TestLoopCondition3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("while (a < 12) {")); assertThat(code, containsOne("if (b + a < 9 && b < 8) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java index 20d77368f..bab66d309 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -27,7 +27,6 @@ public class TestLoopCondition4 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("int n = -1;")); assertThat(code, containsOne("while (n < 0) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java index a30f62cd2..d00cdc183 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -35,7 +35,6 @@ public class TestLoopConditionInvoke extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("do {")); assertThat(code, containsOne("if (ch == '\\u0000') {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java index 47d0c88ae..b8c9f41f7 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -30,7 +30,6 @@ public class TestLoopDetection extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("while (i < a.length && i < b) {")); assertThat(code, containsString("while (i < a.length) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java index 0bbf034e9..f2229d570 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -32,7 +32,6 @@ public class TestLoopDetection2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("int c = a + b;")); assertThat(code, containsOne("for (int i = a; i < b; i++) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java index f65755784..0c4605dfe 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -35,7 +35,6 @@ public class TestLoopDetection3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("while")); // TODO diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java index 13e89ad7f..e54626402 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.Iterator; @@ -38,7 +38,6 @@ public class TestLoopDetection4 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("while (this.iterator.hasNext()) {")); assertThat(code, containsOne("if (filtered != null) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java index bc954d25a..381711684 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.List; @@ -36,7 +36,6 @@ public class TestNestedLoops extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("for (String s1 : l1) {")); assertThat(code, containsOne("for (String s2 : l2) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java index 008c0b566..969c05562 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.util.List; @@ -30,7 +30,6 @@ public class TestNestedLoops2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("for (int i = 0; i < list.size(); i++) {")); assertThat(code, containsOne("while (j < ((String) list.get(i)).length()) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java index 4a4992b08..ef73f927a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java @@ -1,7 +1,7 @@ package jadx.tests.integration.loops; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -38,7 +38,6 @@ public class TestSequentialLoops extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, countString(2, "while (")); assertThat(code, containsOne("break;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java b/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java index c50ea1b1b..2baeed759 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java +++ b/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java @@ -1,7 +1,7 @@ package jadx.tests.integration.names; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -31,7 +31,6 @@ public class TestSameMethodsNames extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("new Bug().Bug();")); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java index 1e61e896e..9683b0b35 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java @@ -1,7 +1,7 @@ package jadx.tests.integration.others; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.File; import java.io.IOException; @@ -43,7 +43,6 @@ public class TestIfInTry extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("if (a != 0) {")); assertThat(code, containsOne("} catch (Exception e) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java index 1e3a68062..5bf7c8ae3 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java @@ -1,7 +1,7 @@ package jadx.tests.integration.others; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -51,7 +51,6 @@ public class TestIfTryInCatch extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, countString(2, "try {")); assertThat(code, containsOne("if (")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java index 98b43f3d4..2d5a6ca6a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java @@ -1,7 +1,7 @@ package jadx.tests.integration.others; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.lang.reflect.Field; import java.util.HashMap; @@ -91,7 +91,6 @@ public class TestIssue13a extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); for (int i = 1; i <= 7; i++) { assertThat(code, containsOne("\"" + i + "\"")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java index b0608323d..8df8e149f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java @@ -1,7 +1,7 @@ package jadx.tests.integration.others; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.File; import java.io.FileInputStream; @@ -80,7 +80,6 @@ public class TestIssue13b extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, countString(4, "} catch (")); assertThat(code, countString(3, "Log.e(")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java index 0833e8ced..d06559c45 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java @@ -1,7 +1,7 @@ package jadx.tests.integration.others; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -40,7 +40,6 @@ public class TestLoopInTry extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("try {")); assertThat(code, containsOne("if (b) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java index aa343bff1..00f20af41 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java @@ -1,10 +1,10 @@ package jadx.tests.integration.others; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.nodes.DexNode; import jadx.core.dex.nodes.MethodNode; import jadx.core.utils.exceptions.DecodeException; +import jadx.tests.api.IntegrationTest; import java.io.EOFException; @@ -44,7 +44,6 @@ public class TestLoopInTry2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("try {")); assertThat(code, containsOne("while (in.hasMore()) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java index 81faafe35..b0a13f2a4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java @@ -1,7 +1,7 @@ package jadx.tests.integration.switches; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -42,7 +42,6 @@ public class TestSwitch extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("case '/':")); assertThat(code, containsString(indent(5) + "break;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java index 9b569d3a2..1c02333d3 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java @@ -1,7 +1,7 @@ package jadx.tests.integration.switches; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java index a56ccd3f8..1fdac7878 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java @@ -1,7 +1,7 @@ package jadx.tests.integration.switches; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -34,7 +34,6 @@ public class TestSwitchNoDefault extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertEquals(4, count(code, "break;")); assertEquals(1, count(code, "System.out.println(s);")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java index c8903e55b..5bc21102d 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java @@ -1,7 +1,7 @@ package jadx.tests.integration.switches; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -40,7 +40,6 @@ public class TestSwitchSimple extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertEquals(5, count(code, "break;")); assertEquals(1, count(code, "System.out.println(s);")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java index e18b8cc38..bb867574d 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java +++ b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java @@ -1,7 +1,7 @@ package jadx.tests.integration.synchronize; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -31,7 +31,6 @@ public class TestSynchronized extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("synchronized (this) {"))); assertThat(code, containsString("public synchronized boolean test1() {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java index b984c658f..d1754d365 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.synchronize; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -20,7 +20,6 @@ public class TestSynchronized2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("private static synchronized boolean test(Object obj) {")); assertThat(code, containsString("obj.toString() != null;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java index 63214c1c7..667180b07 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.File; @@ -33,7 +33,6 @@ public class TestInlineInCatch extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne("File output = null;")); assertThat(code, containsOne("output = File.createTempFile(\"f\", \"a\", ")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java index 13f452b9e..205a541e1 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java index a12009ff6..89030d3d7 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java index 031f9bf20..0d466f935 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -29,7 +29,6 @@ public class TestTryCatch2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("try {")); assertThat(code, containsString("synchronized (obj) {")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java index 6a05b2e45..e0c7a1cd3 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -34,7 +34,6 @@ public class TestTryCatch3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("try {")); assertThat(code, containsString("exc(obj);")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java index 81c506448..c00917109 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.File; import java.io.FileNotFoundException; @@ -33,7 +33,6 @@ public class TestTryCatch4 extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("try {")); assertThat(code, containsString("output = new FileOutputStream(new File(\"f\"));")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java index 6c281e067..0b3695589 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java @@ -1,7 +1,7 @@ package jadx.tests.integration.trycatch; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.io.File; import java.io.FileOutputStream; @@ -46,7 +46,6 @@ public class TestTryCatch5 extends IntegrationTest { disableCompilation(); ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("try {")); // TODO: diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java index f4751f246..0a30494d6 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java @@ -1,7 +1,7 @@ package jadx.tests.integration.types; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestTypeResolver extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("this(b1, b2, 0, 0, 0);")); assertThat(code, not(containsString("= this;"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java index 43eb493b6..0850bc882 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java @@ -1,7 +1,7 @@ package jadx.tests.integration.usethis; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -29,7 +29,6 @@ public class TestInlineThis extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, not(containsString("something"))); assertThat(code, not(containsString("something.method()"))); diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java index 9b19d9256..18b01d410 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java @@ -1,7 +1,7 @@ package jadx.tests.integration.usethis; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java index 37ea25148..2c8c33028 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java @@ -1,7 +1,7 @@ package jadx.tests.integration.variables; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -25,7 +25,6 @@ public class TestVariables2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("Object store = s != null ? s : null;")); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java index 8843e9731..e0428d64d 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java @@ -1,7 +1,7 @@ package jadx.tests.integration.variables; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import org.junit.Test; @@ -27,7 +27,6 @@ public class TestVariables3 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("int i;")); assertThat(code, containsString("i = 2;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java index 39637c34a..38dcc68b4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java @@ -1,7 +1,7 @@ package jadx.tests.integration.variables; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; +import jadx.tests.api.IntegrationTest; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -60,7 +60,6 @@ public class TestVariables4 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsString("} catch (InvocationTargetException e) {")); assertThat(code, containsString("pass = false;")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java index 8539541cc..32e57a497 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java @@ -1,9 +1,9 @@ package jadx.tests.integration.variables; -import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.IDexTreeVisitor; +import jadx.tests.api.IntegrationTest; import java.util.List; @@ -38,7 +38,6 @@ public class TestVariablesDefinitions extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - System.out.println(code); assertThat(code, containsOne(indent(3) + "for (IDexTreeVisitor pass : this.passes) {")); assertThat(code, not(containsString("iterator;")));