Fix missing junit4 leftovers

Author: eddumelendez

modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java

@@ -17,7 +17,7 @@
 import java.util.EnumSet;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeFalse;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 @ParameterizedClass
 @MethodSource("data")
@@ -207,7 +207,7 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
     }
 
     private void performTestForCustomIniFile(HikariDataSource dataSource) throws SQLException {
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
+        assumeThat(SystemUtils.IS_OS_WINDOWS).isFalse();
         Statement statement = dataSource.getConnection().createStatement();
         statement.execute("SELECT @@GLOBAL.innodb_max_undo_log_size");
         ResultSet resultSet = statement.getResultSet();

modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java

@@ -1,13 +1,13 @@
 package org.testcontainers.junit.jupiter;
 
-import org.junit.AssumptionViolatedException;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.opentest4j.TestAbortedException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 // The order of @ExtendsWith and @Testcontainers is crucial in order for the tests
 @Testcontainers
@@ -24,14 +24,14 @@ class TestLifecycleAwareExceptionCapturingTest {
     void failing_test_should_pass_throwable_to_testContainer() {
         startedTestContainer = testContainer;
         // Force an exception that is captured by the test container without failing the test itself
-        assumeTrue(false);
+        assumeThat(false).isTrue();
     }
 
     @Test
     @Order(2)
     void should_have_captured_thrownException() {
         Throwable capturedThrowable = startedTestContainer.getCapturedThrowable();
-        assertThat(capturedThrowable).isInstanceOf(AssumptionViolatedException.class);
-        assertThat(capturedThrowable.getMessage()).isEqualTo("got: <false>, expected: is <true>");
+        assertThat(capturedThrowable).isInstanceOf(TestAbortedException.class);
+        assertThat(capturedThrowable.getMessage()).contains("Expecting value to be true but was false");
     }
 }

modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java

@@ -19,7 +19,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
-import static org.junit.Assume.assumeFalse;
 
 class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
@@ -58,7 +57,7 @@ void testSpecificVersion() throws SQLException {
 
     @Test
     void testMariaDBWithCustomIniFile() throws SQLException {
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
+        assumeThat(SystemUtils.IS_OS_WINDOWS).isFalse();
 
         try (
             MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(

modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java

@@ -1,20 +1,10 @@
 package org.testcontainers.containers;
 
-import org.junit.runner.Description;
 import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
 
 import java.io.File;
 
 public interface RecordingFileFactory {
-    @Deprecated
-    default File recordingFileForTest(File vncRecordingDirectory, Description description, boolean succeeded) {
-        return recordingFileForTest(
-            vncRecordingDirectory,
-            description.getTestClass().getSimpleName() + "-" + description.getMethodName(),
-            succeeded
-        );
-    }
-
     default File recordingFileForTest(
         File vncRecordingDirectory,
         String prefix,

modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java

@@ -1,10 +1,10 @@
 package org.testcontainers.containers;
 
 import lombok.Value;
-import org.junit.Test;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -17,9 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("data")
 @Value
-public class DefaultRecordingFileFactoryTest {
+class DefaultRecordingFileFactoryTest {
 
     private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("YYYYMMdd-HHmmss");
 
@@ -31,7 +32,6 @@ public class DefaultRecordingFileFactoryTest {
 
     private final boolean success;
 
-    @Parameterized.Parameters
     public static Collection<Object[]> data() {
         Collection<Object[]> args = new ArrayList<>();
         args.add(new Object[] { "testMethod1", "FAILED", Boolean.FALSE });
@@ -40,13 +40,10 @@ public static Collection<Object[]> data() {
     }
 
     @Test
-    public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime() throws Exception {
+    public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime(TestInfo testInfo) throws Exception {
         File vncRecordingDirectory = Files.createTempDirectory("recording").toFile();
-        Description description = Description.createTestDescription(
-            getClass().getCanonicalName(),
-            methodName,
-            Test.class
-        );
+        String className = testInfo.getTestClass().orElseThrow(IllegalStateException::new).getSimpleName();
+        String description = className + "-" + methodName;
 
         File recordingFile = factory.recordingFileForTest(vncRecordingDirectory, description, success);