test: migrate to JUnit 5 (PR #493)

build.gradle

@@ -38,10 +38,16 @@ allprojects {
         compile 'org.slf4j:slf4j-api:1.7.26'
 
         testCompile 'ch.qos.logback:logback-classic:1.2.3'
-        testCompile 'junit:junit:4.12'
         testCompile 'org.hamcrest:hamcrest-library:2.1'
         testCompile 'org.mockito:mockito-core:2.25.0'
         testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
+
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.1'
+        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.1'
+    }
+
+    test {
+        useJUnitPlatform()
     }
 
     repositories {

jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java

@@ -1,6 +1,6 @@
 package jadx.cli;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -1,6 +1,6 @@
 package jadx.api;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -2,13 +2,13 @@ package jadx.api;
 
 import java.io.File;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class JadxDecompilerTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testExampleUsage() {
 		JadxArgs args = new JadxArgs();
 		args.getInputFiles().add(new File("test.apk"));

jadx-core/src/test/java/jadx/core/deobf/NameMapperTest.java

@@ -1,6 +1,6 @@
 package jadx.core.deobf;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static jadx.core.deobf.NameMapper.isValidIdentifier;
 import static jadx.core.deobf.NameMapper.removeInvalidChars;

jadx-core/src/test/java/jadx/core/dex/info/AccessInfoTest.java

@@ -1,7 +1,7 @@
 package jadx.core.dex.info;
 
 import com.android.dx.rop.code.AccessFlags;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.info.AccessInfo.AFType;
 

jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java

@@ -1,16 +1,5 @@
 package jadx.tests.functional;
 
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import jadx.core.clsp.ClspGraph;
-import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.nodes.DexNode;
-import jadx.core.dex.nodes.RootNode;
-import jadx.core.utils.exceptions.DecodeException;
-
 import static jadx.core.dex.instructions.args.ArgType.STRING;
 import static jadx.core.dex.instructions.args.ArgType.object;
 import static org.junit.Assert.assertFalse;
@@ -18,6 +7,17 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.io.IOException;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jadx.core.clsp.ClspGraph;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.utils.exceptions.DecodeException;
+
 public class JadxClasspathTest {
 
 	private static final String JAVA_LANG_EXCEPTION = "java.lang.Exception";
@@ -26,7 +26,7 @@ public class JadxClasspathTest {
 	private DexNode dex;
 	private ClspGraph clsp;
 
-	@Before
+	@BeforeEach
 	public void initClsp() throws IOException, DecodeException {
 		clsp = new ClspGraph();
 		clsp.load();

jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java

@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jadx-core/src/test/java/jadx/tests/functional/TemplateFileTest.java

@@ -1,6 +1,6 @@
 package jadx.tests.functional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.export.TemplateFile;
 

jadx-core/src/test/java/jadx/tests/functional/TestIfCondition.java

@@ -1,6 +1,6 @@
 package jadx.tests.functional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.instructions.IfNode;
 import jadx.core.dex.instructions.IfOp;

jadx-core/src/test/java/jadx/tests/functional/TypeMergeTest.java

@@ -1,17 +1,5 @@
 package jadx.tests.functional;
 
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import jadx.core.clsp.ClspGraph;
-import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.instructions.args.PrimitiveType;
-import jadx.core.dex.nodes.DexNode;
-import jadx.core.dex.nodes.RootNode;
-import jadx.core.utils.exceptions.DecodeException;
-
 import static jadx.core.dex.instructions.args.ArgType.BOOLEAN;
 import static jadx.core.dex.instructions.args.ArgType.BYTE;
 import static jadx.core.dex.instructions.args.ArgType.CHAR;
@@ -32,11 +20,23 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.io.IOException;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jadx.core.clsp.ClspGraph;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.PrimitiveType;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.utils.exceptions.DecodeException;
+
 public class TypeMergeTest {
 
 	private DexNode dex;
 
-	@Before
+	@BeforeEach
 	public void initClsp() throws IOException, DecodeException {
 		ClspGraph clsp = new ClspGraph();
 		clsp.load();

jadx-core/src/test/java/jadx/tests/integration/SimplifyVisitorStringBuilderTest.java

@@ -4,7 +4,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.visitors.SimplifyVisitor;
 import jadx.core.utils.exceptions.JadxException;
 import jadx.tests.api.IntegrationTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -2,7 +2,7 @@ package jadx.tests.integration;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.args.InsnWrapArg;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.annotations;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -5,7 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -5,7 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arith/TestArithConst.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.SmaliTest;

jadx-core/src/test/java/jadx/tests/integration/arith/TestArithNot.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.SmaliTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement3.java

@@ -2,7 +2,7 @@ package jadx.tests.integration.arith;
 
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillConstReplace.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays2.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays3.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays4.java

@@ -4,7 +4,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.SmaliTest;
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static org.junit.Assert.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestArrays4 extends SmaliTest {
 

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.SmaliTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions16.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -3,7 +3,7 @@ package jadx.tests.integration.conditions;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -2,7 +2,7 @@ package jadx.tests.integration.conditions;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf2.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary3.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.Named;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.conditions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.debuginfo;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.codegen.CodeWriter;
 import jadx.core.dex.attributes.nodes.LineAttrNode;

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

@@ -3,7 +3,7 @@ package jadx.tests.integration.debuginfo;
 import java.lang.ref.WeakReference;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.codegen.CodeWriter;
 import jadx.core.dex.nodes.ClassNode;

jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestReturnSourceLine.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.debuginfo;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.codegen.CodeWriter;
 import jadx.core.dex.attributes.nodes.LineAttrNode;

jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestVariablesNames.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.debuginfo;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.SmaliTest;

jadx-core/src/test/java/jadx/tests/integration/deobf/TestMthRename.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.deobf;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums3.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums4.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsInterface.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithConsts.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum2.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.enums;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackMode.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.fallback;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -2,7 +2,7 @@ package jadx.tests.integration.generics;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -4,7 +4,7 @@ import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -2,7 +2,7 @@ package jadx.tests.integration.generics;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.generics;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics6.java

@@ -2,7 +2,7 @@ package jadx.tests.integration.generics;
 
 import java.util.Collection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java

@@ -4,7 +4,7 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java

@@ -3,7 +3,7 @@ package jadx.tests.integration.inline;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline2.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inline;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

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

@@ -3,7 +3,7 @@ package jadx.tests.integration.inner;
 import java.io.File;
 import java.io.FilenameFilter;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass10.java

@@ -2,7 +2,7 @@ package jadx.tests.integration.inner;
 
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass11.java

@@ -2,7 +2,7 @@ package jadx.tests.integration.inner;
 
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;

jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java

@@ -1,6 +1,6 @@
 package jadx.tests.integration.inner;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;