Skip to content

Commit 0828c54

Browse files
Alex-pvlAlex-pvl
committed
feat(testcontainers): edit vshard and cartridge
1 parent c57f6a2 commit 0828c54

23 files changed

Lines changed: 146 additions & 338 deletions

File tree

‎pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,6 @@
396396
<include>**/integration/**/*Crud*Test.java</include>
397397
<include>**/crud/**/*Test.java</include>
398398
</includes>
399-
<excludes>
400-
<exclude>**/io/tarantool/spring/data*/integration/**/*Test.java</exclude>
401-
</excludes>
402399
<argLine>@{argLine} -Xmx1024m</argLine>
403400
</configuration>
404401
</plugin>

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.fasterxml.jackson.core.type.TypeReference;
3636
import org.junit.jupiter.api.BeforeAll;
3737
import org.junit.jupiter.api.BeforeEach;
38-
import org.junit.jupiter.api.Disabled;
3938
import org.junit.jupiter.api.Test;
4039
import org.junit.jupiter.api.Timeout;
4140
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -46,8 +45,8 @@
4645
import org.junit.jupiter.params.provider.MethodSource;
4746
import org.msgpack.value.ValueFactory;
4847
import org.slf4j.LoggerFactory;
49-
import org.testcontainers.containers.TarantoolCartridgeContainer;
50-
import org.testcontainers.containers.TarantoolContainerOperations;
48+
import org.testcontainers.containers.CartridgeClusterContainer;
49+
import org.testcontainers.containers.ClusterContainer;
5150
import org.testcontainers.containers.VshardClusterContainer;
5251
import org.testcontainers.containers.output.Slf4jLogConsumer;
5352
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -88,7 +87,6 @@
8887
import io.tarantool.pool.IProtoClientPool;
8988
import io.tarantool.pool.InstanceConnectionGroup;
9089

91-
@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
9290
@Timeout(value = 10)
9391
@Testcontainers
9492
public class TarantoolCrudClientTest extends BaseTest {
@@ -103,9 +101,9 @@ public class TarantoolCrudClientTest extends BaseTest {
103101
}
104102
};
105103
public static final Person STUB_PERSON = new Person(0, true, String.valueOf(0));
106-
private static TarantoolCartridgeContainer cartridgeContainer;
104+
private static CartridgeClusterContainer cartridgeContainer;
107105
private static VshardClusterContainer vshardClusterContainer;
108-
private static TarantoolContainerOperations clusterContainer;
106+
private static ClusterContainer<?> clusterContainer;
109107
public static final String ROUTER_1 = "ROUTER_1";
110108
public static final String ROUTER_2 = "ROUTER_2";
111109
private static TarantoolCrudClient client;
@@ -150,7 +148,7 @@ public static void setUp() throws Exception {
150148
clusterContainer = vshardClusterContainer;
151149
} else {
152150
cartridgeContainer =
153-
new TarantoolCartridgeContainer(
151+
new CartridgeClusterContainer(
154152
"cartridge/Dockerfile",
155153
dockerRegistry + "cartridge",
156154
"cartridge/instances.yml",

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121
import org.junit.jupiter.api.AfterEach;
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
24-
import org.junit.jupiter.api.Disabled;
2524
import org.junit.jupiter.api.Test;
2625
import org.junit.jupiter.api.Timeout;
2726
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
2827
import org.slf4j.LoggerFactory;
29-
import org.testcontainers.containers.TarantoolCartridgeContainer;
28+
import org.testcontainers.containers.CartridgeClusterContainer;
3029
import org.testcontainers.containers.output.Slf4jLogConsumer;
3130
import org.testcontainers.junit.jupiter.Testcontainers;
3231

@@ -36,7 +35,6 @@
3635
import io.tarantool.core.exceptions.BoxError;
3736
import io.tarantool.mapping.Tuple;
3837

39-
@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
4038
@Timeout(value = 5)
4139
@Testcontainers
4240
public class TarantoolCrudClientWithRetryTest {
@@ -84,8 +82,8 @@ private void execute() {
8482
}
8583
}
8684

87-
private static final TarantoolCartridgeContainer tt =
88-
new TarantoolCartridgeContainer(
85+
private static final CartridgeClusterContainer tt =
86+
new CartridgeClusterContainer(
8987
"cartridge/Dockerfile",
9088
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "")
9189
+ "cartridge",

‎tarantool-shared-resources/cartridge/app/api/crud_aux.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ local crud_methods_to_patch = {
1111
'update',
1212
'upsert',
1313
'insert_many',
14+
'insert_object_many',
1415
'replace_many',
16+
'replace_object_many',
1517
'upsert_many',
18+
'upsert_object_many',
1619
'truncate',
1720
'count',
1821
'len',

‎tarantool-shared-resources/vshard_cluster/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirror.yandex.ru/ubuntu/|
1212

1313
# install dependencies
1414
RUN apt-get -y update && \
15-
apt-get -y install build-essential cmake make gcc git unzip cartridge-cli && \
15+
apt-get -y install build-essential cmake make gcc git unzip && \
1616
apt-get -y clean
1717

1818
CMD tt init && tt build && tt start && sleep infinity

‎tarantool-shared-resources/vshard_cluster/crud_aux.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ local crud_methods_to_patch = {
1111
'update',
1212
'upsert',
1313
'insert_many',
14+
'insert_object_many',
1415
'replace_many',
16+
'replace_object_many',
1517
'upsert_many',
18+
'upsert_object_many',
1619
'truncate',
1720
'count',
1821
'len',

‎tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111

1212
import org.junit.jupiter.api.AfterAll;
1313
import org.junit.jupiter.api.BeforeAll;
14-
import org.junit.jupiter.api.Disabled;
1514
import org.junit.jupiter.api.Timeout;
1615
import org.slf4j.LoggerFactory;
17-
import org.testcontainers.containers.TarantoolCartridgeContainer;
18-
import org.testcontainers.containers.TarantoolContainerOperations;
16+
import org.testcontainers.containers.CartridgeClusterContainer;
17+
import org.testcontainers.containers.ClusterContainer;
1918
import org.testcontainers.containers.VshardClusterContainer;
2019
import org.testcontainers.containers.output.Slf4jLogConsumer;
2120

@@ -24,11 +23,10 @@
2423
import static io.tarantool.spring.data27.utils.TarantoolTestSupport.writeTestPropertiesYaml;
2524
import io.tarantool.spring.data27.config.properties.TarantoolProperties;
2625

27-
@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
2826
@Timeout(60)
2927
public abstract class BaseIntegrationTest {
3028

31-
protected static TarantoolContainerOperations<?> clusterContainer;
29+
protected static ClusterContainer<?> clusterContainer;
3230

3331
private static final String dockerRegistry =
3432
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
@@ -55,8 +53,8 @@ private static void configureContainer() {
5553
}
5654
clusterContainer = vshardClusterContainer;
5755
} else {
58-
TarantoolCartridgeContainer cartridgeContainer =
59-
new TarantoolCartridgeContainer(
56+
CartridgeClusterContainer cartridgeContainer =
57+
new CartridgeClusterContainer(
6058
"cartridge/Dockerfile",
6159
dockerRegistry + "cartridge",
6260
"cartridge/instances.yml",

‎tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/crud/CrudConfigurations.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414
import org.junit.jupiter.api.BeforeAll;
1515
import org.junit.jupiter.api.BeforeEach;
16-
import org.junit.jupiter.api.Disabled;
1716
import org.junit.jupiter.api.Test;
1817
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
3433
import io.tarantool.spring.data27.integration.BaseIntegrationTest;
3534
import io.tarantool.spring.data27.repository.config.EnableTarantoolRepositories;
3635

37-
@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
3836
@TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
3937
abstract class CrudConfigurations extends BaseIntegrationTest {
4038

‎tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111

1212
import org.junit.jupiter.api.AfterAll;
1313
import org.junit.jupiter.api.BeforeAll;
14-
import org.junit.jupiter.api.Disabled;
1514
import org.junit.jupiter.api.Timeout;
1615
import org.slf4j.LoggerFactory;
17-
import org.testcontainers.containers.TarantoolCartridgeContainer;
18-
import org.testcontainers.containers.TarantoolContainerOperations;
16+
import org.testcontainers.containers.CartridgeClusterContainer;
17+
import org.testcontainers.containers.ClusterContainer;
1918
import org.testcontainers.containers.VshardClusterContainer;
2019
import org.testcontainers.containers.output.Slf4jLogConsumer;
2120

@@ -24,11 +23,10 @@
2423
import static io.tarantool.spring.data31.utils.TarantoolTestSupport.writeTestPropertiesYaml;
2524
import io.tarantool.spring.data31.config.properties.TarantoolProperties;
2625

27-
@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
2826
@Timeout(60)
2927
public abstract class BaseIntegrationTest {
3028

31-
protected static TarantoolContainerOperations<?> clusterContainer;
29+
protected static ClusterContainer<?> clusterContainer;
3230

3331
private static final String dockerRegistry =
3432
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
@@ -55,8 +53,8 @@ private static void configureContainer() {
5553
}
5654
clusterContainer = vshardClusterContainer;
5755
} else {
58-
TarantoolCartridgeContainer cartridgeContainer =
59-
new TarantoolCartridgeContainer(
56+
CartridgeClusterContainer cartridgeContainer =
57+
new CartridgeClusterContainer(
6058
"cartridge/Dockerfile",
6159
dockerRegistry + "cartridge",
6260
"cartridge/instances.yml",

‎tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/crud/CrudConfigurations.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414
import org.junit.jupiter.api.BeforeAll;
1515
import org.junit.jupiter.api.BeforeEach;
16-
import org.junit.jupiter.api.Disabled;
1716
import org.junit.jupiter.api.Test;
1817
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
3433
import io.tarantool.spring.data31.integration.BaseIntegrationTest;
3534
import io.tarantool.spring.data31.repository.config.EnableTarantoolRepositories;
3635

37-
@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
3836
@TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
3937
abstract class CrudConfigurations extends BaseIntegrationTest {
4038

0 commit comments

Comments
 (0)