From d55cd5fbb4997a781c517a05d923ac89a99866f5 Mon Sep 17 00:00:00 2001 From: Skylot Date: Sun, 21 Sep 2014 19:01:40 +0400 Subject: [PATCH] core tests: organize directories --- .../src/test/java/jadx/api/JadxInternalAccess.java | 10 ++++++++++ .../api/IntegrationTest.java} | 10 +++++++--- .../src/test/java/jadx/{ => tests}/api/SmaliTest.java | 4 ++-- .../java/jadx/tests/{ => api}/utils/CountString.java | 4 +--- .../java/jadx/tests/{ => api}/utils/JadxMatchers.java | 3 +-- .../java/jadx/{api => tests/api/utils}/TestUtils.java | 2 +- .../tests/{internal => integration}/TestArgInline.java | 6 +++--- .../tests/{internal => integration}/TestClassGen.java | 6 +++--- .../{internal => integration}/TestDuplicateCast.java | 6 +++--- .../{internal => integration}/TestFloatValue.java | 6 +++--- .../TestRedundantBrackets.java | 6 +++--- .../{internal => integration}/TestRedundantReturn.java | 6 +++--- .../{internal => integration}/TestReturnWrapping.java | 6 +++--- .../TestStaticFieldsInit.java | 6 +++--- .../{internal => integration}/TestStaticMethod.java | 6 +++--- .../TestStringBuilderElimination.java | 6 +++--- .../tests/{internal => integration}/TestWrongCode.java | 6 +++--- .../annotations/TestAnnotations.java | 8 ++++---- .../annotations/TestAnnotations2.java | 6 +++--- .../annotations/TestParamAnnotations.java | 6 +++--- .../annotations/TestVarArgAnnotation.java | 6 +++--- .../{internal => integration}/arith/TestArith.java | 6 +++--- .../{internal => integration}/arith/TestArith2.java | 6 +++--- .../arith/TestFieldIncrement.java | 6 +++--- .../arith/TestFieldIncrement2.java | 6 +++--- .../arith/TestSpecialValues.java | 8 ++++---- .../arrays/TestArrayFill.java | 6 +++--- .../arrays/TestArrayFill2.java | 6 +++--- .../conditions/TestCmpOp.java | 6 +++--- .../conditions/TestCmpOp2.java | 6 +++--- .../conditions/TestConditions.java | 6 +++--- .../conditions/TestConditions10.java | 8 ++++---- .../conditions/TestConditions11.java | 8 ++++---- .../conditions/TestConditions12.java | 8 ++++---- .../conditions/TestConditions13.java | 8 ++++---- .../conditions/TestConditions14.java | 8 ++++---- .../conditions/TestConditions15.java | 8 ++++---- .../conditions/TestConditions2.java | 6 +++--- .../conditions/TestConditions3.java | 6 +++--- .../conditions/TestConditions4.java | 6 +++--- .../conditions/TestConditions5.java | 6 +++--- .../conditions/TestConditions6.java | 6 +++--- .../conditions/TestConditions7.java | 6 +++--- .../conditions/TestConditions8.java | 6 +++--- .../conditions/TestConditions9.java | 8 ++++---- .../conditions/TestElseIf.java | 8 ++++---- .../conditions/TestNestedIf.java | 10 +++++----- .../conditions/TestSimpleConditions.java | 6 +++--- .../conditions/TestTernary.java | 6 +++--- .../conditions/TestTernary2.java | 6 +++--- .../conditions/TestTernaryInIf.java | 8 ++++---- .../debuginfo/TestLineNumbers.java | 6 +++--- .../debuginfo/TestLineNumbers2.java | 6 +++--- .../{internal => integration}/enums/TestEnums.java | 8 ++++---- .../{internal => integration}/enums/TestEnums2.java | 8 ++++---- .../enums/TestSwitchOverEnum.java | 8 ++++---- .../generics/TestGenerics.java | 6 +++--- .../generics/TestGenerics2.java | 6 +++--- .../generics/TestGenerics3.java | 6 +++--- .../generics/TestGenerics4.java | 6 +++--- .../{internal => integration}/inline/TestInline.java | 6 +++--- .../{internal => integration}/inline/TestInline2.java | 8 ++++---- .../{internal => integration}/inline/TestInline3.java | 6 +++--- .../{internal => integration}/inline/TestInline6.java | 6 +++--- .../inline/TestInlineInLoop.java | 10 +++++----- .../inline/TestSyntheticInline.java | 6 +++--- .../inner/TestAnonymousClass.java | 6 +++--- .../inner/TestAnonymousClass2.java | 6 +++--- .../inner/TestAnonymousClass3.java | 6 +++--- .../inner/TestAnonymousClass4.java | 10 +++++----- .../inner/TestInnerClass.java | 6 +++--- .../inner/TestInnerClass2.java | 6 +++--- .../inner/TestInnerClass3.java | 6 +++--- .../loops/TestArrayForEach.java | 8 ++++---- .../loops/TestArrayForEach2.java | 8 ++++---- .../loops/TestArrayForEachNegative.java | 6 +++--- .../loops/TestBreakInLoop.java | 10 +++++----- .../loops/TestIndexForLoop.java | 8 ++++---- .../loops/TestIterableForEach.java | 8 ++++---- .../loops/TestIterableForEach2.java | 8 ++++---- .../loops/TestLoopCondition.java | 8 ++++---- .../loops/TestLoopCondition2.java | 8 ++++---- .../loops/TestLoopCondition3.java | 8 ++++---- .../loops/TestLoopCondition4.java | 8 ++++---- .../loops/TestLoopConditionInvoke.java | 8 ++++---- .../loops/TestLoopDetection.java | 6 +++--- .../loops/TestLoopDetection2.java | 8 ++++---- .../loops/TestLoopDetection3.java | 6 +++--- .../loops/TestLoopDetection4.java | 8 ++++---- .../loops/TestNestedLoops.java | 8 ++++---- .../loops/TestNestedLoops2.java | 8 ++++---- .../loops/TestSequentialLoops.java | 10 +++++----- .../names/TestSameMethodsNames.java | 8 ++++---- .../{internal => integration}/others/TestIfInTry.java | 10 +++++----- .../others/TestIfTryInCatch.java | 10 +++++----- .../{internal => integration}/others/TestIssue13a.java | 8 ++++---- .../{internal => integration}/others/TestIssue13b.java | 10 +++++----- .../others/TestLoopInTry.java | 8 ++++---- .../others/TestLoopInTry2.java | 8 ++++---- .../{internal => integration}/switches/TestSwitch.java | 6 +++--- .../switches/TestSwitchLabels.java | 6 +++--- .../switches/TestSwitchNoDefault.java | 6 +++--- .../switches/TestSwitchSimple.java | 6 +++--- .../synchronize/TestSynchronized.java | 6 +++--- .../synchronize/TestSynchronized2.java | 6 +++--- .../trycatch/TestInlineInCatch.java | 8 ++++---- .../trycatch/TestNestedTryCatch.java | 8 ++++---- .../trycatch/TestTryCatch.java | 6 +++--- .../trycatch/TestTryCatch2.java | 6 +++--- .../trycatch/TestTryCatch3.java | 6 +++--- .../trycatch/TestTryCatch4.java | 6 +++--- .../trycatch/TestTryCatch5.java | 6 +++--- .../types/TestTypeResolver.java | 6 +++--- .../usethis/TestInlineThis.java | 8 ++++---- .../usethis/TestRedundantThis.java | 6 +++--- .../variables/TestVariables2.java | 6 +++--- .../variables/TestVariables3.java | 6 +++--- .../variables/TestVariables4.java | 6 +++--- .../variables/TestVariablesDefinitions.java | 8 ++++---- .../test/java/jadx/tests/smali/TestConstructor.java | 4 ++-- 120 files changed, 416 insertions(+), 405 deletions(-) create mode 100644 jadx-core/src/test/java/jadx/api/JadxInternalAccess.java rename jadx-core/src/test/java/jadx/{api/InternalJadxTest.java => tests/api/IntegrationTest.java} (93%) rename jadx-core/src/test/java/jadx/{ => tests}/api/SmaliTest.java (94%) rename jadx-core/src/test/java/jadx/tests/{ => api}/utils/CountString.java (93%) rename jadx-core/src/test/java/jadx/tests/{ => api}/utils/JadxMatchers.java (94%) rename jadx-core/src/test/java/jadx/{api => tests/api/utils}/TestUtils.java (94%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestArgInline.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestClassGen.java (88%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestDuplicateCast.java (91%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestFloatValue.java (83%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestRedundantBrackets.java (92%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestRedundantReturn.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestReturnWrapping.java (90%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestStaticFieldsInit.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestStaticMethod.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestStringBuilderElimination.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/TestWrongCode.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/annotations/TestAnnotations.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/annotations/TestAnnotations2.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/annotations/TestParamAnnotations.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/annotations/TestVarArgAnnotation.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arith/TestArith.java (80%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arith/TestArith2.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arith/TestFieldIncrement.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arith/TestFieldIncrement2.java (83%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arith/TestSpecialValues.java (89%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arrays/TestArrayFill.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/arrays/TestArrayFill2.java (83%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestCmpOp.java (91%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestCmpOp2.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions10.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions11.java (77%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions12.java (90%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions13.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions14.java (77%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions15.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions2.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions3.java (91%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions4.java (83%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions5.java (90%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions6.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions7.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions8.java (89%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestConditions9.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestElseIf.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestNestedIf.java (78%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestSimpleConditions.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestTernary.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestTernary2.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/conditions/TestTernaryInIf.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/debuginfo/TestLineNumbers.java (94%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/debuginfo/TestLineNumbers2.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/enums/TestEnums.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/enums/TestEnums2.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/enums/TestSwitchOverEnum.java (75%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/generics/TestGenerics.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/generics/TestGenerics2.java (90%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/generics/TestGenerics3.java (88%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/generics/TestGenerics4.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inline/TestInline.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inline/TestInline2.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inline/TestInline3.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inline/TestInline6.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inline/TestInlineInLoop.java (77%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inline/TestSyntheticInline.java (89%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestAnonymousClass.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestAnonymousClass2.java (89%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestAnonymousClass3.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestAnonymousClass4.java (77%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestInnerClass.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestInnerClass2.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/inner/TestInnerClass3.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestArrayForEach.java (73%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestArrayForEach2.java (78%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestArrayForEachNegative.java (88%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestBreakInLoop.java (75%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestIndexForLoop.java (74%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestIterableForEach.java (76%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestIterableForEach2.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopCondition.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopCondition2.java (75%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopCondition3.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopCondition4.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopConditionInvoke.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopDetection.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopDetection2.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopDetection3.java (85%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestLoopDetection4.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestNestedLoops.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestNestedLoops2.java (77%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/loops/TestSequentialLoops.java (75%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/names/TestSameMethodsNames.java (73%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/others/TestIfInTry.java (79%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/others/TestIfTryInCatch.java (80%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/others/TestIssue13a.java (93%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/others/TestIssue13b.java (90%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/others/TestLoopInTry.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/others/TestLoopInTry2.java (88%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/switches/TestSwitch.java (89%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/switches/TestSwitchLabels.java (88%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/switches/TestSwitchNoDefault.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/switches/TestSwitchSimple.java (88%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/synchronize/TestSynchronized.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/synchronize/TestSynchronized2.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestInlineInCatch.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestNestedTryCatch.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestTryCatch.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestTryCatch2.java (87%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestTryCatch3.java (86%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestTryCatch4.java (90%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/trycatch/TestTryCatch5.java (89%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/types/TestTypeResolver.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/usethis/TestInlineThis.java (82%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/usethis/TestRedundantThis.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/variables/TestVariables2.java (81%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/variables/TestVariables3.java (84%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/variables/TestVariables4.java (93%) rename jadx-core/src/test/java/jadx/tests/{internal => integration}/variables/TestVariablesDefinitions.java (82%) diff --git a/jadx-core/src/test/java/jadx/api/JadxInternalAccess.java b/jadx-core/src/test/java/jadx/api/JadxInternalAccess.java new file mode 100644 index 000000000..8bfb46072 --- /dev/null +++ b/jadx-core/src/test/java/jadx/api/JadxInternalAccess.java @@ -0,0 +1,10 @@ +package jadx.api; + +import jadx.core.dex.nodes.RootNode; + +public class JadxInternalAccess { + + public static RootNode getRoot(JadxDecompiler d) { + return d.getRoot(); + } +} diff --git a/jadx-core/src/test/java/jadx/api/InternalJadxTest.java b/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java similarity index 93% rename from jadx-core/src/test/java/jadx/api/InternalJadxTest.java rename to jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java index 6c0b8d58c..6fe5a3641 100644 --- a/jadx-core/src/test/java/jadx/api/InternalJadxTest.java +++ b/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java @@ -1,5 +1,8 @@ -package jadx.api; +package jadx.tests.api; +import jadx.api.JadxInternalAccess; +import jadx.api.DefaultJadxArgs; +import jadx.api.JadxDecompiler; import jadx.core.Jadx; import jadx.core.dex.attributes.AFlag; import jadx.core.dex.attributes.AType; @@ -9,6 +12,7 @@ import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.IDexTreeVisitor; import jadx.core.utils.exceptions.JadxException; import jadx.core.utils.files.FileUtils; +import jadx.tests.api.utils.TestUtils; import java.io.File; import java.io.FileOutputStream; @@ -27,7 +31,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -public abstract class InternalJadxTest extends TestUtils { +public abstract class IntegrationTest extends TestUtils { protected boolean outputCFG = false; protected boolean isFallback = false; @@ -52,7 +56,7 @@ public abstract class InternalJadxTest extends TestUtils { } catch (JadxException e) { fail(e.getMessage()); } - ClassNode cls = d.getRoot().searchClassByName(clsName); + ClassNode cls = JadxInternalAccess.getRoot(d).searchClassByName(clsName); assertNotNull("Class not found: " + clsName, cls); assertEquals(cls.getFullName(), clsName); diff --git a/jadx-core/src/test/java/jadx/api/SmaliTest.java b/jadx-core/src/test/java/jadx/tests/api/SmaliTest.java similarity index 94% rename from jadx-core/src/test/java/jadx/api/SmaliTest.java rename to jadx-core/src/test/java/jadx/tests/api/SmaliTest.java index 07f2131fe..3e8e5b6c0 100644 --- a/jadx-core/src/test/java/jadx/api/SmaliTest.java +++ b/jadx-core/src/test/java/jadx/tests/api/SmaliTest.java @@ -1,4 +1,4 @@ -package jadx.api; +package jadx.tests.api; import jadx.core.Consts; import jadx.core.dex.nodes.ClassNode; @@ -11,7 +11,7 @@ import org.jf.smali.main; import static org.junit.Assert.fail; -public class SmaliTest extends InternalJadxTest { +public class SmaliTest extends IntegrationTest { private static final String SMALI_TESTS_PROJECT = "jadx-core"; private static final String SMALI_TESTS_DIR = "src/test/smali"; diff --git a/jadx-core/src/test/java/jadx/tests/utils/CountString.java b/jadx-core/src/test/java/jadx/tests/api/utils/CountString.java similarity index 93% rename from jadx-core/src/test/java/jadx/tests/utils/CountString.java rename to jadx-core/src/test/java/jadx/tests/api/utils/CountString.java index 688666073..422ee849c 100644 --- a/jadx-core/src/test/java/jadx/tests/utils/CountString.java +++ b/jadx-core/src/test/java/jadx/tests/api/utils/CountString.java @@ -1,6 +1,4 @@ -package jadx.tests.utils; - -import jadx.api.TestUtils; +package jadx.tests.api.utils; import org.hamcrest.Description; import org.hamcrest.core.SubstringMatcher; diff --git a/jadx-core/src/test/java/jadx/tests/utils/JadxMatchers.java b/jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java similarity index 94% rename from jadx-core/src/test/java/jadx/tests/utils/JadxMatchers.java rename to jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java index 92dfe33c5..f9f07f77e 100644 --- a/jadx-core/src/test/java/jadx/tests/utils/JadxMatchers.java +++ b/jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java @@ -1,6 +1,5 @@ -package jadx.tests.utils; +package jadx.tests.api.utils; -import jadx.api.TestUtils; import jadx.core.codegen.CodeWriter; import org.hamcrest.Matcher; diff --git a/jadx-core/src/test/java/jadx/api/TestUtils.java b/jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java similarity index 94% rename from jadx-core/src/test/java/jadx/api/TestUtils.java rename to jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java index b0a19d0ea..0a701a927 100644 --- a/jadx-core/src/test/java/jadx/api/TestUtils.java +++ b/jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java @@ -1,4 +1,4 @@ -package jadx.api; +package jadx.tests.api.utils; import jadx.core.codegen.CodeWriter; diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestArgInline.java b/jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/TestArgInline.java rename to jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java index 9e077c191..f026ee12d 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestArgInline.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestArgInline extends InternalJadxTest { +public class TestArgInline extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestClassGen.java b/jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java similarity index 88% rename from jadx-core/src/test/java/jadx/tests/internal/TestClassGen.java rename to jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java index 8f9d2ff26..642ad255b 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestClassGen.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestClassGen extends InternalJadxTest { +public class TestClassGen extends IntegrationTest { public static class TestCls { public static interface I { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java b/jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java similarity index 91% rename from jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java rename to jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java index 2e5a45eb0..64abec451 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.instructions.InsnType; import jadx.core.dex.instructions.args.InsnWrapArg; import jadx.core.dex.nodes.ClassNode; @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; * Test duplicate 'check-cast' instruction produced because of bug in javac: * http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6246854 */ -public class TestDuplicateCast extends InternalJadxTest { +public class TestDuplicateCast extends IntegrationTest { public static class TestCls { public int[] method(Object o) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestFloatValue.java b/jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java similarity index 83% rename from jadx-core/src/test/java/jadx/tests/internal/TestFloatValue.java rename to jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java index 8de506440..f2aadf239 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestFloatValue.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestFloatValue extends InternalJadxTest { +public class TestFloatValue extends IntegrationTest { public static class TestCls { public float[] method() { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java similarity index 92% rename from jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java rename to jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java index 125971c49..48fd6d4b4 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestRedundantBrackets extends InternalJadxTest { +public class TestRedundantBrackets extends IntegrationTest { public static class TestCls { public boolean method(String str) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestRedundantReturn.java b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/TestRedundantReturn.java rename to jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java index 3e49731c0..6a4338289 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestRedundantReturn.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -10,7 +10,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -public class TestRedundantReturn extends InternalJadxTest { +public class TestRedundantReturn extends IntegrationTest { public static class TestCls { public void test(int num) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestReturnWrapping.java b/jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java similarity index 90% rename from jadx-core/src/test/java/jadx/tests/internal/TestReturnWrapping.java rename to jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java index bdb404368..e3c92c828 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestReturnWrapping.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestReturnWrapping extends InternalJadxTest { +public class TestReturnWrapping extends IntegrationTest { public static class TestCls { public static int f1(int arg0) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestStaticFieldsInit.java b/jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/TestStaticFieldsInit.java rename to jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java index a63183401..59303e975 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestStaticFieldsInit.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestStaticFieldsInit extends InternalJadxTest { +public class TestStaticFieldsInit extends IntegrationTest { public static class TestCls { public static final String s1 = "1"; diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestStaticMethod.java b/jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/TestStaticMethod.java rename to jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java index 2f2f99139..0fca23ee8 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestStaticMethod.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestStaticMethod extends InternalJadxTest { +public class TestStaticMethod extends IntegrationTest { public static class TestCls { static { diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java b/jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java rename to jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java index 4132c81bc..3c12fdabb 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestStringBuilderElimination extends InternalJadxTest { +public class TestStringBuilderElimination extends IntegrationTest { public static class MyException extends Exception { private static final long serialVersionUID = 4245254480662372757L; diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestWrongCode.java b/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/TestWrongCode.java rename to jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java index 62be68397..c2c868b3a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestWrongCode.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java @@ -1,6 +1,6 @@ -package jadx.tests.internal; +package jadx.tests.integration; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestWrongCode extends InternalJadxTest { +public class TestWrongCode extends IntegrationTest { public static class TestCls { private int test() { diff --git a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations.java rename to jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java index fe8a38aea..2d531dc65 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.annotations; +package jadx.tests.integration.annotations; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestAnnotations extends InternalJadxTest { +public class TestAnnotations extends IntegrationTest { public static class TestCls { private static @interface A { diff --git a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations2.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations2.java rename to jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java index 6f75171f6..39558a6e0 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.annotations; +package jadx.tests.integration.annotations; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.lang.annotation.ElementType; @@ -13,7 +13,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestAnnotations2 extends InternalJadxTest { +public class TestAnnotations2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestParamAnnotations.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/annotations/TestParamAnnotations.java rename to jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java index 20f9639a8..1a78a1bcf 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestParamAnnotations.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.annotations; +package jadx.tests.integration.annotations; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.lang.annotation.ElementType; @@ -13,7 +13,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestParamAnnotations extends InternalJadxTest { +public class TestParamAnnotations extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestVarArgAnnotation.java b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/annotations/TestVarArgAnnotation.java rename to jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java index 401f64cbb..27a4cbeaf 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/annotations/TestVarArgAnnotation.java +++ b/jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.annotations; +package jadx.tests.integration.annotations; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestVarArgAnnotation extends InternalJadxTest { +public class TestVarArgAnnotation extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/arith/TestArith.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java similarity index 80% rename from jadx-core/src/test/java/jadx/tests/internal/arith/TestArith.java rename to jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java index 44d8430b1..06381c6ba 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arith/TestArith.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.arith; +package jadx.tests.integration.arith; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestArith extends InternalJadxTest { +public class TestArith extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/arith/TestArith2.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/arith/TestArith2.java rename to jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java index 90ae2ae24..e34c77198 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arith/TestArith2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.arith; +package jadx.tests.integration.arith; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestArith2 extends InternalJadxTest { +public class TestArith2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement.java rename to jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java index 51192fee4..bead13af3 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.arith; +package jadx.tests.integration.arith; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestFieldIncrement extends InternalJadxTest { +public class TestFieldIncrement extends IntegrationTest { public static class TestCls { public int instanceField = 1; diff --git a/jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement2.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java similarity index 83% rename from jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement2.java rename to jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java index b1aa72bc7..3f12e7718 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.arith; +package jadx.tests.integration.arith; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestFieldIncrement2 extends InternalJadxTest { +public class TestFieldIncrement2 extends IntegrationTest { class A { int f = 5; diff --git a/jadx-core/src/test/java/jadx/tests/internal/arith/TestSpecialValues.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java similarity index 89% rename from jadx-core/src/test/java/jadx/tests/internal/arith/TestSpecialValues.java rename to jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java index ad57b469b..ad8cfd37c 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arith/TestSpecialValues.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.arith; +package jadx.tests.integration.arith; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestSpecialValues extends InternalJadxTest { +public class TestSpecialValues extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill.java b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill.java rename to jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java index 811bf9d89..536ca32a2 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.arrays; +package jadx.tests.integration.arrays; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestArrayFill extends InternalJadxTest { +public class TestArrayFill extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill2.java b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java similarity index 83% rename from jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill2.java rename to jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java index 6a1fe1110..405e1a2cc 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.arrays; +package jadx.tests.integration.arrays; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestArrayFill2 extends InternalJadxTest { +public class TestArrayFill2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java similarity index 91% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java index 9253bdc1b..59688d708 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestCmpOp extends InternalJadxTest { +public class TestCmpOp extends IntegrationTest { public static class TestCls { public boolean testGT(float a) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp2.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java index 674bc5c2a..7908c19a3 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestCmpOp2 extends InternalJadxTest { +public class TestCmpOp2 extends IntegrationTest { public static class TestCls { public boolean testGT(float a, float b) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java index 0729c7326..1dce8fde2 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions extends InternalJadxTest { +public class TestConditions extends IntegrationTest { public static class TestCls { private boolean test(boolean a, boolean b, boolean c) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions10.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions10.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java index 696f486a4..a0ec68de7 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions10.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions10 extends InternalJadxTest { +public class TestConditions10 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions11.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java similarity index 77% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions11.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java index 9f98b0f19..d8daf3382 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions11.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions11 extends InternalJadxTest { +public class TestConditions11 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions12.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java similarity index 90% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions12.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java index 5906e6692..582dc195f 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions12.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions12 extends InternalJadxTest { +public class TestConditions12 extends IntegrationTest { public static class TestCls { static boolean autoStop = true; diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions13.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions13.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java index ca3b583eb..aa3ed8c07 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions13.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions13 extends InternalJadxTest { +public class TestConditions13 extends IntegrationTest { public static class TestCls { static boolean qualityReading; diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions14.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java similarity index 77% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions14.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java index f63c1acb4..c366e3048 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions14.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestConditions14 extends InternalJadxTest { +public class TestConditions14 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions15.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions15.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java index b268d8424..ca0c8abaa 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions15.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestConditions15 extends InternalJadxTest { +public class TestConditions15 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions2.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java index 3f8381bab..d8edf77c9 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java @@ -1,11 +1,11 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -public class TestConditions2 extends InternalJadxTest { +public class TestConditions2 extends IntegrationTest { public static class TestCls { int c; diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions3.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java similarity index 91% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions3.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java index ea48bc63d..7461b5d44 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.List; @@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions3 extends InternalJadxTest { +public class TestConditions3 extends IntegrationTest { public static class TestCls { private static final Pattern PATTERN = Pattern.compile("[a-f0-9]{20}"); diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions4.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java similarity index 83% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions4.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java index 4f187f6ec..821271c95 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions4 extends InternalJadxTest { +public class TestConditions4 extends IntegrationTest { public static class TestCls { public int test(int num) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions5.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java similarity index 90% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions5.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java index 6204019fe..78b4c428a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions5.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions5 extends InternalJadxTest { +public class TestConditions5 extends IntegrationTest { public static class TestCls { public static void assertEquals(Object a1, Object a2) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions6.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions6.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java index 4e4ab9ed8..f5dbcb6d1 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions6.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.List; @@ -11,7 +11,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions6 extends InternalJadxTest { +public class TestConditions6 extends IntegrationTest { public static class TestCls { public boolean test(List l1, List l2) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions7.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions7.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java index 2c2508c2d..7a44ccad5 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions7.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions7 extends InternalJadxTest { +public class TestConditions7 extends IntegrationTest { public static class TestCls { public void test(int[] a, int i) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions8.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java similarity index 89% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions8.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java index 62b4813ac..390048066 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions8.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestConditions8 extends InternalJadxTest { +public class TestConditions8 extends IntegrationTest { public static class TestCls { private TestCls pager; diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions9.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions9.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java index 817b2a1f0..4ec669c9e 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions9.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestConditions9 extends InternalJadxTest { +public class TestConditions9 extends IntegrationTest { public static class TestCls { public void test(boolean a, int b) throws Exception { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestElseIf.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestElseIf.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java index fb0a8721a..31b78dc2a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestElseIf.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestElseIf extends InternalJadxTest { +public class TestElseIf extends IntegrationTest { public static class TestCls { public int testIfElse(String str) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestNestedIf.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java similarity index 78% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestNestedIf.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java index bc2da7d7a..616f7e99d 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestNestedIf.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java @@ -1,15 +1,15 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestNestedIf extends InternalJadxTest { +public class TestNestedIf extends IntegrationTest { public static class TestCls { private boolean a0 = false; diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestSimpleConditions.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestSimpleConditions.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java index 4d501b857..3217d7ee4 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestSimpleConditions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestSimpleConditions extends InternalJadxTest { +public class TestSimpleConditions extends IntegrationTest { public static class TestCls { public boolean test1(boolean[] a) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java index 7530a392d..7f73e6c9d 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -10,7 +10,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -public class TestTernary extends InternalJadxTest { +public class TestTernary extends IntegrationTest { public static class TestCls { public boolean test1(int a) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary2.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java index f8960e73f..d835dcf7a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class TestTernary2 extends InternalJadxTest { +public class TestTernary2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernaryInIf.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernaryInIf.java rename to jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java index 1448df85b..ce4115c60 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernaryInIf.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.conditions; +package jadx.tests.integration.conditions; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestTernaryInIf extends InternalJadxTest { +public class TestTernaryInIf extends IntegrationTest { public static class TestCls { public boolean test1(boolean a, boolean b, boolean c) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers.java b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java similarity index 94% rename from jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers.java rename to jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java index c9c46eccd..33c665c44 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers.java +++ b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.debuginfo; +package jadx.tests.integration.debuginfo; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.codegen.CodeWriter; import jadx.core.dex.attributes.nodes.LineAttrNode; import jadx.core.dex.nodes.ClassNode; @@ -13,7 +13,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -public class TestLineNumbers extends InternalJadxTest { +public class TestLineNumbers extends IntegrationTest { public static class TestCls { int field; diff --git a/jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers2.java b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers2.java rename to jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java index 16b41d272..e7468f0c8 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.debuginfo; +package jadx.tests.integration.debuginfo; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.codegen.CodeWriter; import jadx.core.dex.nodes.ClassNode; @@ -11,7 +11,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class TestLineNumbers2 extends InternalJadxTest { +public class TestLineNumbers2 extends IntegrationTest { public static class TestCls { private WeakReference f; diff --git a/jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums.java b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums.java rename to jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java index 51d89a8ea..4851b91e4 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums.java +++ b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.enums; +package jadx.tests.integration.enums; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsLines; +import static jadx.tests.api.utils.JadxMatchers.containsLines; import static org.junit.Assert.assertThat; -public class TestEnums extends InternalJadxTest { +public class TestEnums extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums2.java b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums2.java rename to jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java index e2d3d7a16..280e7d506 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.enums; +package jadx.tests.integration.enums; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; -import jadx.tests.utils.JadxMatchers; +import jadx.tests.api.utils.JadxMatchers; import org.junit.Test; import static org.junit.Assert.assertThat; -public class TestEnums2 extends InternalJadxTest { +public class TestEnums2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/enums/TestSwitchOverEnum.java b/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java similarity index 75% rename from jadx-core/src/test/java/jadx/tests/internal/enums/TestSwitchOverEnum.java rename to jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java index 7cc1db24c..599eae44e 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/enums/TestSwitchOverEnum.java +++ b/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.enums; +package jadx.tests.integration.enums; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestSwitchOverEnum extends InternalJadxTest { +public class TestSwitchOverEnum extends IntegrationTest { public enum Count { ONE, TWO, THREE diff --git a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics.java rename to jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java index 9098b6ca2..475468112 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.generics; +package jadx.tests.integration.generics; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.List; @@ -10,7 +10,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestGenerics extends InternalJadxTest { +public class TestGenerics extends IntegrationTest { public static class TestCls { class A { diff --git a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics2.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java similarity index 90% rename from jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics2.java rename to jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java index 0eaa5eec4..a79f75f2a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.generics; +package jadx.tests.integration.generics; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.lang.ref.ReferenceQueue; @@ -12,7 +12,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestGenerics2 extends InternalJadxTest { +public class TestGenerics2 extends IntegrationTest { public static class TestCls { private static class ItemReference extends WeakReference { diff --git a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics3.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java similarity index 88% rename from jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics3.java rename to jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java index fe9ff50a9..52d6a8ac6 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.generics; +package jadx.tests.integration.generics; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.List; @@ -10,7 +10,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestGenerics3 extends InternalJadxTest { +public class TestGenerics3 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics4.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics4.java rename to jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java index bb8392726..099fbb198 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.generics; +package jadx.tests.integration.generics; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestGenerics4 extends InternalJadxTest { +public class TestGenerics4 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/inline/TestInline.java rename to jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java index 3d811c80b..eaa147c77 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inline; +package jadx.tests.integration.inline; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestInline extends InternalJadxTest { +public class TestInline extends IntegrationTest { public static class TestCls { public static void main(String[] args) throws Exception { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline2.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/inline/TestInline2.java rename to jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java index efb9734cb..43be62f7f 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.inline; +package jadx.tests.integration.inline; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestInline2 extends InternalJadxTest { +public class TestInline2 extends IntegrationTest { public static class TestCls { public int test() throws InterruptedException { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline3.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/inline/TestInline3.java rename to jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java index 287ad8e4c..a0c24fec2 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inline; +package jadx.tests.integration.inline; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestInline3 extends InternalJadxTest { +public class TestInline3 extends IntegrationTest { public static class TestCls { public TestCls(int b1, int b2) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline6.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/inline/TestInline6.java rename to jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java index a2d370a14..52f198713 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInline6.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inline; +package jadx.tests.integration.inline; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestInline6 extends InternalJadxTest { +public class TestInline6 extends IntegrationTest { public static class TestCls { public void f() { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInlineInLoop.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java similarity index 77% rename from jadx-core/src/test/java/jadx/tests/internal/inline/TestInlineInLoop.java rename to jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java index ce3dbb10e..f7e97fda1 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inline/TestInlineInLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java @@ -1,15 +1,15 @@ -package jadx.tests.internal.inline; +package jadx.tests.integration.inline; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestInlineInLoop extends InternalJadxTest { +public class TestInlineInLoop extends IntegrationTest { public static class TestCls { public static void main(String[] args) throws Exception { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inline/TestSyntheticInline.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java similarity index 89% rename from jadx-core/src/test/java/jadx/tests/internal/inline/TestSyntheticInline.java rename to jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java index dabb908bb..d11b11505 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inline/TestSyntheticInline.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inline; +package jadx.tests.integration.inline; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestSyntheticInline extends InternalJadxTest { +public class TestSyntheticInline extends IntegrationTest { public static class TestCls { private int f; diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java index f19f10e02..d038c4f8c 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.File; @@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestAnonymousClass extends InternalJadxTest { +public class TestAnonymousClass extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass2.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java similarity index 89% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass2.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java index d179b5682..eda2b7de8 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestAnonymousClass2 extends InternalJadxTest { +public class TestAnonymousClass2 extends IntegrationTest { public static class TestCls { public static class Inner { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass3.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass3.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java index e5f1688eb..9073256e2 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestAnonymousClass3 extends InternalJadxTest { +public class TestAnonymousClass3 extends IntegrationTest { public static class TestCls { public static class Inner { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass4.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java similarity index 77% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass4.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java index 97b74e6de..4ba19cbdb 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java @@ -1,15 +1,15 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestAnonymousClass4 extends InternalJadxTest { +public class TestAnonymousClass4 extends IntegrationTest { public static class TestCls { public static class Inner { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java index d279b0494..60ee2d975 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestInnerClass extends InternalJadxTest { +public class TestInnerClass extends IntegrationTest { public static class TestCls { public class Inner { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass2.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass2.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java index 4a7ac9590..e42594ab4 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.Timer; @@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestInnerClass2 extends InternalJadxTest { +public class TestInnerClass2 extends IntegrationTest { public static class TestCls { private static class TerminateTask extends TimerTask { diff --git a/jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass3.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass3.java rename to jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java index b7ad2dcb5..7bd2b6116 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.inner; +package jadx.tests.integration.inner; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestInnerClass3 extends InternalJadxTest { +public class TestInnerClass3 extends IntegrationTest { public static class TestCls { private String c; diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java similarity index 73% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java index 556d389d8..263b8d49c 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsLines; +import static jadx.tests.api.utils.JadxMatchers.containsLines; import static org.junit.Assert.assertThat; -public class TestArrayForEach extends InternalJadxTest { +public class TestArrayForEach extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java similarity index 78% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach2.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java index c029a84a3..8934e21b8 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsLines; +import static jadx.tests.api.utils.JadxMatchers.containsLines; import static org.junit.Assert.assertThat; -public class TestArrayForEach2 extends InternalJadxTest { +public class TestArrayForEach2 extends IntegrationTest { public static class TestCls { private void test(String str) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEachNegative.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java similarity index 88% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEachNegative.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java index f9884e2c1..d3589a91a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEachNegative.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestArrayForEachNegative extends InternalJadxTest { +public class TestArrayForEachNegative extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestBreakInLoop.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java similarity index 75% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestBreakInLoop.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java index 4a86dbb40..68f868304 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestBreakInLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java @@ -1,15 +1,15 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestBreakInLoop extends InternalJadxTest { +public class TestBreakInLoop extends IntegrationTest { public static class TestCls { private int f; diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestIndexForLoop.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java similarity index 74% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestIndexForLoop.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java index 2fb6fb72a..16f16eeb8 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestIndexForLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsLines; +import static jadx.tests.api.utils.JadxMatchers.containsLines; import static org.junit.Assert.assertThat; -public class TestIndexForLoop extends InternalJadxTest { +public class TestIndexForLoop extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java similarity index 76% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java index ca44a1b24..dc0b97226 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsLines; +import static jadx.tests.api.utils.JadxMatchers.containsLines; import static org.junit.Assert.assertThat; -public class TestIterableForEach extends InternalJadxTest { +public class TestIterableForEach extends IntegrationTest { public static class TestCls { private String test(Iterable a) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach2.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java index 905818c10..3395961ba 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.IOException; @@ -8,10 +8,10 @@ import java.util.List; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestIterableForEach2 extends InternalJadxTest { +public class TestIterableForEach2 extends IntegrationTest { public static class TestCls { public static String test(final Service service) throws IOException { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java index b944af4fe..e0a4341de 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopCondition extends InternalJadxTest { +public class TestLoopCondition extends IntegrationTest { public static class TestCls { public String f; diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java similarity index 75% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition2.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java index 40a6597dd..e9c432953 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopCondition2 extends InternalJadxTest { +public class TestLoopCondition2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition3.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition3.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java index 7f8c2511a..517100f51 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopCondition3 extends InternalJadxTest { +public class TestLoopCondition3 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition4.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition4.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java index 7c2278bcc..20d77368f 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopCondition4 extends InternalJadxTest { +public class TestLoopCondition4 extends IntegrationTest { public static class TestCls { public static void test() { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopConditionInvoke.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopConditionInvoke.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java index 7f678eb2f..a30f62cd2 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopConditionInvoke.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopConditionInvoke extends InternalJadxTest { +public class TestLoopConditionInvoke extends IntegrationTest { public static class TestCls { private static final char STOP_CHAR = 0; diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java index db17c0c8e..47d0c88ae 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestLoopDetection extends InternalJadxTest { +public class TestLoopDetection extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection2.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java index 6572408ff..0bbf034e9 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestLoopDetection2 extends InternalJadxTest { +public class TestLoopDetection2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection3.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java similarity index 85% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection3.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java index 444b90814..f65755784 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestLoopDetection3 extends InternalJadxTest { +public class TestLoopDetection3 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection4.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection4.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java index a4019f242..13e89ad7f 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.Iterator; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopDetection4 extends InternalJadxTest { +public class TestLoopDetection4 extends IntegrationTest { public static class TestCls { private Iterator iterator; diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java index feb9a4f1d..bc954d25a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.List; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestNestedLoops extends InternalJadxTest { +public class TestNestedLoops extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java similarity index 77% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops2.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java index 2de1e9a1b..008c0b566 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.util.List; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestNestedLoops2 extends InternalJadxTest { +public class TestNestedLoops2 extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/loops/TestSequentialLoops.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java similarity index 75% rename from jadx-core/src/test/java/jadx/tests/internal/loops/TestSequentialLoops.java rename to jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java index 6db1e1c98..4fd4ddaf0 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/loops/TestSequentialLoops.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java @@ -1,17 +1,17 @@ -package jadx.tests.internal.loops; +package jadx.tests.integration.loops; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestSequentialLoops extends InternalJadxTest { +public class TestSequentialLoops extends IntegrationTest { public static class TestCls { public int test7(int a, int b) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/names/TestSameMethodsNames.java b/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java similarity index 73% rename from jadx-core/src/test/java/jadx/tests/internal/names/TestSameMethodsNames.java rename to jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java index bf7f98526..c50ea1b1b 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/names/TestSameMethodsNames.java +++ b/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.names; +package jadx.tests.integration.names; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestSameMethodsNames extends InternalJadxTest { +public class TestSameMethodsNames extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/others/TestIfInTry.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java similarity index 79% rename from jadx-core/src/test/java/jadx/tests/internal/others/TestIfInTry.java rename to jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java index 8d49e0d16..1e61e896e 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/others/TestIfInTry.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.others; +package jadx.tests.integration.others; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.File; @@ -8,11 +8,11 @@ import java.io.IOException; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestIfInTry extends InternalJadxTest { +public class TestIfInTry extends IntegrationTest { public static class TestCls { private File dir; diff --git a/jadx-core/src/test/java/jadx/tests/internal/others/TestIfTryInCatch.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java similarity index 80% rename from jadx-core/src/test/java/jadx/tests/internal/others/TestIfTryInCatch.java rename to jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java index a1c00b059..1e3a68062 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/others/TestIfTryInCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java @@ -1,15 +1,15 @@ -package jadx.tests.internal.others; +package jadx.tests.integration.others; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestIfTryInCatch extends InternalJadxTest { +public class TestIfTryInCatch extends IntegrationTest { public static class TestCls { private static final String TAG = "TAG"; diff --git a/jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13a.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java similarity index 93% rename from jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13a.java rename to jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java index dbb04c5a6..82a0416cc 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13a.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.others; +package jadx.tests.integration.others; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.lang.reflect.Field; @@ -8,10 +8,10 @@ import java.util.HashMap; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestIssue13a extends InternalJadxTest { +public class TestIssue13a extends IntegrationTest { public static class TestCls { private static final String TAG = "Parcel"; diff --git a/jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13b.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java similarity index 90% rename from jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13b.java rename to jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java index 9c88131fb..b0608323d 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13b.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.others; +package jadx.tests.integration.others; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.File; @@ -11,11 +11,11 @@ import java.util.concurrent.CountDownLatch; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; -import static jadx.tests.utils.JadxMatchers.countString; +import static jadx.tests.api.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.countString; import static org.junit.Assert.assertThat; -public class TestIssue13b extends InternalJadxTest { +public class TestIssue13b extends IntegrationTest { public static class TestCls { diff --git a/jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry.java rename to jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java index b25690cca..0833e8ced 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java @@ -1,14 +1,14 @@ -package jadx.tests.internal.others; +package jadx.tests.integration.others; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopInTry extends InternalJadxTest { +public class TestLoopInTry extends IntegrationTest { public static class TestCls { private static boolean b = true; diff --git a/jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry2.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java similarity index 88% rename from jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry2.java rename to jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java index 27b900c76..aa343bff1 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.others; +package jadx.tests.integration.others; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.nodes.DexNode; import jadx.core.dex.nodes.MethodNode; @@ -14,10 +14,10 @@ import com.android.dex.Code; import com.android.dx.io.instructions.DecodedInstruction; import com.android.dx.io.instructions.ShortArrayCodeInput; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestLoopInTry2 extends InternalJadxTest { +public class TestLoopInTry2 extends IntegrationTest { public static class TestCls { private MethodNode method; diff --git a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitch.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java similarity index 89% rename from jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitch.java rename to jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java index 4ef3c292a..81faafe35 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.switches; +package jadx.tests.integration.switches; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -public class TestSwitch extends InternalJadxTest { +public class TestSwitch extends IntegrationTest { public static class TestCls { public String escape(String str) { int len = str.length(); diff --git a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchLabels.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java similarity index 88% rename from jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchLabels.java rename to jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java index 4a4d60184..9b569d3a2 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchLabels.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.switches; +package jadx.tests.integration.switches; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestSwitchLabels extends InternalJadxTest { +public class TestSwitchLabels extends IntegrationTest { public static class TestCls { public static final int CONST_ABC = 0xABC; public static final int CONST_CDE = 0xCDE; diff --git a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchNoDefault.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchNoDefault.java rename to jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java index 89f8cd979..a56ccd3f8 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchNoDefault.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java @@ -1,13 +1,13 @@ -package jadx.tests.internal.switches; +package jadx.tests.integration.switches; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; import static org.junit.Assert.assertEquals; -public class TestSwitchNoDefault extends InternalJadxTest { +public class TestSwitchNoDefault extends IntegrationTest { public static class TestCls { public void test(int a) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchSimple.java b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java similarity index 88% rename from jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchSimple.java rename to jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java index 6f588dd43..c8903e55b 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchSimple.java +++ b/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.switches; +package jadx.tests.integration.switches; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -10,7 +10,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -public class TestSwitchSimple extends InternalJadxTest { +public class TestSwitchSimple extends IntegrationTest { public static class TestCls { public void test(int a) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized.java b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized.java rename to jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java index e42606d18..e18b8cc38 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized.java +++ b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.synchronize; +package jadx.tests.integration.synchronize; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestSynchronized extends InternalJadxTest { +public class TestSynchronized extends IntegrationTest { public static class TestCls { public boolean f = false; diff --git a/jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized2.java b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized2.java rename to jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java index 560cfdfab..b984c658f 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.synchronize; +package jadx.tests.integration.synchronize; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestSynchronized2 extends InternalJadxTest { +public class TestSynchronized2 extends IntegrationTest { public static class TestCls { private static synchronized boolean test(Object obj) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestInlineInCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestInlineInCatch.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java index bb3661d50..63214c1c7 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestInlineInCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.File; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.junit.Assert.assertThat; -public class TestInlineInCatch extends InternalJadxTest { +public class TestInlineInCatch extends IntegrationTest { public static class TestCls { private File dir; diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestNestedTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestNestedTryCatch.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java index d02b84336..13f452b9e 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestNestedTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestNestedTryCatch extends InternalJadxTest { +public class TestNestedTryCatch extends IntegrationTest { public static class TestCls { private void f() { @@ -21,7 +21,7 @@ public class TestNestedTryCatch extends InternalJadxTest { } } catch (Exception e) { } - + return; } } diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java index 3f72a45d7..a12009ff6 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestTryCatch extends InternalJadxTest { +public class TestTryCatch extends IntegrationTest { public static class TestCls { private void f() { diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch2.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java similarity index 87% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch2.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java index b54d535f4..031f9bf20 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestTryCatch2 extends InternalJadxTest { +public class TestTryCatch2 extends IntegrationTest { public static class TestCls { private final static Object obj = new Object(); diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch3.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java similarity index 86% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch3.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java index 8e2025739..6a05b2e45 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestTryCatch3 extends InternalJadxTest { +public class TestTryCatch3 extends IntegrationTest { public static class TestCls { private final static Object obj = new Object(); diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch4.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java similarity index 90% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch4.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java index 44de0f7c0..5b5851d08 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.File; @@ -13,7 +13,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestTryCatch4 extends InternalJadxTest { +public class TestTryCatch4 extends IntegrationTest { public static class TestCls { private Object test(Object obj) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch5.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java similarity index 89% rename from jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch5.java rename to jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java index 861c3d9cf..3e60caae7 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch5.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.trycatch; +package jadx.tests.integration.trycatch; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.io.File; @@ -12,7 +12,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestTryCatch5 extends InternalJadxTest { +public class TestTryCatch5 extends IntegrationTest { public static class TestCls { private Object test(Object obj) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/types/TestTypeResolver.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/types/TestTypeResolver.java rename to jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java index 5cc838442..f4751f246 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/types/TestTypeResolver.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.types; +package jadx.tests.integration.types; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestTypeResolver extends InternalJadxTest { +public class TestTypeResolver extends IntegrationTest { public static class TestCls { public TestCls(int b1, int b2) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/usethis/TestInlineThis.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/usethis/TestInlineThis.java rename to jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java index 1cec1077b..43eb493b6 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/usethis/TestInlineThis.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java @@ -1,16 +1,16 @@ -package jadx.tests.internal.usethis; +package jadx.tests.integration.usethis; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestInlineThis extends InternalJadxTest { +public class TestInlineThis extends IntegrationTest { public static class TestCls { public int field; diff --git a/jadx-core/src/test/java/jadx/tests/internal/usethis/TestRedundantThis.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/usethis/TestRedundantThis.java rename to jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java index 8c7a45c6e..9b19d9256 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/usethis/TestRedundantThis.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java @@ -1,13 +1,13 @@ -package jadx.tests.internal.usethis; +package jadx.tests.integration.usethis; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestRedundantThis extends InternalJadxTest { +public class TestRedundantThis extends IntegrationTest { public static class TestCls { public int field1 = 1; diff --git a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables2.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java similarity index 81% rename from jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables2.java rename to jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java index 1140f014e..37ea25148 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.variables; +package jadx.tests.integration.variables; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestVariables2 extends InternalJadxTest { +public class TestVariables2 extends IntegrationTest { public static class TestCls { Object test(Object s) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables3.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java similarity index 84% rename from jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables3.java rename to jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java index 3ccb9ca40..8843e9731 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.variables; +package jadx.tests.integration.variables; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestVariables3 extends InternalJadxTest { +public class TestVariables3 extends IntegrationTest { public static class TestCls { String test(Object s) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables4.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java similarity index 93% rename from jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables4.java rename to jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java index 387f1fea0..39637c34a 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.variables; +package jadx.tests.integration.variables; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import java.lang.reflect.InvocationTargetException; @@ -11,7 +11,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -public class TestVariables4 extends InternalJadxTest { +public class TestVariables4 extends IntegrationTest { public static class TestCls { private static boolean runTest(String clsName) { diff --git a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariablesDefinitions.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java similarity index 82% rename from jadx-core/src/test/java/jadx/tests/internal/variables/TestVariablesDefinitions.java rename to jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java index b3bb34c4e..8539541cc 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/variables/TestVariablesDefinitions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java @@ -1,6 +1,6 @@ -package jadx.tests.internal.variables; +package jadx.tests.integration.variables; -import jadx.api.InternalJadxTest; +import jadx.tests.api.IntegrationTest; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.IDexTreeVisitor; @@ -10,12 +10,12 @@ import java.util.List; import org.junit.Test; import org.slf4j.Logger; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -public class TestVariablesDefinitions extends InternalJadxTest { +public class TestVariablesDefinitions extends IntegrationTest { public static class TestCls { private static Logger LOG; diff --git a/jadx-core/src/test/java/jadx/tests/smali/TestConstructor.java b/jadx-core/src/test/java/jadx/tests/smali/TestConstructor.java index 398939096..84ff76c5f 100644 --- a/jadx-core/src/test/java/jadx/tests/smali/TestConstructor.java +++ b/jadx-core/src/test/java/jadx/tests/smali/TestConstructor.java @@ -1,11 +1,11 @@ package jadx.tests.smali; -import jadx.api.SmaliTest; +import jadx.tests.api.SmaliTest; import jadx.core.dex.nodes.ClassNode; import org.junit.Test; -import static jadx.tests.utils.JadxMatchers.containsOne; +import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat;