From 44761c24b4ea872c5d410f6e1aee9d9cc548b855 Mon Sep 17 00:00:00 2001 From: Aleksandr Pavlyuk Date: Fri, 23 Jan 2026 08:44:36 +0300 Subject: [PATCH] test: move it tests --- .../containers/{ => integration}/tcm/TCMContainerTest.java | 3 ++- .../{ => integration}/tdb/TDB2ClusterImplTest.java | 4 +++- .../{tdg/cluster => integration/tdg}/TDGClusterImplTest.java | 4 +++- .../{ => integration}/tdg/TDGContainerImplTest.java | 4 +++- .../file => integration/tdg}/TDGFileConfiguratorTest.java | 3 ++- .../containers/{ => integration}/tqe/CommonTest.java | 2 +- .../tqe}/FileTQEConfiguratorTest.java | 5 +++-- .../containers/{ => integration}/tqe/TQEClusterImplTest.java | 5 ++++- .../{ => integration/vshard}/VshardClusterContainerTest.java | 3 ++- 9 files changed, 23 insertions(+), 10 deletions(-) rename testcontainers/src/test/java/org/testcontainers/containers/{ => integration}/tcm/TCMContainerTest.java (98%) rename testcontainers/src/test/java/org/testcontainers/containers/{ => integration}/tdb/TDB2ClusterImplTest.java (98%) rename testcontainers/src/test/java/org/testcontainers/containers/{tdg/cluster => integration/tdg}/TDGClusterImplTest.java (93%) rename testcontainers/src/test/java/org/testcontainers/containers/{ => integration}/tdg/TDGContainerImplTest.java (96%) rename testcontainers/src/test/java/org/testcontainers/containers/{tdg/configuration/impl/file => integration/tdg}/TDGFileConfiguratorTest.java (96%) rename testcontainers/src/test/java/org/testcontainers/containers/{ => integration}/tqe/CommonTest.java (96%) rename testcontainers/src/test/java/org/testcontainers/containers/{tqe/configuration => integration/tqe}/FileTQEConfiguratorTest.java (96%) rename testcontainers/src/test/java/org/testcontainers/containers/{ => integration}/tqe/TQEClusterImplTest.java (98%) rename testcontainers/src/test/java/org/testcontainers/containers/{ => integration/vshard}/VshardClusterContainerTest.java (95%) diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tcm/TCMContainerTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tcm/TCMContainerTest.java similarity index 98% rename from testcontainers/src/test/java/org/testcontainers/containers/tcm/TCMContainerTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tcm/TCMContainerTest.java index 78be178..bb479c3 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tcm/TCMContainerTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tcm/TCMContainerTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tcm; +package org.testcontainers.containers.integration.tcm; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; @@ -32,6 +32,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.testcontainers.containers.ContainerLaunchException; import org.testcontainers.containers.Network; +import org.testcontainers.containers.tcm.TCMContainer; import org.testcontainers.containers.tcm.config.TCMConfig; import org.testcontainers.containers.utils.Utils; diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tdb/TDB2ClusterImplTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java similarity index 98% rename from testcontainers/src/test/java/org/testcontainers/containers/tdb/TDB2ClusterImplTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java index 2c7354d..df52377 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tdb/TDB2ClusterImplTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tdb; +package org.testcontainers.containers.integration.tdb; import java.io.IOException; import java.net.URISyntaxException; @@ -33,6 +33,8 @@ import org.testcontainers.containers.Container.ExecResult; import org.testcontainers.containers.ContainerLaunchException; import org.testcontainers.containers.tarantool.TarantoolContainer; +import org.testcontainers.containers.tdb.TDB2ClusterImpl; +import org.testcontainers.containers.tdb.TDBCluster; import org.testcontainers.containers.utils.Utils; import io.tarantool.autogen.Tarantool3Configuration; diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tdg/cluster/TDGClusterImplTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGClusterImplTest.java similarity index 93% rename from testcontainers/src/test/java/org/testcontainers/containers/tdg/cluster/TDGClusterImplTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGClusterImplTest.java index 4f4e260..fd67e2c 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tdg/cluster/TDGClusterImplTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGClusterImplTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tdg.cluster; +package org.testcontainers.containers.integration.tdg; import java.net.URISyntaxException; import java.nio.file.Path; @@ -19,6 +19,8 @@ import org.junit.jupiter.api.Test; import org.testcontainers.containers.tdg.TDGContainer; import org.testcontainers.containers.tdg.Utils; +import org.testcontainers.containers.tdg.cluster.TDGCluster; +import org.testcontainers.containers.tdg.cluster.TDGClusterImpl; import org.testcontainers.containers.tdg.configuration.TDGConfigurator; import org.testcontainers.containers.tdg.configuration.impl.file.TDGFileConfigurator; import org.testcontainers.containers.utils.pojo.User; diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tdg/TDGContainerImplTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGContainerImplTest.java similarity index 96% rename from testcontainers/src/test/java/org/testcontainers/containers/tdg/TDGContainerImplTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGContainerImplTest.java index 4bd400e..f72a5fe 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tdg/TDGContainerImplTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGContainerImplTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tdg; +package org.testcontainers.containers.integration.tdg; import java.io.IOException; import java.net.InetSocketAddress; @@ -24,6 +24,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.testcontainers.containers.Container.ExecResult; +import org.testcontainers.containers.tdg.TDGContainer; +import org.testcontainers.containers.tdg.TDGContainerImpl; import org.testcontainers.utility.DockerImageName; class TDGContainerImplTest { diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tdg/configuration/impl/file/TDGFileConfiguratorTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGFileConfiguratorTest.java similarity index 96% rename from testcontainers/src/test/java/org/testcontainers/containers/tdg/configuration/impl/file/TDGFileConfiguratorTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGFileConfiguratorTest.java index 0c02595..16dd2f5 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tdg/configuration/impl/file/TDGFileConfiguratorTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdg/TDGFileConfiguratorTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tdg.configuration.impl.file; +package org.testcontainers.containers.integration.tdg; import java.net.URISyntaxException; import java.nio.file.Path; @@ -20,6 +20,7 @@ import org.testcontainers.containers.tdg.TDGContainer; import org.testcontainers.containers.tdg.Utils; import org.testcontainers.containers.tdg.configuration.TDGConfigurator; +import org.testcontainers.containers.tdg.configuration.impl.file.TDGFileConfigurator; import org.testcontainers.containers.utils.pojo.User; import org.testcontainers.utility.DockerImageName; diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tqe/CommonTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/CommonTest.java similarity index 96% rename from testcontainers/src/test/java/org/testcontainers/containers/tqe/CommonTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/CommonTest.java index b469150..78db72b 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tqe/CommonTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/CommonTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tqe; +package org.testcontainers.containers.integration.tqe; import java.net.URISyntaxException; import java.nio.file.Path; diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tqe/configuration/FileTQEConfiguratorTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/FileTQEConfiguratorTest.java similarity index 96% rename from testcontainers/src/test/java/org/testcontainers/containers/tqe/configuration/FileTQEConfiguratorTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/FileTQEConfiguratorTest.java index 48e7916..4bf4f11 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tqe/configuration/FileTQEConfiguratorTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/FileTQEConfiguratorTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tqe.configuration; +package org.testcontainers.containers.integration.tqe; import java.io.IOException; import java.nio.file.Files; @@ -18,7 +18,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.testcontainers.containers.ContainerLaunchException; -import org.testcontainers.containers.tqe.CommonTest; +import org.testcontainers.containers.tqe.configuration.FileTQEConfigurator; +import org.testcontainers.containers.tqe.configuration.TQEConfigurator; import org.testcontainers.lifecycle.Startable; class FileTQEConfiguratorTest extends CommonTest { diff --git a/testcontainers/src/test/java/org/testcontainers/containers/tqe/TQEClusterImplTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/TQEClusterImplTest.java similarity index 98% rename from testcontainers/src/test/java/org/testcontainers/containers/tqe/TQEClusterImplTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/TQEClusterImplTest.java index 39aaece..2099079 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/tqe/TQEClusterImplTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tqe/TQEClusterImplTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers.tqe; +package org.testcontainers.containers.integration.tqe; import java.io.IOException; import java.net.InetSocketAddress; @@ -35,7 +35,10 @@ import org.junit.jupiter.params.provider.MethodSource; import org.rnorth.ducttape.unreliables.Unreliables; import org.testcontainers.containers.ContainerLaunchException; +import org.testcontainers.containers.tqe.GrpcContainer; import org.testcontainers.containers.tqe.GrpcContainer.GrpcRole; +import org.testcontainers.containers.tqe.TQECluster; +import org.testcontainers.containers.tqe.TQEClusterImpl; import org.testcontainers.containers.tqe.configuration.FileTQEConfigurator; import org.testcontainers.containers.tqe.configuration.TQEConfigurator; import org.testcontainers.containers.utils.pojo.User; diff --git a/testcontainers/src/test/java/org/testcontainers/containers/VshardClusterContainerTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/vshard/VshardClusterContainerTest.java similarity index 95% rename from testcontainers/src/test/java/org/testcontainers/containers/VshardClusterContainerTest.java rename to testcontainers/src/test/java/org/testcontainers/containers/integration/vshard/VshardClusterContainerTest.java index 8c49e98..9e8e5dc 100644 --- a/testcontainers/src/test/java/org/testcontainers/containers/VshardClusterContainerTest.java +++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/vshard/VshardClusterContainerTest.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.testcontainers.containers; +package org.testcontainers.containers.integration.vshard; import java.util.Arrays; import java.util.List; @@ -14,6 +14,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.testcontainers.containers.VshardClusterContainer; class VshardClusterContainerTest {