test: migrate all assertions to JUnit5 (PR #496)

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

@@ -5,7 +5,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class JadxCLIArgsTest {
 

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

@@ -8,7 +8,7 @@ import jadx.core.utils.files.FileUtils;
 
 import static jadx.core.utils.files.FileUtils.toFile;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class JadxArgsValidatorOutDirsTest {
 

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

@@ -6,7 +6,7 @@ import static jadx.core.deobf.NameMapper.isValidIdentifier;
 import static jadx.core.deobf.NameMapper.removeInvalidChars;
 import static jadx.core.deobf.NameMapper.removeInvalidCharsMiddle;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class NameMapperTest {
 

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

@@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test;
 import jadx.core.dex.info.AccessInfo.AFType;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class AccessInfoTest {
 

jadx-core/src/test/java/jadx/tests/TestsTest.java

+package jadx.tests;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+public class TestsTest {
+
+	@Test
+	public void noJUnit4Asssertions() throws IOException {
+		noJUnit4Asssertions(".");
+		noJUnit4Asssertions("../jadx-cli");
+		noJUnit4Asssertions("../jadx-gui");
+	}
+
+	private void noJUnit4Asssertions(String path) throws IOException {
+		Path dir = Paths.get(path, "src/test/java");
+		assertTrue(Files.exists(dir));
+		Files.walk(dir)
+				.filter(p -> p.getFileName().toString().endsWith(".java")
+						&& !p.getFileName().toString().endsWith(TestsTest.class.getSimpleName() + ".java"))
+				.forEach(p -> {
+					try {
+
+						List<String> lines = Files.readAllLines(p);
+
+						for (String line : lines) {
+							if (line.contains("org.junit.Assert")) {
+								String className = dir.relativize(p).toString();
+								className = className.substring(0, className.length() - ".java".length());
+								className = className.replace(File.separatorChar, '.');
+
+								fail("Test class " + className + " should be migrated to JUnit 5");
+							}
+						}
+					} catch (IOException e) {
+						throw new RuntimeException(e);
+					}
+				});
+	}
+}

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

@@ -40,10 +40,10 @@ import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class IntegrationTest extends TestUtils {
 
@@ -186,11 +186,13 @@ public abstract class IntegrationTest extends TestUtils {
 	}
 
 	protected static void checkCode(ClassNode cls) {
-		assertTrue("Inconsistent cls: " + cls,
-				!cls.contains(AFlag.INCONSISTENT_CODE) && !cls.contains(AType.JADX_ERROR));
+		assertTrue(
+				!cls.contains(AFlag.INCONSISTENT_CODE) && !cls.contains(AType.JADX_ERROR),
+				"Inconsistent cls: " + cls);
 		for (MethodNode mthNode : cls.getMethods()) {
-			assertTrue("Inconsistent method: " + mthNode,
-					!mthNode.contains(AFlag.INCONSISTENT_CODE) && !mthNode.contains(AType.JADX_ERROR));
+			assertTrue(
+					!mthNode.contains(AFlag.INCONSISTENT_CODE) && !mthNode.contains(AType.JADX_ERROR),
+					"Inconsistent method: " + mthNode);
 		}
 		assertThat(cls.getCode().toString(), not(containsString("inconsistent")));
 	}
@@ -266,7 +268,7 @@ public abstract class IntegrationTest extends TestUtils {
 		try {
 			dynamicCompiler = new DynamicCompiler(cls);
 			boolean result = dynamicCompiler.compile();
-			assertTrue("Compilation failed", result);
+			assertTrue(result, "Compilation failed");
 			System.out.println("Compilation: PASSED");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -284,7 +286,7 @@ public abstract class IntegrationTest extends TestUtils {
 	}
 
 	public Method getReflectMethod(String method, Class<?>... types) {
-		assertNotNull("dynamicCompiler not ready", dynamicCompiler);
+		assertNotNull(dynamicCompiler, "dynamicCompiler not ready");
 		try {
 			return dynamicCompiler.getMethod(method, types);
 		} catch (Exception e) {
@@ -295,8 +297,8 @@ public abstract class IntegrationTest extends TestUtils {
 	}
 
 	public Object invoke(Method mth, Object... args) throws Exception {
-		assertNotNull("dynamicCompiler not ready", dynamicCompiler);
-		assertNotNull("unknown method", mth);
+		assertNotNull(dynamicCompiler, "dynamicCompiler not ready");
+		assertNotNull(mth, "unknown method");
 		return dynamicCompiler.invoke(mth, args);
 	}
 

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

 package jadx.tests.api;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,9 +16,6 @@ import org.jf.smali.SmaliOptions;
 import jadx.api.JadxDecompiler;
 import jadx.core.dex.nodes.ClassNode;
 
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
 public abstract class SmaliTest extends IntegrationTest {
 
 	private static final String SMALI_TESTS_PROJECT = "jadx-core";

jadx-core/src/test/java/jadx/tests/external/BaseExternalTest.java

@@ -26,7 +26,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public abstract class BaseExternalTest extends IntegrationTest {
 	private static final Logger LOG = LoggerFactory.getLogger(BaseExternalTest.class);

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

@@ -2,8 +2,8 @@ package jadx.tests.functional;
 
 import static jadx.core.dex.instructions.args.ArgType.STRING;
 import static jadx.core.dex.instructions.args.ArgType.object;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

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

@@ -15,7 +15,7 @@ import jadx.core.dex.visitors.IDexTreeVisitor;
 import jadx.core.dex.visitors.JadxVisitor;
 
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class JadxVisitorsOrderTest {
 

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

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
 import jadx.core.export.TemplateFile;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TemplateFileTest {
 

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

@@ -20,7 +20,7 @@ import static jadx.core.dex.regions.conditions.IfCondition.merge;
 import static jadx.core.dex.regions.conditions.IfCondition.not;
 import static jadx.core.dex.regions.conditions.IfCondition.simplify;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestIfCondition {
 

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

@@ -14,9 +14,9 @@ import static jadx.core.dex.instructions.args.ArgType.array;
 import static jadx.core.dex.instructions.args.ArgType.genericType;
 import static jadx.core.dex.instructions.args.ArgType.object;
 import static jadx.core.dex.instructions.args.ArgType.unknown;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -115,10 +115,10 @@ public class TypeMergeTest {
 		ArgType res = ArgType.merge(dex, t1, t2);
 		String msg = format(t1, t2, exp, res);
 		if (exp == null) {
-			assertNull("Incorrect accept: " + msg, res);
+			assertNull(res, "Incorrect accept: " + msg);
 		} else {
-			assertNotNull("Incorrect reject: " + msg, res);
-			assertTrue("Incorrect result: " + msg, exp.equals(res));
+			assertNotNull(res, "Incorrect reject: " + msg);
+			assertTrue(exp.equals(res), "Incorrect result: " + msg);
 		}
 	}
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test the StringBuilder simplification part of {@link SimplifyVisitor}

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArgInline extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestClassGen extends IntegrationTest {
 

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

@@ -14,9 +14,9 @@ import jadx.tests.api.IntegrationTest;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test duplicate 'check-cast' instruction produced because of bug in javac:

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestFloatValue extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestRedundantBrackets extends IntegrationTest {
 

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

@@ -7,8 +7,8 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class TestRedundantReturn extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestReturnWrapping extends IntegrationTest {
 	public static class TestCls {

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestStaticFieldsInit extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestStaticMethod extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestStringBuilderElimination extends IntegrationTest {
 

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

@@ -9,7 +9,7 @@ import static jadx.tests.api.utils.JadxMatchers.containsLines;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestWrongCode extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestAnnotations extends IntegrationTest {
 

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

@@ -11,7 +11,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestAnnotations2 extends IntegrationTest {
 

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

@@ -11,7 +11,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestParamAnnotations extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArith extends IntegrationTest {
 

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

@@ -5,7 +5,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArith2 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArith3 extends IntegrationTest {
 

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

@@ -6,7 +6,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 static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArithConst extends SmaliTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.SmaliTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArithNot extends SmaliTest {
 	/*

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestFieldIncrement extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestFieldIncrement2 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestFieldIncrement3 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestSpecialValues extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArrayFill extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArrayFill2 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArrayFillConstReplace extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArrays extends IntegrationTest {
 	public static class TestCls {

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArrays2 extends IntegrationTest {
 	public static class TestCls {

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestArrays3 extends IntegrationTest {
 	public static class TestCls {

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

@@ -3,7 +3,7 @@ package jadx.tests.integration.arrays;
 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 static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.jupiter.api.Test;
 
 public class TestArrays4 extends SmaliTest {

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestCmpOp extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestCmpOp2 extends IntegrationTest {
 

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

@@ -6,7 +6,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 static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestComplexIf extends SmaliTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions10 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions11 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions12 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions13 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions14 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions15 extends IntegrationTest {
 

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

@@ -6,9 +6,9 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestConditions16 extends IntegrationTest {
 

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

@@ -10,7 +10,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions3 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions4 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions5 extends IntegrationTest {
 

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

@@ -9,7 +9,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions6 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions7 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions8 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestConditions9 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestElseIf extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static jadx.tests.api.utils.JadxMatchers.countString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestNestedIf extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestNestedIf2 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestSimpleConditions extends IntegrationTest {
 

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

@@ -7,8 +7,8 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestTernary extends IntegrationTest {
 

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

@@ -5,8 +5,8 @@ import org.junit.jupiter.api.Test;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestTernary2 extends IntegrationTest {
 

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

@@ -11,7 +11,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestTernary3 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.tests.api.IntegrationTest;
 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;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestTernaryInIf extends IntegrationTest {
 

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

@@ -10,8 +10,8 @@ import jadx.core.dex.nodes.MethodNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestLineNumbers extends IntegrationTest {
 

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

@@ -9,7 +9,7 @@ import jadx.core.codegen.CodeWriter;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestLineNumbers2 extends IntegrationTest {
 

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

@@ -9,9 +9,9 @@ import jadx.core.dex.nodes.MethodNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestReturnSourceLine extends IntegrationTest {
 

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

@@ -6,7 +6,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 static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestVariablesNames extends SmaliTest {
 /*

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestMthRename extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsLines;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestEnums extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 import jadx.tests.api.utils.JadxMatchers;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestEnums2 extends IntegrationTest {
 

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

@@ -6,8 +6,8 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestEnums3 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestEnums4 extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 import jadx.tests.api.utils.JadxMatchers;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestEnumsInterface extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsLines;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestEnumsWithConsts extends IntegrationTest {
 

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

@@ -6,8 +6,8 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.countString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestSwitchOverEnum extends IntegrationTest {
 

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

@@ -6,8 +6,8 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.countString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestSwitchOverEnum2 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestFallbackMode extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestGenerics extends IntegrationTest {
 

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

@@ -10,7 +10,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestGenerics2 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestGenerics3 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestGenerics4 extends IntegrationTest {
 

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

@@ -8,7 +8,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestGenerics6 extends IntegrationTest {
 

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

@@ -2,7 +2,7 @@ package jadx.tests.integration.generics;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.jupiter.api.Test;
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestInline extends IntegrationTest {
 

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

@@ -6,7 +6,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestInline2 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestInline3 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestInline6 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static jadx.tests.api.utils.JadxMatchers.countString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestInlineInLoop extends IntegrationTest {
 

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

@@ -9,7 +9,7 @@ import jadx.core.dex.nodes.ClassNode;
 import jadx.tests.api.IntegrationTest;
 
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestIssue86 extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestSyntheticInline extends IntegrationTest {
 

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

@@ -7,7 +7,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestSyntheticInline2 extends IntegrationTest {
 

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

@@ -10,7 +10,7 @@ import jadx.tests.api.IntegrationTest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestAnonymousClass extends IntegrationTest {
 

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

@@ -10,7 +10,7 @@ import jadx.tests.api.IntegrationTest;
 import static jadx.tests.api.utils.JadxMatchers.containsOne;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestAnonymousClass10 extends IntegrationTest {