From ae183b068566317d24a8bfbdf2278957edbe1f55 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Wed, 9 Oct 2024 12:49:20 +0900 Subject: [PATCH 1/2] Remove `@ResourcePresence` from integration tests ManageTestResources depends on TestNG. These classes use JUnit. --- .../security/oauth2/TestingHydraIdentityProvider.java | 7 ------- .../io/trino/plugin/cassandra/CassandraServer.java | 7 ------- .../plugin/clickhouse/TestingClickHouseServer.java | 7 ------- .../plugin/elasticsearch/ElasticsearchServer.java | 7 ------- .../io/trino/plugin/exasol/TestingExasolServer.java | 7 ------- .../plugin/hive/containers/HiveMinioDataLake.java | 7 ------- .../io/trino/plugin/ignite/TestingIgniteServer.java | 7 ------- .../java/io/trino/plugin/kudu/TestingKuduServer.java | 10 ---------- .../io/trino/plugin/mariadb/TestingMariaDbServer.java | 7 ------- .../test/java/io/trino/plugin/mongodb/MongoServer.java | 7 ------- .../java/io/trino/plugin/mysql/TestingMySqlServer.java | 7 ------- .../io/trino/plugin/openlineage/MarquezServer.java | 7 ------- .../io/trino/plugin/opensearch/OpenSearchServer.java | 7 ------- .../io/trino/plugin/oracle/TestingOracleServer.java | 7 ------- .../io/trino/plugin/phoenix5/TestingPhoenixServer.java | 7 ------- .../plugin/postgresql/TestingPostgreSqlServer.java | 7 ------- .../io/trino/plugin/prometheus/PrometheusServer.java | 7 ------- .../plugin/singlestore/TestingSingleStoreServer.java | 7 ------- .../io/trino/plugin/sqlserver/TestingSqlServer.java | 7 ------- testing/trino-testing-kafka/pom.xml | 5 ----- .../main/java/io/trino/testing/kafka/TestingKafka.java | 7 ------- 21 files changed, 148 deletions(-) diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java index 1b88a58b8d65..9d910dae3ce3 100644 --- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java +++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java @@ -33,7 +33,6 @@ import io.trino.server.testing.TestingTrinoServer; import io.trino.server.ui.OAuth2WebUiAuthenticationFilter; import io.trino.server.ui.WebUiModule; -import io.trino.testing.ResourcePresence; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -378,12 +377,6 @@ private static void runTestServer(boolean useJwt) } } - @ResourcePresence - public boolean isRunning() - { - return hydraContainer.getContainerId() != null || databaseContainer.getContainerId() != null || migrationContainer.getContainerId() != null; - } - public static void main(String[] args) throws Exception { diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraServer.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraServer.java index 8ac5e08c82a9..4f58889cc87c 100644 --- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraServer.java +++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraServer.java @@ -23,7 +23,6 @@ import io.airlift.json.JsonCodec; import io.airlift.log.Logger; import io.airlift.units.Duration; -import io.trino.testing.ResourcePresence; import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.containers.wait.CassandraQueryWaitStrategy; import org.testcontainers.utility.DockerImageName; @@ -175,10 +174,4 @@ public void close() session.close(); dockerContainer.close(); } - - @ResourcePresence - public boolean isRunning() - { - return dockerContainer.getContainerId() != null; - } } diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java index bdbfd3b61f1f..1b1d843e1acf 100644 --- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java +++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java @@ -13,7 +13,6 @@ */ package io.trino.plugin.clickhouse; -import io.trino.testing.ResourcePresence; import org.testcontainers.clickhouse.ClickHouseContainer; import org.testcontainers.utility.DockerImageName; @@ -76,10 +75,4 @@ public void close() { dockerContainer.stop(); } - - @ResourcePresence - public boolean isRunning() - { - return dockerContainer.getContainerId() != null; - } } diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchServer.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchServer.java index 0dca7e3d278b..b5cabbf9319c 100644 --- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchServer.java +++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchServer.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; import com.google.common.net.HostAndPort; -import io.trino.testing.ResourcePresence; import org.apache.http.HttpHost; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.apache.http.message.BasicHeader; @@ -103,12 +102,6 @@ public void stop() deleteRecursively(configurationPath, ALLOW_INSECURE); } - @ResourcePresence - public boolean isRunning() - { - return container.getContainerId() != null; - } - public HostAndPort getAddress() { return HostAndPort.fromString(container.getHttpHostAddress()); diff --git a/plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java b/plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java index 46ef39049a04..97c8780fe9aa 100644 --- a/plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java +++ b/plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java @@ -16,7 +16,6 @@ import com.exasol.containers.ExasolContainer; import com.exasol.containers.ExasolService; -import io.trino.testing.ResourcePresence; import io.trino.testing.sql.JdbcSqlExecutor; import org.intellij.lang.annotations.Language; @@ -109,10 +108,4 @@ public void close() throw new UncheckedIOException(ioe); } } - - @ResourcePresence - public boolean isRunning() - { - return container.getContainerId() != null; - } } 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 ae7178287135..0ce79c2ff6a6 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 @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.trino.plugin.base.util.AutoCloseableCloser; -import io.trino.testing.ResourcePresence; import io.trino.testing.containers.Minio; import io.trino.testing.minio.MinioClient; import org.testcontainers.containers.Network; @@ -99,12 +98,6 @@ public void stop() state = State.STOPPED; } - @ResourcePresence - public boolean isNotStopped() - { - return state != State.STOPPED; - } - public Network getNetwork() { return network; diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java index f1e2278ee331..b70ef8d4c68d 100644 --- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java +++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java @@ -13,7 +13,6 @@ */ package io.trino.plugin.ignite; -import io.trino.testing.ResourcePresence; import io.trino.testing.SharedResource; import java.sql.Connection; @@ -64,10 +63,4 @@ public void close() { dockerContainer.stop(); } - - @ResourcePresence - public boolean isRunning() - { - return dockerContainer.getContainerId() != null; - } } diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java index c14584fdbc05..0901838f8a54 100644 --- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java +++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java @@ -15,7 +15,6 @@ import com.google.common.io.Closer; import com.google.common.net.HostAndPort; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.ToxiproxyContainer; @@ -45,8 +44,6 @@ public class TestingKuduServer private final GenericContainer master; private final GenericContainer tabletServer; - private boolean stopped; - public TestingKuduServer() { this(LATEST_TAG); @@ -111,13 +108,6 @@ public void close() catch (IOException e) { throw new RuntimeException(e); } - stopped = true; - } - - @ResourcePresence - public boolean isNotStopped() - { - return !stopped; } private static String getHostIPAddress() diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java index 4d2a6c280172..45aadf2bb260 100644 --- a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java +++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java @@ -13,7 +13,6 @@ */ package io.trino.plugin.mariadb; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.MariaDBContainer; import org.testcontainers.utility.DockerImageName; @@ -87,10 +86,4 @@ public void close() { container.close(); } - - @ResourcePresence - public boolean isRunning() - { - return container.getContainerId() != null; - } } diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoServer.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoServer.java index 8c08e465a406..febb162ce07a 100644 --- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoServer.java +++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoServer.java @@ -14,7 +14,6 @@ package io.trino.plugin.mongodb; import com.mongodb.ConnectionString; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.MongoDBContainer; import java.io.Closeable; @@ -48,10 +47,4 @@ public void close() { dockerContainer.close(); } - - @ResourcePresence - public boolean isRunning() - { - return dockerContainer.getContainerId() != null; - } } diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java index e9e44666cd98..544dd56fef1d 100644 --- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java +++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java @@ -13,7 +13,6 @@ */ package io.trino.plugin.mysql; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.MySQLContainer; import java.io.Closeable; @@ -134,10 +133,4 @@ public void close() throw new UncheckedIOException(e); } } - - @ResourcePresence - public boolean isRunning() - { - return container.getContainerId() != null; - } } diff --git a/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/MarquezServer.java b/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/MarquezServer.java index e282c77c6942..6237630ed5ff 100644 --- a/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/MarquezServer.java +++ b/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/MarquezServer.java @@ -14,7 +14,6 @@ package io.trino.plugin.openlineage; import com.google.common.io.Closer; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.PostgreSQLContainer; @@ -142,10 +141,4 @@ public void close() { closer.close(); } - - @ResourcePresence - public boolean isRunning() - { - return dockerContainerAPI.getContainerId() != null; - } } diff --git a/plugin/trino-opensearch/src/test/java/io/trino/plugin/opensearch/OpenSearchServer.java b/plugin/trino-opensearch/src/test/java/io/trino/plugin/opensearch/OpenSearchServer.java index 2e2e8c595b8e..9ee5e3c5cd5c 100644 --- a/plugin/trino-opensearch/src/test/java/io/trino/plugin/opensearch/OpenSearchServer.java +++ b/plugin/trino-opensearch/src/test/java/io/trino/plugin/opensearch/OpenSearchServer.java @@ -14,7 +14,6 @@ package io.trino.plugin.opensearch; import com.google.common.net.HostAndPort; -import io.trino.testing.ResourcePresence; import org.opensearch.testcontainers.OpensearchContainer; import org.testcontainers.containers.Network; @@ -66,12 +65,6 @@ public OpenSearchServer(Network network, String image, boolean secured, Map> loggedQueriesSource; diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusServer.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusServer.java index b524fee222c2..df938c126f6c 100644 --- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusServer.java +++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusServer.java @@ -13,7 +13,6 @@ */ package io.trino.plugin.prometheus; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; @@ -68,10 +67,4 @@ public void close() { dockerContainer.close(); } - - @ResourcePresence - public boolean isRunning() - { - return dockerContainer.getContainerId() != null; - } } diff --git a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestingSingleStoreServer.java b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestingSingleStoreServer.java index e7c2cd400648..13fda3c8e259 100644 --- a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestingSingleStoreServer.java +++ b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestingSingleStoreServer.java @@ -14,7 +14,6 @@ package io.trino.plugin.singlestore; import com.google.common.collect.ImmutableSet; -import io.trino.testing.ResourcePresence; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.utility.DockerImageName; @@ -104,12 +103,6 @@ public void execute(String sql) execute(sql, getUsername(), getPassword()); } - @ResourcePresence - public boolean isResourcePresent() - { - return isRunning() || getContainerId() != null; - } - public void execute(String sql, String user, String password) { try (Connection connection = DriverManager.getConnection(getJdbcUrl(), user, password); diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java index ed720a6c8e15..9298891a6bf5 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java @@ -17,7 +17,6 @@ import dev.failsafe.RetryPolicy; import dev.failsafe.Timeout; import io.airlift.log.Logger; -import io.trino.testing.ResourcePresence; import io.trino.testing.sql.SqlExecutor; import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; @@ -222,12 +221,6 @@ public void close() } } - @ResourcePresence - public boolean isRunning() - { - return container.getContainerId() != null; - } - private static class InitializedState { private final MSSQLServerContainer container; diff --git a/testing/trino-testing-kafka/pom.xml b/testing/trino-testing-kafka/pom.xml index 11cc0c9a057f..ea1f333b246f 100644 --- a/testing/trino-testing-kafka/pom.xml +++ b/testing/trino-testing-kafka/pom.xml @@ -38,11 +38,6 @@ log - - io.trino - trino-testing-services - - org.apache.kafka kafka-clients diff --git a/testing/trino-testing-kafka/src/main/java/io/trino/testing/kafka/TestingKafka.java b/testing/trino-testing-kafka/src/main/java/io/trino/testing/kafka/TestingKafka.java index 973395f98520..f5fefb9acb63 100644 --- a/testing/trino-testing-kafka/src/main/java/io/trino/testing/kafka/TestingKafka.java +++ b/testing/trino-testing-kafka/src/main/java/io/trino/testing/kafka/TestingKafka.java @@ -19,7 +19,6 @@ import dev.failsafe.Failsafe; import dev.failsafe.RetryPolicy; import io.airlift.log.Logger; -import io.trino.testing.ResourcePresence; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; @@ -148,12 +147,6 @@ public void close() stopped = true; } - @ResourcePresence - public boolean isNotStopped() - { - return !stopped; - } - public void createTopic(String topic) { createTopic(2, 1, topic); From 837a2cfc48603146a078b6ae1b4e931976e6d356 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Wed, 9 Oct 2024 13:38:50 +0900 Subject: [PATCH 2/2] Remove unused method from TestingKuduServer --- .../java/io/trino/plugin/kudu/TestingKuduServer.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java index 0901838f8a54..c454bb6bc200 100644 --- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java +++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java @@ -21,8 +21,6 @@ import java.io.Closeable; import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; import static java.lang.String.format; @@ -109,14 +107,4 @@ public void close() throw new RuntimeException(e); } } - - private static String getHostIPAddress() - { - try { - return InetAddress.getLocalHost().getHostAddress(); - } - catch (UnknownHostException e) { - throw new RuntimeException(e); - } - } }