From 78ab682955b23478acf9999e16701de0cbb8e273 Mon Sep 17 00:00:00 2001 From: Martin Traverso Date: Wed, 11 Oct 2023 11:52:19 -0700 Subject: [PATCH] Add validation for missing Test annotations --- client/trino-cli/pom.xml | 6 ++++++ core/trino-grammar/pom.xml | 6 ++++++ core/trino-main/pom.xml | 6 ++++++ .../src/test/java/io/trino/type/TestUnknownType.java | 1 + core/trino-parser/pom.xml | 6 ++++++ core/trino-server-main/pom.xml | 6 ++++++ core/trino-spi/pom.xml | 6 ++++++ lib/trino-array/pom.xml | 6 ++++++ lib/trino-filesystem-azure/pom.xml | 6 ++++++ lib/trino-filesystem-manager/pom.xml | 6 ++++++ lib/trino-filesystem-s3/pom.xml | 6 ++++++ lib/trino-filesystem/pom.xml | 6 ++++++ lib/trino-geospatial-toolkit/pom.xml | 6 ++++++ lib/trino-hdfs/pom.xml | 6 ++++++ lib/trino-parquet/pom.xml | 6 ++++++ plugin/trino-accumulo-iterators/pom.xml | 6 ++++++ plugin/trino-accumulo/pom.xml | 6 ++++++ .../trino/plugin/accumulo/TestAccumuloConnectorTest.java | 1 + .../accumulo/serializers/TestStringRowSerializer.java | 4 ++++ plugin/trino-base-jdbc/pom.xml | 6 ++++++ .../java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java | 4 ++-- plugin/trino-bigquery/pom.xml | 6 ++++++ plugin/trino-blackhole/pom.xml | 6 ++++++ plugin/trino-cassandra/pom.xml | 6 ++++++ .../plugin/cassandra/TestCassandraConnectorTest.java | 2 +- plugin/trino-clickhouse/pom.xml | 6 ++++++ plugin/trino-delta-lake/pom.xml | 6 ++++++ plugin/trino-druid/pom.xml | 6 ++++++ .../io/trino/plugin/druid/TestDruidConnectorTest.java | 1 + plugin/trino-elasticsearch/pom.xml | 6 ++++++ .../elasticsearch/BaseElasticsearchConnectorTest.java | 2 +- plugin/trino-example-http/pom.xml | 6 ++++++ plugin/trino-example-jdbc/pom.xml | 6 ++++++ plugin/trino-exchange-filesystem/pom.xml | 6 ++++++ plugin/trino-exchange-hdfs/pom.xml | 6 ++++++ plugin/trino-geospatial/pom.xml | 6 ++++++ plugin/trino-google-sheets/pom.xml | 6 ++++++ plugin/trino-hive/pom.xml | 6 ++++++ plugin/trino-http-event-listener/pom.xml | 6 ++++++ plugin/trino-hudi/pom.xml | 6 ++++++ plugin/trino-iceberg/pom.xml | 6 ++++++ .../iceberg/TestIcebergMinioAvroConnectorSmokeTest.java | 9 ++++++--- plugin/trino-jmx/pom.xml | 6 ++++++ plugin/trino-kafka/pom.xml | 6 ++++++ plugin/trino-kudu/pom.xml | 7 +++++++ plugin/trino-local-file/pom.xml | 6 ++++++ plugin/trino-ml/pom.xml | 6 ++++++ plugin/trino-mongodb/pom.xml | 6 ++++++ plugin/trino-mysql-event-listener/pom.xml | 6 ++++++ plugin/trino-mysql/pom.xml | 6 ++++++ .../io/trino/plugin/mysql/BaseMySqlConnectorTest.java | 1 + .../plugin/mysql/TestMySqlAutomaticJoinPushdown.java | 6 ++++-- plugin/trino-oracle/pom.xml | 6 ++++++ .../io/trino/plugin/oracle/BaseOracleConnectorTest.java | 3 ++- plugin/trino-pinot/pom.xml | 6 ++++++ plugin/trino-postgresql/pom.xml | 6 ++++++ .../postgresql/TestPostgreSqlAutomaticJoinPushdown.java | 2 ++ plugin/trino-redis/pom.xml | 6 ++++++ plugin/trino-redshift/pom.xml | 6 ++++++ plugin/trino-sqlserver/pom.xml | 6 ++++++ plugin/trino-teradata-functions/pom.xml | 6 ++++++ plugin/trino-thrift/pom.xml | 6 ++++++ .../thrift/integration/TestThriftConnectorTest.java | 2 +- .../integration/TestThriftDistributedQueriesIndexed.java | 2 ++ plugin/trino-tpcds/pom.xml | 6 ++++++ plugin/trino-tpch/pom.xml | 6 ++++++ pom.xml | 9 ++++++++- service/trino-proxy/pom.xml | 6 ++++++ service/trino-verifier/pom.xml | 6 ++++++ testing/trino-benchmark/pom.xml | 6 ++++++ testing/trino-benchto-benchmarks/pom.xml | 6 ++++++ testing/trino-faulttolerant-tests/pom.xml | 6 ++++++ .../TestDistributedFaultTolerantEngineOnlyQueries.java | 1 + .../delta/TestDeltaFaultTolerantExecutionTest.java | 2 ++ .../iceberg/TestIcebergFaultTolerantExecutionTest.java | 2 ++ testing/trino-plugin-reader/pom.xml | 6 ++++++ testing/trino-server-dev/pom.xml | 6 ++++++ testing/trino-testing-containers/pom.xml | 6 ++++++ testing/trino-testing-kafka/pom.xml | 6 ++++++ testing/trino-testing-resources/pom.xml | 6 ++++++ testing/trino-testing/pom.xml | 6 ++++++ testing/trino-tests/pom.xml | 6 ++++++ 82 files changed, 427 insertions(+), 12 deletions(-) diff --git a/client/trino-cli/pom.xml b/client/trino-cli/pom.xml index b5712f8c401b..cd343409721b 100644 --- a/client/trino-cli/pom.xml +++ b/client/trino-cli/pom.xml @@ -124,6 +124,12 @@ test + + io.airlift + junit-extensions + test + + org.assertj assertj-core diff --git a/core/trino-grammar/pom.xml b/core/trino-grammar/pom.xml index c8fa64f35cd4..a599f2516c33 100644 --- a/core/trino-grammar/pom.xml +++ b/core/trino-grammar/pom.xml @@ -27,6 +27,12 @@ antlr4-runtime + + io.airlift + junit-extensions + test + + org.assertj assertj-core diff --git a/core/trino-main/pom.xml b/core/trino-main/pom.xml index 928176e63255..48aa11360234 100644 --- a/core/trino-main/pom.xml +++ b/core/trino-main/pom.xml @@ -426,6 +426,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java b/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java index 771e5561449b..ff22b3c1d43e 100644 --- a/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java +++ b/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java @@ -45,6 +45,7 @@ public void testRange() .isEmpty(); } + @Test @Override public void testFlat() throws Throwable diff --git a/core/trino-parser/pom.xml b/core/trino-parser/pom.xml index fbfb8123fc63..7b09350efcb3 100644 --- a/core/trino-parser/pom.xml +++ b/core/trino-parser/pom.xml @@ -42,6 +42,12 @@ antlr4-runtime + + io.airlift + junit-extensions + test + + org.assertj assertj-core diff --git a/core/trino-server-main/pom.xml b/core/trino-server-main/pom.xml index f928aa6e2647..cb5bd9e870e2 100644 --- a/core/trino-server-main/pom.xml +++ b/core/trino-server-main/pom.xml @@ -29,6 +29,12 @@ trino-main + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml index 7e8ef5278eb9..7eb925b18135 100644 --- a/core/trino-spi/pom.xml +++ b/core/trino-spi/pom.xml @@ -88,6 +88,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/lib/trino-array/pom.xml b/lib/trino-array/pom.xml index 79ad3d867a58..9c90946528d7 100644 --- a/lib/trino-array/pom.xml +++ b/lib/trino-array/pom.xml @@ -36,6 +36,12 @@ fastutil + + io.airlift + junit-extensions + test + + io.trino trino-testing-services diff --git a/lib/trino-filesystem-azure/pom.xml b/lib/trino-filesystem-azure/pom.xml index 293c1664aaa5..4c9ee30afc96 100644 --- a/lib/trino-filesystem-azure/pom.xml +++ b/lib/trino-filesystem-azure/pom.xml @@ -136,6 +136,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift log-manager diff --git a/lib/trino-filesystem-manager/pom.xml b/lib/trino-filesystem-manager/pom.xml index cbf6355241c6..a7af3717823c 100644 --- a/lib/trino-filesystem-manager/pom.xml +++ b/lib/trino-filesystem-manager/pom.xml @@ -62,6 +62,12 @@ trino-spi + + io.airlift + junit-extensions + test + + org.assertj assertj-core diff --git a/lib/trino-filesystem-s3/pom.xml b/lib/trino-filesystem-s3/pom.xml index 9845e44458ee..8994913f0138 100644 --- a/lib/trino-filesystem-s3/pom.xml +++ b/lib/trino-filesystem-s3/pom.xml @@ -125,6 +125,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift log-manager diff --git a/lib/trino-filesystem/pom.xml b/lib/trino-filesystem/pom.xml index 7ad0ae225517..32ac16ed9b02 100644 --- a/lib/trino-filesystem/pom.xml +++ b/lib/trino-filesystem/pom.xml @@ -64,6 +64,12 @@ runtime + + io.airlift + junit-extensions + test + + io.trino trino-spi diff --git a/lib/trino-geospatial-toolkit/pom.xml b/lib/trino-geospatial-toolkit/pom.xml index 6ce313433f4e..99aa31efddff 100644 --- a/lib/trino-geospatial-toolkit/pom.xml +++ b/lib/trino-geospatial-toolkit/pom.xml @@ -62,6 +62,12 @@ jts-io-common + + io.airlift + junit-extensions + test + + io.trino trino-testing-services diff --git a/lib/trino-hdfs/pom.xml b/lib/trino-hdfs/pom.xml index c13003134f9d..b63fc08593aa 100644 --- a/lib/trino-hdfs/pom.xml +++ b/lib/trino-hdfs/pom.xml @@ -177,6 +177,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/lib/trino-parquet/pom.xml b/lib/trino-parquet/pom.xml index eb1e649d874c..ad41c93f5dbd 100644 --- a/lib/trino-parquet/pom.xml +++ b/lib/trino-parquet/pom.xml @@ -121,6 +121,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-accumulo-iterators/pom.xml b/plugin/trino-accumulo-iterators/pom.xml index c44b943e2e58..87247a6263aa 100644 --- a/plugin/trino-accumulo-iterators/pom.xml +++ b/plugin/trino-accumulo-iterators/pom.xml @@ -44,6 +44,12 @@ + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/plugin/trino-accumulo/pom.xml b/plugin/trino-accumulo/pom.xml index 342b771da774..352df63cf98d 100644 --- a/plugin/trino-accumulo/pom.xml +++ b/plugin/trino-accumulo/pom.xml @@ -237,6 +237,12 @@ test + + io.airlift + junit-extensions + test + + io.trino trino-main diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java index 86f8a1505afa..dd5b96d8c4d1 100644 --- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java +++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java @@ -182,6 +182,7 @@ public void testInsertDuplicateRows() } } + @Test @Override public void testShowColumns() { diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java index 5818ecda2b77..99433934cbdc 100644 --- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java +++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java @@ -13,6 +13,8 @@ */ package io.trino.plugin.accumulo.serializers; +import org.junit.jupiter.api.Test; + public class TestStringRowSerializer extends AbstractTestAccumuloRowSerializer { @@ -21,12 +23,14 @@ public TestStringRowSerializer() super(StringRowSerializer.class); } + @Test @Override public void testArray() { // Arrays are not supported by StringRowSerializer } + @Test @Override public void testMap() { diff --git a/plugin/trino-base-jdbc/pom.xml b/plugin/trino-base-jdbc/pom.xml index ae3fa78570a5..22349925a52f 100644 --- a/plugin/trino-base-jdbc/pom.xml +++ b/plugin/trino-base-jdbc/pom.xml @@ -176,6 +176,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java index 6c0c5d820321..ce5961f0ab33 100644 --- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java +++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java @@ -76,10 +76,10 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior) } @Override - @Test + @org.junit.jupiter.api.Test public void testLargeIn() { - throw new SkipException("This test should pass with H2, but takes too long (currently over a mninute) and is not that important"); + // This test should pass with H2, but takes too long (currently over a mninute) and is not that important } @Override diff --git a/plugin/trino-bigquery/pom.xml b/plugin/trino-bigquery/pom.xml index 0e2a05a7329d..fba802d857a8 100644 --- a/plugin/trino-bigquery/pom.xml +++ b/plugin/trino-bigquery/pom.xml @@ -352,6 +352,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-blackhole/pom.xml b/plugin/trino-blackhole/pom.xml index 03c5dfc6fbd0..20f0ed9d04b6 100644 --- a/plugin/trino-blackhole/pom.xml +++ b/plugin/trino-blackhole/pom.xml @@ -86,6 +86,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-cassandra/pom.xml b/plugin/trino-cassandra/pom.xml index e284d24c8a1e..4febcf90ba8e 100644 --- a/plugin/trino-cassandra/pom.xml +++ b/plugin/trino-cassandra/pom.xml @@ -161,6 +161,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java index 9659141cfeb2..be2e072870be 100644 --- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java +++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java @@ -171,7 +171,7 @@ protected String dataMappingTableName(String trinoTypeName) return "tmp_trino_" + System.nanoTime(); } - @Test + @org.junit.jupiter.api.Test @Override public void testShowColumns() { diff --git a/plugin/trino-clickhouse/pom.xml b/plugin/trino-clickhouse/pom.xml index 4d7ec3fbe4a2..4bc92462c752 100644 --- a/plugin/trino-clickhouse/pom.xml +++ b/plugin/trino-clickhouse/pom.xml @@ -102,6 +102,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml index 13fd4e63704c..899d79309bf3 100644 --- a/plugin/trino-delta-lake/pom.xml +++ b/plugin/trino-delta-lake/pom.xml @@ -292,6 +292,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-druid/pom.xml b/plugin/trino-druid/pom.xml index 8281fb6616c7..0e628a8f924a 100644 --- a/plugin/trino-druid/pom.xml +++ b/plugin/trino-druid/pom.xml @@ -118,6 +118,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java index 64646e6802b8..e9bf979ef3a4 100644 --- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java +++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java @@ -127,6 +127,7 @@ protected MaterializedResult getDescribeOrdersResult() .build(); } + @org.junit.jupiter.api.Test @Override public void testShowColumns() { diff --git a/plugin/trino-elasticsearch/pom.xml b/plugin/trino-elasticsearch/pom.xml index 7226e8606b34..1152e7e6534f 100644 --- a/plugin/trino-elasticsearch/pom.xml +++ b/plugin/trino-elasticsearch/pom.xml @@ -274,6 +274,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java index 5e6d490b03b0..5b53be176e71 100644 --- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java +++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java @@ -212,7 +212,7 @@ public void testShowCreateTable() ")"); } - @Test + @org.junit.jupiter.api.Test @Override public void testShowColumns() { diff --git a/plugin/trino-example-http/pom.xml b/plugin/trino-example-http/pom.xml index 9cf8bdedab83..0030df0efe2f 100644 --- a/plugin/trino-example-http/pom.xml +++ b/plugin/trino-example-http/pom.xml @@ -106,6 +106,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-example-jdbc/pom.xml b/plugin/trino-example-jdbc/pom.xml index 307913c59ad8..409616c11411 100644 --- a/plugin/trino-example-jdbc/pom.xml +++ b/plugin/trino-example-jdbc/pom.xml @@ -103,6 +103,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-exchange-filesystem/pom.xml b/plugin/trino-exchange-filesystem/pom.xml index 68bdac4c4bd8..a277e4ab2d67 100644 --- a/plugin/trino-exchange-filesystem/pom.xml +++ b/plugin/trino-exchange-filesystem/pom.xml @@ -339,6 +339,12 @@ provided + + io.airlift + junit-extensions + test + + io.trino trino-testing-containers diff --git a/plugin/trino-exchange-hdfs/pom.xml b/plugin/trino-exchange-hdfs/pom.xml index 5d027051c41a..d85173a264f7 100644 --- a/plugin/trino-exchange-hdfs/pom.xml +++ b/plugin/trino-exchange-hdfs/pom.xml @@ -114,6 +114,12 @@ provided + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/plugin/trino-geospatial/pom.xml b/plugin/trino-geospatial/pom.xml index bf7f74983fbc..2dcb99960571 100644 --- a/plugin/trino-geospatial/pom.xml +++ b/plugin/trino-geospatial/pom.xml @@ -90,6 +90,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift log diff --git a/plugin/trino-google-sheets/pom.xml b/plugin/trino-google-sheets/pom.xml index 4071755fb096..aa4d9287ffdf 100644 --- a/plugin/trino-google-sheets/pom.xml +++ b/plugin/trino-google-sheets/pom.xml @@ -167,6 +167,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml index ac785b33d60c..8aca78e16ff1 100644 --- a/plugin/trino-hive/pom.xml +++ b/plugin/trino-hive/pom.xml @@ -311,6 +311,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-http-event-listener/pom.xml b/plugin/trino-http-event-listener/pom.xml index c1717992164b..6f31bb2c2612 100644 --- a/plugin/trino-http-event-listener/pom.xml +++ b/plugin/trino-http-event-listener/pom.xml @@ -127,6 +127,12 @@ test + + io.airlift + junit-extensions + test + + io.trino trino-main diff --git a/plugin/trino-hudi/pom.xml b/plugin/trino-hudi/pom.xml index 5b7e4a28184f..6b6b6e3b84b3 100644 --- a/plugin/trino-hudi/pom.xml +++ b/plugin/trino-hudi/pom.xml @@ -199,6 +199,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml index d88199f17ef1..418547ff5a96 100644 --- a/plugin/trino-iceberg/pom.xml +++ b/plugin/trino-iceberg/pom.xml @@ -404,6 +404,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java index dcfbdfd2e7ea..98fb44016c7f 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java @@ -14,9 +14,10 @@ package io.trino.plugin.iceberg; import io.trino.filesystem.Location; -import org.testng.SkipException; +import org.junit.jupiter.api.Test; import static org.apache.iceberg.FileFormat.AVRO; +import static org.junit.jupiter.api.Assumptions.abort; public class TestIcebergMinioAvroConnectorSmokeTest extends BaseIcebergMinioConnectorSmokeTest @@ -26,16 +27,18 @@ public TestIcebergMinioAvroConnectorSmokeTest() super(AVRO); } + @Test @Override public void testSortedNationTable() { - throw new SkipException("Avro does not support file sorting"); + abort("Avro does not support file sorting"); } + @Test @Override public void testFileSortingWithLargerTable() { - throw new SkipException("Avro does not support file sorting"); + abort("Avro does not support file sorting"); } @Override diff --git a/plugin/trino-jmx/pom.xml b/plugin/trino-jmx/pom.xml index 35712f4486f7..8a7548a4ad82 100644 --- a/plugin/trino-jmx/pom.xml +++ b/plugin/trino-jmx/pom.xml @@ -115,6 +115,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-kafka/pom.xml b/plugin/trino-kafka/pom.xml index e3b588478e78..aa29f6786cfb 100644 --- a/plugin/trino-kafka/pom.xml +++ b/plugin/trino-kafka/pom.xml @@ -204,6 +204,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-kudu/pom.xml b/plugin/trino-kudu/pom.xml index 48a04a290c9d..f516bc4cc9d0 100644 --- a/plugin/trino-kudu/pom.xml +++ b/plugin/trino-kudu/pom.xml @@ -137,6 +137,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing @@ -198,6 +204,7 @@ annotations test + org.junit.jupiter junit-jupiter-api diff --git a/plugin/trino-local-file/pom.xml b/plugin/trino-local-file/pom.xml index 6aae4957edd6..7c0285277818 100644 --- a/plugin/trino-local-file/pom.xml +++ b/plugin/trino-local-file/pom.xml @@ -96,6 +96,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-ml/pom.xml b/plugin/trino-ml/pom.xml index facfb002b098..d8ee497b7572 100644 --- a/plugin/trino-ml/pom.xml +++ b/plugin/trino-ml/pom.xml @@ -92,6 +92,12 @@ provided + + io.airlift + junit-extensions + test + + io.trino trino-client diff --git a/plugin/trino-mongodb/pom.xml b/plugin/trino-mongodb/pom.xml index 9e633e8ff754..c84a3afeb203 100644 --- a/plugin/trino-mongodb/pom.xml +++ b/plugin/trino-mongodb/pom.xml @@ -133,6 +133,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-mysql-event-listener/pom.xml b/plugin/trino-mysql-event-listener/pom.xml index e633a344e69c..7e1c47d73cf8 100644 --- a/plugin/trino-mysql-event-listener/pom.xml +++ b/plugin/trino-mysql-event-listener/pom.xml @@ -110,6 +110,12 @@ runtime + + io.airlift + junit-extensions + test + + org.assertj assertj-core diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml index 5963abc8241b..a78c2a325ec0 100644 --- a/plugin/trino-mysql/pom.xml +++ b/plugin/trino-mysql/pom.xml @@ -115,6 +115,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java index 5765bc830fa8..679dd31e4c40 100644 --- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java +++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java @@ -103,6 +103,7 @@ protected TestTable createTableWithUnsupportedColumn() "(one bigint, two decimal(50,0), three varchar(10))"); } + @org.junit.jupiter.api.Test @Override public void testShowColumns() { diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java index 3e21ce44d9fc..e579751c97cd 100644 --- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java +++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java @@ -20,10 +20,11 @@ import io.trino.testing.QueryRunner; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; -import org.testng.SkipException; +import org.junit.jupiter.api.Test; import static io.trino.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner; import static java.lang.String.format; +import static org.junit.jupiter.api.Assumptions.abort; public class TestMySqlAutomaticJoinPushdown extends BaseAutomaticJoinPushdownTest @@ -48,10 +49,11 @@ protected QueryRunner createQueryRunner() ImmutableList.of()); } + @Test @Override public void testJoinPushdownWithEmptyStatsInitially() { - throw new SkipException("MySQL statistics are automatically collected"); + abort("MySQL statistics are automatically collected"); } @Override diff --git a/plugin/trino-oracle/pom.xml b/plugin/trino-oracle/pom.xml index e341a666f0bd..6ab026fab12c 100644 --- a/plugin/trino-oracle/pom.xml +++ b/plugin/trino-oracle/pom.xml @@ -131,6 +131,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java index 4f0da8494551..0d9834820a8d 100644 --- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java +++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java @@ -115,13 +115,14 @@ protected TestTable createTableWithUnsupportedColumn() "(one NUMBER(19), two NUMBER, three VARCHAR2(10 CHAR))"); } - @Test + @org.junit.jupiter.api.Test @Override public void testShowColumns() { assertThat(query("SHOW COLUMNS FROM orders")).matches(getDescribeOrdersResult()); } + @org.junit.jupiter.api.Test @Override public void testInformationSchemaFiltering() { diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml index 717f434f8b3b..7d6dd350d197 100755 --- a/plugin/trino-pinot/pom.xml +++ b/plugin/trino-pinot/pom.xml @@ -534,6 +534,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-postgresql/pom.xml b/plugin/trino-postgresql/pom.xml index 7e2132590908..8de8df70a8cb 100644 --- a/plugin/trino-postgresql/pom.xml +++ b/plugin/trino-postgresql/pom.xml @@ -128,6 +128,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java index d81626fe0f19..2d5e084cb759 100644 --- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java +++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java @@ -16,6 +16,7 @@ import io.trino.plugin.jdbc.BaseAutomaticJoinPushdownTest; import io.trino.testing.QueryRunner; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; @@ -39,6 +40,7 @@ protected QueryRunner createQueryRunner() List.of()); } + @Test @Override @Disabled public void testJoinPushdownWithEmptyStatsInitially() diff --git a/plugin/trino-redis/pom.xml b/plugin/trino-redis/pom.xml index a5cc6713fca9..14a0748afb21 100644 --- a/plugin/trino-redis/pom.xml +++ b/plugin/trino-redis/pom.xml @@ -144,6 +144,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-redshift/pom.xml b/plugin/trino-redshift/pom.xml index b97d86b4c2d1..ffea96bcef5d 100644 --- a/plugin/trino-redshift/pom.xml +++ b/plugin/trino-redshift/pom.xml @@ -113,6 +113,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml index e33bca2c803a..582218adf318 100644 --- a/plugin/trino-sqlserver/pom.xml +++ b/plugin/trino-sqlserver/pom.xml @@ -130,6 +130,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-teradata-functions/pom.xml b/plugin/trino-teradata-functions/pom.xml index ea68fb3ba17c..323860d4b1f9 100644 --- a/plugin/trino-teradata-functions/pom.xml +++ b/plugin/trino-teradata-functions/pom.xml @@ -55,6 +55,12 @@ provided + + io.airlift + junit-extensions + test + + io.trino trino-main diff --git a/plugin/trino-thrift/pom.xml b/plugin/trino-thrift/pom.xml index 5268a42ecd83..59417a1d2dd3 100644 --- a/plugin/trino-thrift/pom.xml +++ b/plugin/trino-thrift/pom.xml @@ -169,6 +169,12 @@ runtime + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java index 3058586ac112..922894af3c44 100644 --- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java +++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java @@ -18,7 +18,7 @@ import io.trino.testing.MaterializedResult; import io.trino.testing.QueryRunner; import io.trino.testing.TestingConnectorBehavior; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; import static io.trino.plugin.thrift.integration.ThriftQueryRunner.createThriftQueryRunner; import static io.trino.spi.type.VarcharType.VARCHAR; diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java index f51a48346500..722d45d44b09 100644 --- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java +++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java @@ -16,6 +16,7 @@ import com.google.common.collect.ImmutableMap; import io.trino.testing.AbstractTestIndexedQueries; import io.trino.testing.QueryRunner; +import org.junit.jupiter.api.Test; import static io.trino.plugin.thrift.integration.ThriftQueryRunner.createThriftQueryRunner; @@ -29,6 +30,7 @@ protected QueryRunner createQueryRunner() return createThriftQueryRunner(2, true, ImmutableMap.of()); } + @Test @Override public void testExampleSystemTable() { diff --git a/plugin/trino-tpcds/pom.xml b/plugin/trino-tpcds/pom.xml index 1e82bfa8a874..54c8f0d95796 100644 --- a/plugin/trino-tpcds/pom.xml +++ b/plugin/trino-tpcds/pom.xml @@ -127,6 +127,12 @@ test + + io.airlift + junit-extensions + test + + io.trino trino-main diff --git a/plugin/trino-tpch/pom.xml b/plugin/trino-tpch/pom.xml index fc8fd2346a72..8c02628f7a0b 100644 --- a/plugin/trino-tpch/pom.xml +++ b/plugin/trino-tpch/pom.xml @@ -78,6 +78,12 @@ provided + + io.airlift + junit-extensions + test + + org.assertj assertj-core diff --git a/pom.xml b/pom.xml index 199a9ddccbc4..5d97bb60d5db 100644 --- a/pom.xml +++ b/pom.xml @@ -217,6 +217,7 @@ + com.azure azure-sdk-bom @@ -640,6 +641,11 @@ joni 2.1.5.3 + + io.airlift + junit-extensions + 1 + io.airlift @@ -2453,7 +2459,8 @@ maven-surefire-plugin - junit.jupiter.execution.timeout.thread.mode.default = SEPARATE_THREAD + junit.jupiter.execution.timeout.thread.mode.default = SEPARATE_THREAD + junit.jupiter.extensions.autodetection.enabled = true diff --git a/service/trino-proxy/pom.xml b/service/trino-proxy/pom.xml index eb52dae4de4a..21867ff2f712 100644 --- a/service/trino-proxy/pom.xml +++ b/service/trino-proxy/pom.xml @@ -158,6 +158,12 @@ jmxutils + + io.airlift + junit-extensions + test + + io.trino trino-blackhole diff --git a/service/trino-verifier/pom.xml b/service/trino-verifier/pom.xml index cd5f7a74de5c..7676abca2294 100644 --- a/service/trino-verifier/pom.xml +++ b/service/trino-verifier/pom.xml @@ -135,6 +135,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/testing/trino-benchmark/pom.xml b/testing/trino-benchmark/pom.xml index fb0411adafd4..ef033b73809e 100644 --- a/testing/trino-benchmark/pom.xml +++ b/testing/trino-benchmark/pom.xml @@ -110,6 +110,12 @@ runtime + + io.airlift + junit-extensions + test + + io.trino trino-memory diff --git a/testing/trino-benchto-benchmarks/pom.xml b/testing/trino-benchto-benchmarks/pom.xml index 1a22d2cddf5f..5fc5bbf6caa6 100644 --- a/testing/trino-benchto-benchmarks/pom.xml +++ b/testing/trino-benchto-benchmarks/pom.xml @@ -44,6 +44,12 @@ runtime + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/testing/trino-faulttolerant-tests/pom.xml b/testing/trino-faulttolerant-tests/pom.xml index 4912bd76fc40..fce196c23e13 100644 --- a/testing/trino-faulttolerant-tests/pom.xml +++ b/testing/trino-faulttolerant-tests/pom.xml @@ -122,6 +122,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java index 5219d490a7fe..278eb5013cf1 100644 --- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java +++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java @@ -84,6 +84,7 @@ public void testExplainAnalyzeVerbose() // Spooling exchange does not prove output buffer utilization histogram } + @Test @Override @Disabled public void testSelectiveLimit() diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java index c0b98e1827cd..bc20cc405e0b 100644 --- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java +++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java @@ -21,6 +21,7 @@ import io.trino.testing.DistributedQueryRunner; import io.trino.testing.FaultTolerantExecutionConnectorTestHelper; import io.trino.testing.QueryRunner; +import org.junit.jupiter.api.Test; import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG; import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner; @@ -66,6 +67,7 @@ protected QueryRunner createQueryRunner() return runner; } + @Test @Override public void testExecutePreferredWritePartitioningSkewMitigation() { diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java index 238ecbb22795..4b3eaeb2ffb5 100644 --- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java +++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java @@ -19,6 +19,7 @@ import io.trino.plugin.iceberg.IcebergQueryRunner; import io.trino.testing.FaultTolerantExecutionConnectorTestHelper; import io.trino.testing.QueryRunner; +import org.junit.jupiter.api.Test; import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties; import static io.trino.testing.TestingNames.randomNameSuffix; @@ -48,6 +49,7 @@ protected QueryRunner createQueryRunner() .build(); } + @Test @Override public void testExecutePreferredWritePartitioningSkewMitigation() { diff --git a/testing/trino-plugin-reader/pom.xml b/testing/trino-plugin-reader/pom.xml index bd8ff6093024..a29d8c105e79 100644 --- a/testing/trino-plugin-reader/pom.xml +++ b/testing/trino-plugin-reader/pom.xml @@ -64,6 +64,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing diff --git a/testing/trino-server-dev/pom.xml b/testing/trino-server-dev/pom.xml index 60a543ecbe46..be8738688e92 100644 --- a/testing/trino-server-dev/pom.xml +++ b/testing/trino-server-dev/pom.xml @@ -68,6 +68,12 @@ runtime + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/testing/trino-testing-containers/pom.xml b/testing/trino-testing-containers/pom.xml index cb3053205e39..941130c8ba59 100644 --- a/testing/trino-testing-containers/pom.xml +++ b/testing/trino-testing-containers/pom.xml @@ -72,6 +72,12 @@ testcontainers + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/testing/trino-testing-kafka/pom.xml b/testing/trino-testing-kafka/pom.xml index 4029c54fa152..b6a4757ef9bb 100644 --- a/testing/trino-testing-kafka/pom.xml +++ b/testing/trino-testing-kafka/pom.xml @@ -67,6 +67,12 @@ + + io.airlift + junit-extensions + test + + org.junit.jupiter junit-jupiter-api diff --git a/testing/trino-testing-resources/pom.xml b/testing/trino-testing-resources/pom.xml index 4bd837ca54bf..03b0901141a7 100644 --- a/testing/trino-testing-resources/pom.xml +++ b/testing/trino-testing-resources/pom.xml @@ -16,6 +16,12 @@ + + + io.airlift + junit-extensions + test + org.junit.jupiter junit-jupiter-api diff --git a/testing/trino-testing/pom.xml b/testing/trino-testing/pom.xml index a4dcbe43acf1..fb0f794e1701 100644 --- a/testing/trino-testing/pom.xml +++ b/testing/trino-testing/pom.xml @@ -196,6 +196,12 @@ runtime + + io.airlift + junit-extensions + test + + org.openjdk.jmh diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml index fa89a39b7581..ace4b0c3c822 100644 --- a/testing/trino-tests/pom.xml +++ b/testing/trino-tests/pom.xml @@ -140,6 +140,12 @@ test + + io.airlift + junit-extensions + test + + io.airlift testing