Skip to content

Commit 164fb4d

Browse files
Alex-pvlAlex-pvl
committed
test: remove testcontainers-java-tarantool-lib
1 parent 16a1b23 commit 164fb4d

File tree

51 files changed

+2026
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2026
-542
lines changed

‎pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -377,18 +377,6 @@
377377
<version>${testcontainers.version}</version>
378378
<scope>test</scope>
379379
</dependency>
380-
<dependency>
381-
<groupId>io.tarantool</groupId>
382-
<artifactId>testcontainers-java-tarantool</artifactId>
383-
<version>v1.5.0</version>
384-
<scope>test</scope>
385-
<exclusions>
386-
<exclusion>
387-
<groupId>io.netty</groupId>
388-
<artifactId>netty-all</artifactId>
389-
</exclusion>
390-
</exclusions>
391-
</dependency>
392380
<dependency>
393381
<groupId>org.apache.commons</groupId>
394382
<artifactId>commons-lang3</artifactId>

‎tarantool-balancer/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<artifactId>tarantool-pooling</artifactId>
3131
</dependency>
3232
<!-- Test -->
33-
<dependency>
34-
<groupId>io.tarantool</groupId>
35-
<artifactId>testcontainers-java-tarantool</artifactId>
36-
</dependency>
3733
<dependency>
3834
<groupId>ch.qos.logback</groupId>
3935
<artifactId>logback-classic</artifactId>
@@ -46,6 +42,10 @@
4642
<groupId>org.junit.jupiter</groupId>
4743
<artifactId>junit-jupiter</artifactId>
4844
</dependency>
45+
<dependency>
46+
<groupId>io.tarantool</groupId>
47+
<artifactId>testcontainers</artifactId>
48+
</dependency>
4949
<!-- End test -->
5050
</dependencies>
5151
</project>

‎tarantool-balancer/src/test/java/io/tarantool/balancer/integration/BaseTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.tarantool.balancer.integration;
77

8+
import java.nio.file.Path;
89
import java.util.HashMap;
910
import java.util.Map;
1011

@@ -15,15 +16,21 @@
1516
import io.netty.channel.socket.nio.NioSocketChannel;
1617
import io.netty.util.HashedWheelTimer;
1718
import io.netty.util.Timer;
19+
import org.junit.jupiter.api.io.TempDir;
1820
import org.msgpack.value.ArrayValue;
1921
import org.msgpack.value.ValueFactory;
22+
import org.testcontainers.containers.tarantool.TarantoolContainer;
2023

2124
import io.tarantool.core.ManagedResource;
2225
import io.tarantool.core.connection.ConnectionFactory;
2326
import io.tarantool.pool.HeartbeatOpts;
2427

2528
public abstract class BaseTest {
2629

30+
protected static TarantoolContainer<?> container;
31+
32+
@TempDir protected static Path TMP_DIR;
33+
2734
protected static final Bootstrap bootstrap =
2835
new Bootstrap()
2936
.group(new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory()))

‎tarantool-balancer/src/test/java/io/tarantool/balancer/integration/DistributingRoundRobinBalancerTest.java‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
import static org.junit.jupiter.api.Assertions.assertEquals;
1616
import static org.junit.jupiter.api.Assertions.assertThrows;
1717
import static org.junit.jupiter.api.Assertions.assertTrue;
18+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
19+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
1820
import io.micrometer.core.instrument.MeterRegistry;
1921
import io.netty.util.HashedWheelTimer;
2022
import io.netty.util.Timer;
23+
import org.junit.jupiter.api.AfterEach;
2124
import org.junit.jupiter.api.BeforeEach;
2225
import org.junit.jupiter.api.Test;
2326
import org.junit.jupiter.api.Timeout;
2427
import org.slf4j.Logger;
2528
import org.slf4j.LoggerFactory;
26-
import org.testcontainers.containers.TarantoolContainer;
27-
import org.testcontainers.containers.output.Slf4jLogConsumer;
28-
import org.testcontainers.junit.jupiter.Container;
29-
import org.testcontainers.junit.jupiter.Testcontainers;
29+
import org.testcontainers.containers.tarantool.TarantoolContainer;
3030

3131
import static io.tarantool.core.protocol.requests.IProtoConstant.IPROTO_DATA;
3232
import io.tarantool.balancer.TarantoolBalancer;
@@ -41,34 +41,33 @@
4141
import io.tarantool.pool.InstanceConnectionGroup;
4242

4343
@Timeout(value = 15)
44-
@Testcontainers
4544
public class DistributingRoundRobinBalancerTest extends BaseTest {
4645

4746
private static final Logger log =
4847
LoggerFactory.getLogger(DistributingRoundRobinBalancerTest.class);
4948

50-
@Container
51-
private final TarantoolContainer tt1 =
52-
new TarantoolContainer()
53-
.withEnv(ENV_MAP)
54-
.withExposedPort(3305)
55-
.withLogConsumer(new Slf4jLogConsumer(log));
56-
57-
@Container
58-
private final TarantoolContainer tt2 =
59-
new TarantoolContainer()
60-
.withEnv(ENV_MAP)
61-
.withExposedPort(3305)
62-
.withLogConsumer(new Slf4jLogConsumer(log));
49+
private static TarantoolContainer<?> tt1;
50+
private static TarantoolContainer<?> tt2;
6351

6452
@BeforeEach
6553
public void setUp() {
54+
tt1 = createTarantoolContainer(TMP_DIR).withEnv(ENV_MAP).withExposedPorts(3301, 3305);
55+
tt2 = createTarantoolContainer(TMP_DIR).withEnv(ENV_MAP).withExposedPorts(3301, 3305);
56+
57+
tt1.start();
58+
tt2.start();
6659
do {
6760
count1 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
6861
count2 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
6962
} while (count1 == count2);
7063
}
7164

65+
@AfterEach
66+
void tearDown() {
67+
tt1.stop();
68+
tt2.stop();
69+
}
70+
7271
private static IProtoClientPool createClientPool(
7372
boolean gracefulShutdown, HeartbeatOpts heartbeatOpts, MeterRegistry metricsRegistry) {
7473
ManagedResource<Timer> timerResource =
@@ -78,25 +77,28 @@ private static IProtoClientPool createClientPool(
7877
factory, timerResource, gracefulShutdown, heartbeatOpts, null, metricsRegistry);
7978
}
8079

81-
private int getSessionCounter(TarantoolContainer tt) throws Exception {
82-
List<?> result = tt.executeCommandDecoded("return get_session_counter()");
80+
private int getSessionCounter(TarantoolContainer<?> tt) throws Exception {
81+
List<?> result = executeCommandDecoded(tt, "return get_session_counter()");
8382
return (Integer) result.get(0);
8483
}
8584

86-
private int getCallCounter(TarantoolContainer tt) throws Exception {
87-
List<?> result = tt.executeCommandDecoded("return get_call_counter()");
85+
private int getCallCounter(TarantoolContainer<?> tt) throws Exception {
86+
List<?> result = executeCommandDecoded(tt, "return get_call_counter()");
8887
return (Integer) result.get(0);
8988
}
9089

91-
private void execLua(TarantoolContainer container, String command) {
90+
private void execLua(TarantoolContainer<?> container, String command) {
9291
try {
93-
container.executeCommandDecoded(command);
92+
executeCommandDecoded(container, command);
9493
} catch (Exception e) {
9594
}
9695
}
9796

9897
private void wakeUpAllConnects(
99-
TarantoolBalancer rrBalancer, int nodeVisits, TarantoolContainer tt1, TarantoolContainer tt2)
98+
TarantoolBalancer rrBalancer,
99+
int nodeVisits,
100+
TarantoolContainer<?> tt1,
101+
TarantoolContainer<?> tt2)
100102
throws Exception {
101103
walkAndJoin(rrBalancer, nodeVisits * 2);
102104
assertEquals(count1, getSessionCounter(tt1));
@@ -130,13 +132,13 @@ public void testDistributingRoundRobin() throws Exception {
130132
Arrays.asList(
131133
InstanceConnectionGroup.builder()
132134
.withHost(tt1.getHost())
133-
.withPort(tt1.getPort())
135+
.withPort(tt1.getFirstMappedPort())
134136
.withSize(count1)
135137
.withTag("node-a-00")
136138
.build(),
137139
InstanceConnectionGroup.builder()
138140
.withHost(tt2.getHost())
139-
.withPort(tt2.getPort())
141+
.withPort(tt2.getFirstMappedPort())
140142
.withSize(count2)
141143
.withTag("node-b-00")
142144
.build()));
@@ -160,7 +162,7 @@ public void testDistributingRoundRobinWithUnavailableNodeA() throws Exception {
160162
.build(),
161163
InstanceConnectionGroup.builder()
162164
.withHost(tt2.getHost())
163-
.withPort(tt2.getPort())
165+
.withPort(tt2.getFirstMappedPort())
164166
.withSize(count2)
165167
.withTag("node-b-01")
166168
.build()));
@@ -217,7 +219,7 @@ public void testDistributingRoundRobinWithUnavailableNodeANoUnlock() throws Exce
217219
.build(),
218220
InstanceConnectionGroup.builder()
219221
.withHost(tt2.getHost())
220-
.withPort(tt2.getPort())
222+
.withPort(tt2.getFirstMappedPort())
221223
.withSize(count2)
222224
.withTag("node-b-02")
223225
.build()));
@@ -323,12 +325,12 @@ public void testDistributingRoundRobinStartWithStuckNodeA() throws Exception {
323325
Arrays.asList(
324326
InstanceConnectionGroup.builder()
325327
.withHost(tt1.getHost())
326-
.withPort(tt1.getPort())
328+
.withPort(tt1.getFirstMappedPort())
327329
.withTag("node-a-01")
328330
.build(),
329331
InstanceConnectionGroup.builder()
330332
.withHost(tt2.getHost())
331-
.withPort(tt2.getPort())
333+
.withPort(tt2.getFirstMappedPort())
332334
.withTag("node-b-01")
333335
.build()));
334336
pool.setConnectTimeout(3_000);

‎tarantool-balancer/src/test/java/io/tarantool/balancer/integration/RoundRobinBalancerTest.java‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
import java.util.concurrent.ThreadLocalRandom;
1111

1212
import static org.junit.jupiter.api.Assertions.assertEquals;
13+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
14+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
15+
import org.junit.jupiter.api.AfterAll;
1316
import org.junit.jupiter.api.BeforeAll;
1417
import org.junit.jupiter.api.Test;
1518
import org.junit.jupiter.api.Timeout;
1619
import org.msgpack.value.ValueFactory;
17-
import org.testcontainers.containers.TarantoolContainer;
18-
import org.testcontainers.junit.jupiter.Container;
19-
import org.testcontainers.junit.jupiter.Testcontainers;
20+
import org.testcontainers.containers.tarantool.TarantoolContainer;
2021

2122
import io.tarantool.balancer.TarantoolBalancer;
2223
import io.tarantool.balancer.TarantoolRoundRobinBalancer;
@@ -26,28 +27,36 @@
2627
import io.tarantool.pool.InstanceConnectionGroup;
2728

2829
@Timeout(value = 5)
29-
@Testcontainers
3030
public class RoundRobinBalancerTest extends BaseTest {
3131

32-
@Container
33-
private static final TarantoolContainer tt1 = new TarantoolContainer().withEnv(ENV_MAP);
34-
35-
@Container
36-
private static final TarantoolContainer tt2 = new TarantoolContainer().withEnv(ENV_MAP);
32+
private static TarantoolContainer<?> tt1;
33+
private static TarantoolContainer<?> tt2;
3734

3835
@BeforeAll
3936
public static void setUp() {
37+
tt1 = createTarantoolContainer(TMP_DIR);
38+
tt2 = createTarantoolContainer(TMP_DIR);
39+
40+
tt1.start();
41+
tt2.start();
42+
4043
count1 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
4144
count2 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
4245
}
4346

44-
private int getSessionCounter(TarantoolContainer tt) throws Exception {
45-
List<?> result = tt.executeCommandDecoded("return get_session_counter()");
47+
@AfterAll
48+
static void tearDown() {
49+
tt1.stop();
50+
tt2.stop();
51+
}
52+
53+
private int getSessionCounter(TarantoolContainer<?> tt) throws Exception {
54+
List<?> result = executeCommandDecoded(tt, "return get_session_counter()");
4655
return (Integer) result.get(0);
4756
}
4857

49-
private int getCallCounter(TarantoolContainer tt) throws Exception {
50-
List<?> result = tt.executeCommandDecoded("return get_call_counter()");
58+
private int getCallCounter(TarantoolContainer<?> tt) throws Exception {
59+
List<?> result = executeCommandDecoded(tt, "return get_call_counter()");
5160
return (Integer) result.get(0);
5261
}
5362

@@ -58,13 +67,13 @@ public void testRoundRobin() throws Exception {
5867
Arrays.asList(
5968
InstanceConnectionGroup.builder()
6069
.withHost(tt1.getHost())
61-
.withPort(tt1.getPort())
70+
.withPort(tt1.getFirstMappedPort())
6271
.withSize(count1)
6372
.withTag("node-a")
6473
.build(),
6574
InstanceConnectionGroup.builder()
6675
.withHost(tt2.getHost())
67-
.withPort(tt2.getPort())
76+
.withPort(tt2.getFirstMappedPort())
6877
.withSize(count2)
6978
.withTag("node-b")
7079
.build()));

‎tarantool-client/src/test/java/io/tarantool/client/integration/BaseTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,22 @@
55

66
package io.tarantool.client.integration;
77

8+
import java.nio.file.Path;
89
import java.util.HashMap;
910
import java.util.List;
1011
import java.util.Map;
1112
import java.util.stream.Collectors;
1213

14+
import org.junit.jupiter.api.io.TempDir;
15+
1316
import io.tarantool.mapping.SelectResponse;
1417
import io.tarantool.mapping.TarantoolResponse;
1518
import io.tarantool.mapping.Tuple;
1619

1720
public abstract class BaseTest {
1821

22+
@TempDir protected static Path TMP_DIR;
23+
1924
protected static final String API_USER = "api_user";
2025

2126
protected static final Map<String, String> CREDS =

0 commit comments

Comments
 (0)