Skip to content

Commit 8e64fc8

Browse files
committed
Remove cartridge-java from dependencies
- Update executeScript and executeCommand methods to execute code viva execInContainer (now it returns yaml string in Container.ExecResult not CompletableFuture). - Remove TarantoolContainer containers with TarantoolClientBuilder parameter. - Remove getClient method from TarantoolContainerClientHelper. - Remove io.tarantool.cartridge-driver dependency. because cartridge-java client was also removed. - Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string. - Add withSsl and withKeyAndCertFiles methods to TarantoolContainer and TarantoolCartridgeContainer. - Rewrite tests and add new cases to support new API. - Update org.yaml.snakeyaml to 2.0 version. Closes #69
1 parent cc3aadc commit 8e64fc8

File tree

6 files changed

+25
-18
lines changed

6 files changed

+25
-18
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [Unreleased]
44
- Fix problem if topology isn't applied correctly
5+
- Bump testcontainers to 1.18.0
56
- **[breaking change]** Update executeScript and executeCommand methods to execute code viva execInContainer
67
(now it returns yaml string in Container.ExecResult not CompletableFuture).
78
- **[breaking change]** Remove TarantoolContainer containers with TarantoolClientBuilder parameter.

pom.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</scm>
5454

5555
<properties>
56-
<testcontainers.version>1.17.4</testcontainers.version>
56+
<testcontainers.version>1.18.0</testcontainers.version>
5757
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5858
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5959
<logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
@@ -104,6 +104,12 @@
104104
<version>1.3.4</version>
105105
<scope>test</scope>
106106
</dependency>
107+
<dependency>
108+
<groupId>org.junit.jupiter</groupId>
109+
<artifactId>junit-jupiter</artifactId>
110+
<version>5.8.1</version>
111+
<scope>test</scope>
112+
</dependency>
107113
<dependency>
108114
<groupId>org.testcontainers</groupId>
109115
<artifactId>junit-jupiter</artifactId>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.testcontainers.containers;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
5-
4+
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertThrows;
66
import static org.testcontainers.containers.PathUtils.normalizePath;
77

88
/**
@@ -14,24 +14,24 @@ class PathUtilsTest {
1414

1515
@Test
1616
void normalizePathTest() {
17-
Assertions.assertEquals("c:/work/server.lua",
17+
assertEquals("c:/work/server.lua",
1818
normalizePath("c:/work/server.lua"));
1919

20-
Assertions.assertEquals("c:/work/server.lua",
20+
assertEquals("c:/work/server.lua",
2121
normalizePath("/c:/work/server.lua"));
2222

23-
Assertions.assertEquals("c:/work/server.lua",
23+
assertEquals("c:/work/server.lua",
2424
normalizePath("/c:\\work\\server.lua"));
2525

26-
Assertions.assertEquals("c:/work/server.lua",
26+
assertEquals("c:/work/server.lua",
2727
normalizePath("c:\\work\\server.lua"));
2828

29-
Assertions.assertEquals("c:/", normalizePath("c:\\"));
29+
assertEquals("c:/", normalizePath("c:\\"));
3030

31-
Assertions.assertEquals("/dummy", normalizePath("/dummy"));
31+
assertEquals("/dummy", normalizePath("/dummy"));
3232

33-
Assertions.assertEquals("/c", normalizePath("/c"));
33+
assertEquals("/c", normalizePath("/c"));
3434

35-
Assertions.assertThrows(NullPointerException.class, () -> normalizePath((String) null));
35+
assertThrows(NullPointerException.class, () -> normalizePath((String) null));
3636
}
3737
}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.api.Test;
54
import org.slf4j.LoggerFactory;
65
import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -11,6 +10,8 @@
1110

1211
import java.time.Duration;
1312

13+
import static org.junit.Assert.assertEquals;
14+
1415
/**
1516
* @author Alexey Kuzin
1617
* @author Valdimir Rogach
@@ -39,7 +40,7 @@ public void test_StaticClusterContainer_StartsSuccessfully_ifFilesAreCopied() th
3940
@Test
4041
public void test_migrator_executesOk() throws Exception {
4142
ExecResult result = container.executeCommand("return require('migrator').up()");
42-
Assertions.assertEquals("---\n" +
43+
assertEquals("---\n" +
4344
"- - 001_ddl.lua\n" +
4445
"...\n" +
4546
"\n", result.getStdout());

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package org.testcontainers.containers;
22

3-
import org.junit.jupiter.api.Test;
4-
53
import java.util.List;
64

7-
import static org.junit.jupiter.api.Assertions.assertEquals;
5+
import org.junit.jupiter.api.Test;
6+
import static org.junit.Assert.assertEquals;
87

98
/**
109
* @author Alexey Kuzin
@@ -48,4 +47,4 @@ public void testContainerWithParameters() throws Exception {
4847
assertEquals(result.get(0), 5);
4948
}
5049
}
51-
}
50+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import java.util.List;
88

9-
import static org.junit.jupiter.api.Assertions.assertEquals;
9+
import static org.junit.Assert.assertEquals;
1010

1111
/**
1212
* @author Alexey Kuzin

0 commit comments

Comments
 (0)