Bump testcontainers to 1.18.0

Author: ArtDu

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 - Fix problem if topology isn't applied correctly
+- Bump testcontainers to 1.18.0
 
 ## [0.5.4] - 2023-03-31
 - Use tarantool image as base instead of centos in cartridge container

pom.xml

@@ -53,7 +53,7 @@
     </scm>
 
     <properties>
-        <testcontainers.version>1.17.4</testcontainers.version>
+        <testcontainers.version>1.18.0</testcontainers.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
@@ -103,6 +103,12 @@
             <version>1.3.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter</artifactId>
+          <version>5.8.1</version>
+          <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>

src/test/java/org/testcontainers/containers/CartridgeContainerTestUtils.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Vladimir Rogach

src/test/java/org/testcontainers/containers/PathUtilsTest.java

@@ -1,8 +1,8 @@
 package org.testcontainers.containers;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.testcontainers.containers.PathUtils.normalizePath;
 
 /**
@@ -14,24 +14,24 @@ class PathUtilsTest {
 
     @Test
     void normalizePathTest() {
-        Assertions.assertEquals("c:/work/server.lua",
+        assertEquals("c:/work/server.lua",
                 normalizePath("c:/work/server.lua"));
 
-        Assertions.assertEquals("c:/work/server.lua",
+        assertEquals("c:/work/server.lua",
                 normalizePath("/c:/work/server.lua"));
 
-        Assertions.assertEquals("c:/work/server.lua",
+        assertEquals("c:/work/server.lua",
                 normalizePath("/c:\\work\\server.lua"));
 
-        Assertions.assertEquals("c:/work/server.lua",
+        assertEquals("c:/work/server.lua",
                 normalizePath("c:\\work\\server.lua"));
 
-        Assertions.assertEquals("c:/", normalizePath("c:\\"));
+        assertEquals("c:/", normalizePath("c:\\"));
 
-        Assertions.assertEquals("/dummy", normalizePath("/dummy"));
+        assertEquals("/dummy", normalizePath("/dummy"));
 
-        Assertions.assertEquals("/c", normalizePath("/c"));
+        assertEquals("/c", normalizePath("/c"));
 
-        Assertions.assertThrows(NullPointerException.class, () -> normalizePath((String) null));
+        assertThrows(NullPointerException.class, () -> normalizePath((String) null));
     }
 }

src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlTest.java

@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -11,6 +10,8 @@
 import java.time.Duration;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author Alexey Kuzin
  */
@@ -37,6 +38,6 @@ public void test_StaticClusterContainer_StartsSuccessfully_ifFilesAreCopied() th
     @Test
     public void test_migrator_executesOk() throws Exception {
         List<?> result = container.executeCommand("return require('migrator').up()").get();
-        Assertions.assertEquals("001_ddl.lua", ((List<?>)result.get(0)).get(0));
+        assertEquals("001_ddl.lua", ((List<?>)result.get(0)).get(0));
     }
 }

src/test/java/org/testcontainers/containers/TarantoolContainerTest.java

@@ -1,10 +1,9 @@
 package org.testcontainers.containers;
 
-import org.junit.jupiter.api.Test;
-
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Alexey Kuzin
@@ -48,4 +47,4 @@ public void testContainerWithParameters() throws Exception {
             assertEquals(result.get(0), 5);
         }
     }
-}
+}

src/test/java/org/testcontainers/containers/TarantoolSdkContainerTestEnterprise.java

@@ -6,15 +6,17 @@
 import io.tarantool.driver.api.TarantoolClientFactory;
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author Oleg Kuznetsov
  */
@@ -44,8 +46,8 @@ void test_should_createTarantoolContainerFromSdk() throws URISyntaxException {
             final List<?> result = client.eval("return 'test'").join();
             final TarantoolVersion version = client.getVersion();
 
-            Assertions.assertEquals("test", result.get(0));
-            Assertions.assertTrue(version.toString().startsWith("Tarantool 2.7.3 (Binary)"));
+            assertEquals("test", result.get(0));
+            assertTrue(version.toString().startsWith("Tarantool 2.7.3 (Binary)"));
         }
     }
 }

src/test/java/org/testcontainers/containers/TarantoolStaticContainerTest.java

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Alexey Kuzin