core tests: organize directories

jadx-core/src/test/java/jadx/api/JadxInternalAccess.java

+package jadx.api;
+
+import jadx.core.dex.nodes.RootNode;
+
+public class JadxInternalAccess {
+
+	public static RootNode getRoot(JadxDecompiler d) {
+		return d.getRoot();
+	}
+}

jadx-core/src/test/java/jadx/api/InternalJadxTest.java → jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java

-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);
 

jadx-core/src/test/java/jadx/api/SmaliTest.java → jadx-core/src/test/java/jadx/tests/api/SmaliTest.java

-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";

jadx-core/src/test/java/jadx/tests/utils/CountString.java → jadx-core/src/test/java/jadx/tests/api/utils/CountString.java

-package jadx.tests.utils;
-
-import jadx.api.TestUtils;
+package jadx.tests.api.utils;
 
 import org.hamcrest.Description;
 import org.hamcrest.core.SubstringMatcher;

jadx-core/src/test/java/jadx/tests/utils/JadxMatchers.java → jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java

-package jadx.tests.utils;
+package jadx.tests.api.utils;
 
-import jadx.api.TestUtils;
 import jadx.core.codegen.CodeWriter;
 
 import org.hamcrest.Matcher;

jadx-core/src/test/java/jadx/api/TestUtils.java → jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java

-package jadx.api;
+package jadx.tests.api.utils;
 
 import jadx.core.codegen.CodeWriter;
 

jadx-core/src/test/java/jadx/tests/internal/TestArgInline.java → jadx-core/src/test/java/jadx/tests/integration/TestArgInline.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/TestClassGen.java → jadx-core/src/test/java/jadx/tests/integration/TestClassGen.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java → jadx-core/src/test/java/jadx/tests/integration/TestDuplicateCast.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/TestFloatValue.java → jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java

-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() {

jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java → jadx-core/src/test/java/jadx/tests/integration/TestRedundantBrackets.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/TestRedundantReturn.java → jadx-core/src/test/java/jadx/tests/integration/TestRedundantReturn.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/TestReturnWrapping.java → jadx-core/src/test/java/jadx/tests/integration/TestReturnWrapping.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/TestStaticFieldsInit.java → jadx-core/src/test/java/jadx/tests/integration/TestStaticFieldsInit.java

-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";

jadx-core/src/test/java/jadx/tests/internal/TestStaticMethod.java → jadx-core/src/test/java/jadx/tests/integration/TestStaticMethod.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java → jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination.java

-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;

jadx-core/src/test/java/jadx/tests/internal/TestWrongCode.java → jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java

-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() {

jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations.java → jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/annotations/TestAnnotations2.java → jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/annotations/TestParamAnnotations.java → jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/annotations/TestVarArgAnnotation.java → jadx-core/src/test/java/jadx/tests/integration/annotations/TestVarArgAnnotation.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/arith/TestArith.java → jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/arith/TestArith2.java → jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement.java → jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java

-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;

jadx-core/src/test/java/jadx/tests/internal/arith/TestFieldIncrement2.java → jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java

-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;

jadx-core/src/test/java/jadx/tests/internal/arith/TestSpecialValues.java → jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill.java → jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/arrays/TestArrayFill2.java → jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestCmpOp2.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions10.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions11.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions12.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java

-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;

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions13.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java

-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;

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions14.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions15.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions2.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java

-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;

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions3.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java

-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}");

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions4.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions5.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions6.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java

-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<String> l1, List<String> l2) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions7.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions8.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java

-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;

jadx-core/src/test/java/jadx/tests/internal/conditions/TestConditions9.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestElseIf.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestNestedIf.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java

-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;

jadx-core/src/test/java/jadx/tests/internal/conditions/TestSimpleConditions.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernary2.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/conditions/TestTernaryInIf.java → jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers.java → jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java

-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;

jadx-core/src/test/java/jadx/tests/internal/debuginfo/TestLineNumbers2.java → jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java

-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<TestCls> f;

jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums.java → jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/enums/TestEnums2.java → jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/enums/TestSwitchOverEnum.java → jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java

-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

jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics.java → jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics2.java → jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java

-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<V> extends WeakReference<V> {

jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics3.java → jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics4.java → jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/inline/TestInline.java → jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inline/TestInline2.java → jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inline/TestInline3.java → jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/inline/TestInline6.java → jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java

-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() {

jadx-core/src/test/java/jadx/tests/internal/inline/TestInlineInLoop.java → jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inline/TestSyntheticInline.java → jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java

-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;

jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass2.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass3.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inner/TestAnonymousClass4.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass2.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/inner/TestInnerClass3.java → jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java

-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;

jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEach2.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/loops/TestArrayForEachNegative.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestBreakInLoop.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java

-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;

jadx-core/src/test/java/jadx/tests/internal/loops/TestIndexForLoop.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java

-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<String> a) {

jadx-core/src/test/java/jadx/tests/internal/loops/TestIterableForEach2.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java

-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 {

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java

-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;

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition2.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition3.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopCondition4.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java

-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() {

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopConditionInvoke.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java

-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;

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection2.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection3.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestLoopDetection4.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java

-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<String> iterator;

jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestNestedLoops2.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/loops/TestSequentialLoops.java → jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/names/TestSameMethodsNames.java → jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java

-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<V> {
 

jadx-core/src/test/java/jadx/tests/internal/others/TestIfInTry.java → jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java

-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;

jadx-core/src/test/java/jadx/tests/internal/others/TestIfTryInCatch.java → jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java

-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";

jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13a.java → jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java

-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";

jadx-core/src/test/java/jadx/tests/internal/others/TestIssue13b.java → jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java

-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 {
 

jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry.java → jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java

-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;

jadx-core/src/test/java/jadx/tests/internal/others/TestLoopInTry2.java → jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java

-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;

jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitch.java → jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java

-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();

jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchLabels.java → jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java

-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;

jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchNoDefault.java → jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/switches/TestSwitchSimple.java → jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized.java → jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java

-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;

jadx-core/src/test/java/jadx/tests/internal/synchronize/TestSynchronized2.java → jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestInlineInCatch.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java

-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;

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestNestedTryCatch.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java

-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;
 		}
 	}

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java

-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() {

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch2.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java

-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();

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch3.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch3.java

-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();

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch4.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/trycatch/TestTryCatch5.java → jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch5.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/types/TestTypeResolver.java → jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/usethis/TestInlineThis.java → jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java

-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;

jadx-core/src/test/java/jadx/tests/internal/usethis/TestRedundantThis.java → jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java

-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;

jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables2.java → jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables3.java → jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/variables/TestVariables4.java → jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java

-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) {

jadx-core/src/test/java/jadx/tests/internal/variables/TestVariablesDefinitions.java → jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java

-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;

jadx-core/src/test/java/jadx/tests/smali/TestConstructor.java

 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;