diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml index 9286428ad362..afb00bacf02e 100644 --- a/plugin/trino-hive/pom.xml +++ b/plugin/trino-hive/pom.xml @@ -341,6 +341,12 @@ test + + io.trino + trino-testing-containers + test + + io.trino trino-testing-services diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java index 6307ea35db3c..b58855bd7da1 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java +++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java @@ -19,6 +19,7 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.google.common.collect.ImmutableMap; +import io.trino.testing.containers.Minio; import io.trino.util.AutoCloseableCloser; import org.testcontainers.containers.Network; diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml index 042ffaddefcd..b2edbd929852 100644 --- a/plugin/trino-mysql/pom.xml +++ b/plugin/trino-mysql/pom.xml @@ -125,6 +125,12 @@ test + + io.trino + trino-testing-containers + test + + io.trino trino-tpch diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml index e877ee0363af..2a131c631be9 100644 --- a/plugin/trino-sqlserver/pom.xml +++ b/plugin/trino-sqlserver/pom.xml @@ -129,6 +129,12 @@ test + + io.trino + trino-testing-containers + test + + io.trino trino-tpch diff --git a/pom.xml b/pom.xml index 513a6be764e9..e02fec73f37f 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,7 @@ testing/trino-test-jdbc-compatibility-old-driver testing/trino-test-jdbc-compatibility-old-server testing/trino-testing + testing/trino-testing-containers testing/trino-testing-kafka testing/trino-testing-services testing/trino-tests @@ -482,6 +483,12 @@ ${project.version} + + io.trino + trino-testing-containers + ${project.version} + + io.trino trino-testing-kafka diff --git a/testing/trino-testing-containers/pom.xml b/testing/trino-testing-containers/pom.xml new file mode 100644 index 000000000000..b62f8d224185 --- /dev/null +++ b/testing/trino-testing-containers/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + + io.trino + trino-root + 370-SNAPSHOT + ../../pom.xml + + + trino-testing-containers + trino-testing-containers + + + ${project.parent.basedir} + + + + + io.airlift + log + + + + com.github.docker-java + docker-java-api + ${dep.docker-java.version} + + + + com.google.guava + guava + + + + net.jodah + failsafe + + + + org.testcontainers + testcontainers + + + + org.testng + testng + test + + + diff --git a/testing/trino-testing/src/main/java/io/trino/testing/containers/BaseTestContainer.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/BaseTestContainer.java similarity index 100% rename from testing/trino-testing/src/main/java/io/trino/testing/containers/BaseTestContainer.java rename to testing/trino-testing-containers/src/main/java/io/trino/testing/containers/BaseTestContainer.java diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/Minio.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java similarity index 97% rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/Minio.java rename to testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java index fb6e0d89a8ce..a66a68169c33 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/Minio.java +++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java @@ -11,13 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.trino.plugin.hive.containers; +package io.trino.testing.containers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.HostAndPort; import io.airlift.log.Logger; -import io.trino.testing.containers.BaseTestContainer; import org.testcontainers.containers.Network; import java.util.Map; diff --git a/testing/trino-testing/src/main/java/io/trino/testing/containers/TestContainers.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java similarity index 100% rename from testing/trino-testing/src/main/java/io/trino/testing/containers/TestContainers.java rename to testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java diff --git a/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java b/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java new file mode 100644 index 000000000000..dea00f6fd596 --- /dev/null +++ b/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java @@ -0,0 +1,22 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.trino.server; + +import org.testng.annotations.Test; + +public class TestDummy +{ + @Test + public void buildRequiresTestToExist() {} +} diff --git a/testing/trino-testing/pom.xml b/testing/trino-testing/pom.xml index 8f2f8f0b3e12..d57f35f857b2 100644 --- a/testing/trino-testing/pom.xml +++ b/testing/trino-testing/pom.xml @@ -93,12 +93,6 @@ jackson-annotations - - com.github.docker-java - docker-java-api - ${dep.docker-java.version} - - com.google.errorprone error_prone_annotations @@ -124,11 +118,6 @@ joda-time - - net.jodah - failsafe - - org.apache.commons commons-math3 @@ -144,11 +133,6 @@ jdbi3-core - - org.testcontainers - testcontainers - - org.testng testng diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml index fffbcd190190..2f4e6c06003c 100644 --- a/testing/trino-tests/pom.xml +++ b/testing/trino-tests/pom.xml @@ -180,6 +180,12 @@ runtime + + junit + junit + runtime + + org.jetbrains annotations