test: disable crud tests

Alex-pvl · Alex-pvl · commit a6b5cb761650 · 2026-02-12T08:35:36.000+03:00
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java
@@ -34,6 +34,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -85,6 +86,7 @@
 import io.tarantool.pool.IProtoClientPool;
 import io.tarantool.pool.InstanceConnectionGroup;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(value = 10)
 @Testcontainers
 public class TarantoolCrudClientTest extends BaseTest {
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -35,6 +36,7 @@
 import io.tarantool.core.exceptions.BoxError;
 import io.tarantool.mapping.Tuple;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(value = 5)
 @Testcontainers
 public class TarantoolCrudClientWithRetryTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/crud/CrudConfigurations.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 import io.tarantool.spring.data27.integration.BaseIntegrationTest;
 import io.tarantool.spring.data27.repository.config.EnableTarantoolRepositories;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data31.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data31.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/crud/CrudConfigurations.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 import io.tarantool.spring.data31.integration.BaseIntegrationTest;
 import io.tarantool.spring.data31.repository.config.EnableTarantoolRepositories;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data32.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data32.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/crud/CrudConfigurations.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 import io.tarantool.spring.data32.integration.BaseIntegrationTest;
 import io.tarantool.spring.data32.repository.config.EnableTarantoolRepositories;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data33.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data33.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/crud/CrudConfigurations.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 import io.tarantool.spring.data33.integration.BaseIntegrationTest;
 import io.tarantool.spring.data33.repository.config.EnableTarantoolRepositories;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data34.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data34.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/crud/CrudConfigurations.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 import io.tarantool.spring.data34.integration.BaseIntegrationTest;
 import io.tarantool.spring.data34.repository.config.EnableTarantoolRepositories;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data35.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data35.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/crud/CrudConfigurations.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 import io.tarantool.spring.data35.integration.BaseIntegrationTest;
 import io.tarantool.spring.data35.repository.config.EnableTarantoolRepositories;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java
@@ -23,6 +23,7 @@
 import org.testcontainers.containers.utils.TarantoolContainerClientHelper;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+@Deprecated
 public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartridgeContainer>
     implements TarantoolContainerOperations<TarantoolCartridgeContainer> {
 
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/TarantoolContainerOperations.java b/testcontainers/src/main/java/org/testcontainers/containers/TarantoolContainerOperations.java
@@ -5,6 +5,7 @@
 
 package org.testcontainers.containers;
 
+@Deprecated
 public interface TarantoolContainerOperations<T extends Container<T>> extends Container<T> {
   /**
    * Get the Tarantool server exposed port for connecting the client to
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java
@@ -26,6 +26,7 @@
 /**
  * @author Artyom Dubinin
  */
+@Deprecated
 public class VshardClusterContainer extends GenericContainer<VshardClusterContainer>
     implements TarantoolContainerOperations<VshardClusterContainer> {
 
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java
@@ -261,7 +261,9 @@ public void stop() {
 
     try {
       this.lock.lock();
-      Utils.deleteDataDirectory(this.mountDataDirectory);
+      if (this.mountDataDirectory != null) {
+        Utils.deleteDataDirectory(this.mountDataDirectory);
+      }
       super.stop();
       this.isClosed.set(true);
     } finally {
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java b/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java
@@ -221,7 +221,8 @@ public static TarantoolContainer<?> createTarantoolContainer(Integer... exposedP
                   .withNetwork(NETWORK)
                   .waitingFor(
                       new Tarantool3WaitStrategy("localhost", API_USER, CREDS.get(API_USER)))
-                  .withPrivilegedMode(true);
+                  .withPrivilegedMode(true)
+                  .withCreateContainerCmdModifier(cmd -> cmd.withUser("root"));
           default ->
               throw new RuntimeException(
                   String.format("Unsupported Tarantool version, %s", TARANTOOL_VERSION));
