diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java index 62c0839735c3..8f059c1c900e 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java @@ -22,11 +22,11 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.ALTER_TABLE; import static io.trino.tests.product.TestGroups.SMOKE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; @Requires(ImmutableNationTable.class) public class TestAlterTable diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java index 0d0e0570db83..14643da66f02 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.stream.Collectors; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.CONFIGURED_FEATURES; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests in this class verify that the test environments have been defined correctly, diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java index 87e2222948ff..9d402b1d0e88 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java @@ -19,13 +19,13 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ContextDsl.executeWith; import static io.trino.tempto.sql.SqlContexts.createViewAs; import static io.trino.tests.product.TestGroups.CREATE_DROP_VIEW; import static io.trino.tests.product.TestGroups.SMOKE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; @Requires(ImmutableNationTable.class) public class TestCreateDropView diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java index 5cb49fd8615a..1ef8ef2867b2 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java @@ -19,11 +19,11 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.CREATE_TABLE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; @Requires(ImmutableNationTable.class) public class TestCreateTable diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java index 3a9f3a8a8309..45a204ad686f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java @@ -17,9 +17,9 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.FUNCTIONS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class TestFunctions diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java index 83870611caff..5924e16aa8a8 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java @@ -16,12 +16,12 @@ import io.trino.tempto.ProductTest; import org.testng.annotations.Test; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.JDBC; import static io.trino.tests.product.TestGroups.JMX_CONNECTOR; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.sql.JDBCType.BIGINT; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; public class TestJmxConnector extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java index 3205ebf79720..11a44877cfa5 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java @@ -19,7 +19,6 @@ import io.trino.tempto.Requirement; import io.trino.tempto.RequirementsProvider; import io.trino.tempto.Requires; -import io.trino.tempto.assertions.QueryAssert; import io.trino.tempto.configuration.Configuration; import io.trino.tempto.fulfillment.table.ImmutableTableRequirement; import org.testng.annotations.Test; @@ -61,14 +60,14 @@ public void afterTest() @Requires(SimpleTestRequirements.class) public void selectAllFromNation() { - QueryAssert.assertThat(onTrino().executeQuery("select * from nation")).hasRowsCount(25); + assertThat(onTrino().executeQuery("select * from nation")).hasRowsCount(25); } @Test(groups = {SIMPLE, SMOKE}) @Requires(SimpleTestRequirements.class) public void selectCountFromNation() { - QueryAssert.assertThat(onTrino().executeQuery("select count(*) from nation")) + assertThat(onTrino().executeQuery("select count(*) from nation")) .hasRowsCount(1) .contains(row(25)); } diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java index 1af440dd1b9d..eca3e2e2b333 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java @@ -44,7 +44,6 @@ import static io.airlift.http.client.Request.Builder.prepareDelete; import static io.airlift.http.client.ResponseHandlerUtils.propagate; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.CANCEL_QUERY; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; @@ -53,6 +52,7 @@ import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.fail; public class TestSqlCancel diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java index 65c33cbb6eee..77c12661ff25 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java @@ -18,7 +18,6 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.JDBC; import static io.trino.tests.product.TestGroups.SYSTEM_CONNECTOR; import static io.trino.tests.product.utils.QueryExecutors.onTrino; @@ -26,6 +25,7 @@ import static java.sql.JDBCType.BIGINT; import static java.sql.JDBCType.TIMESTAMP_WITH_TIMEZONE; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; public class TestSystemConnector extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java index a0a159bf6844..c393610bf37f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java @@ -20,13 +20,13 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.TestGroups.TWO_HIVES; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.Math.pow; import static java.lang.String.format; import static java.util.stream.Collectors.joining; +import static org.assertj.core.api.Assertions.assertThat; public class TestTwoHives { diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java index dc695abdc6ca..64ab1998aa8a 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java @@ -19,10 +19,10 @@ import java.util.UUID; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.BLACKHOLE_CONNECTOR; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestBlackHoleConnector { diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java index fc14500a7f3c..c34a33213025 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java @@ -30,7 +30,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; @@ -43,6 +42,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MINUTES; +import static org.assertj.core.api.Assertions.assertThat; public class TestInsertIntoCassandraTable extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java index f0e22e5a5287..bf87f4ff7937 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java @@ -33,7 +33,6 @@ import static io.trino.tempto.Requirements.compose; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tests.product.TestGroups.CASSANDRA; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; @@ -60,6 +59,7 @@ import static java.sql.JDBCType.VARBINARY; import static java.sql.JDBCType.VARCHAR; import static java.util.concurrent.TimeUnit.MINUTES; +import static org.assertj.core.api.Assertions.assertThat; public class TestSelect extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java index ac8c27dc1fa8..3fdc6a3ff855 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java @@ -21,7 +21,6 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tests.product.TestGroups.CASSANDRA; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; @@ -30,6 +29,7 @@ import static io.trino.tests.product.cassandra.TestConstants.KEY_SPACE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestSelectMultiColumnKey extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java index 5a26f4b803ae..f10eafadc7ef 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java @@ -18,10 +18,10 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.CLICKHOUSE; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestClickHouse extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java index 57c64199e8ce..66e29269295d 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java @@ -27,12 +27,12 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.DELTA_LAKE_HDFS; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.Objects.requireNonNull; import static java.util.regex.Matcher.quoteReplacement; +import static org.assertj.core.api.Assertions.assertThat; public abstract class BaseTestDeltaLakeHdfsReads extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java index 60bc6303736c..351ea5a17a1e 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java @@ -22,7 +22,6 @@ import static io.minio.messages.EventType.OBJECT_ACCESSED_GET; import static io.minio.messages.EventType.OBJECT_ACCESSED_HEAD; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.DELTA_LAKE_MINIO; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.MinioNotificationsAssertions.assertNotificationsCount; @@ -32,6 +31,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.assertj.core.api.Assertions.assertThat; public abstract class BaseTestDeltaLakeMinioReads extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java index 75777aa4e1a8..b2b8f06ddc29 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java @@ -22,7 +22,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; @@ -34,6 +33,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeActiveFilesCache extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java index 08b22452cd6c..34f73a07db94 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java @@ -23,7 +23,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_104; @@ -44,6 +43,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class TestDeltaLakeAlterTableCompatibility diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java index 09525cf9d529..1635530bdef3 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java @@ -25,7 +25,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73; @@ -37,6 +36,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeChangeDataFeedCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java index 0d1d9a9a76ba..56dc2c92e85b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java @@ -20,7 +20,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73; @@ -31,6 +30,7 @@ import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry; import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestDeltaLakeCheckConstraintCompatibility diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java index cf0d6d02b7e3..254fa3586461 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java @@ -30,7 +30,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.DataProviders.cartesianProduct; import static io.trino.testing.DataProviders.trueFalse; import static io.trino.testing.TestingNames.randomNameSuffix; @@ -50,6 +49,7 @@ import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertyOnDelta; import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class TestDeltaLakeColumnMappingMode diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java index 717f9b522f23..64c40d1292fe 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java @@ -33,7 +33,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java index 6d7c71fba6e8..ef38b987e350 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java @@ -29,7 +29,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_113; @@ -44,6 +43,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeDatabricksCreateTableAsSelectCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java index 05ace3265a01..5054003d9d2f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java @@ -23,7 +23,6 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; @@ -40,6 +39,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class TestDeltaLakeDatabricksCreateTableCompatibility diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java index fedc2b2d88b6..ba98b1fac3e2 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java @@ -18,7 +18,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_104; @@ -32,6 +31,7 @@ import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry; import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeDatabricksDelete extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java index cb797a65bc1a..63eec996c0f2 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java @@ -29,7 +29,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73; @@ -43,6 +42,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeDatabricksInsertCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java index 802d9e474abd..4abc08735ba1 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java @@ -19,7 +19,6 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; @@ -29,6 +28,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeDatabricksPartitioningCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java index 5a9c2279bf95..ad9f6fc262f9 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java @@ -23,7 +23,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; @@ -34,6 +33,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeDatabricksUpdates extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java index 53e4ac1a27ae..269048e370af 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java @@ -19,12 +19,12 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_GCS; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeGcs extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java index d000a73bf0ae..fcd2dfb578c2 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java @@ -18,13 +18,13 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE; import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeJmx extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java index b24cee7d0833..c5f34d886f60 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java @@ -18,7 +18,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; @@ -28,6 +27,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeProceduresCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java index 19f7070ed50d..2798383913f5 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java @@ -22,7 +22,6 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; @@ -33,6 +32,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java index 495d5062bd66..3f4917cdb762 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java @@ -21,7 +21,6 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73; @@ -33,6 +32,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeTimeTravelCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java index a5763114afd0..e95c95fce2d9 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java @@ -29,7 +29,6 @@ import java.util.stream.IntStream; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; @@ -39,6 +38,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onDelta; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeTransactionLogCache extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java index ec16f6f57beb..0b4dc421faf3 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java @@ -32,7 +32,6 @@ import java.util.stream.Stream; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73; @@ -49,6 +48,7 @@ import static java.util.function.Predicate.not; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeltaLakeWriteDatabricksCompatibility extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java index 05f6a7580f72..e1d2391c5c1c 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java @@ -18,7 +18,6 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS; @@ -27,6 +26,7 @@ import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; public class TestHiveAndDeltaLakeCompatibility diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java index 6d416e36ffce..22c6a4e164ff 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java @@ -33,7 +33,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryExecutor.param; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS; @@ -46,6 +45,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveAndDeltaLakeRedirect extends BaseTestDeltaLakeS3Storage diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java index 2230fd83ad81..c6f73aed646d 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java @@ -17,9 +17,9 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.JSON_FUNCTIONS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestFunctions extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java index 629f3d6a8d4f..45b508e19b1b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java @@ -18,11 +18,11 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.COMPARISON; import static io.trino.tests.product.TestGroups.QUERY_ENGINE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestComparison extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java index 208a35633fe9..c5a801edd8c8 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java @@ -17,10 +17,10 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.LOGICAL; import static io.trino.tests.product.TestGroups.QUERY_ENGINE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestLogical extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java index 56d0ab468581..cbf872c0d361 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java @@ -40,7 +40,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HIVE_ICEBERG_REDIRECTIONS; import static io.trino.tests.product.TestGroups.HIVE_VIEWS; @@ -51,6 +50,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.util.stream.Collectors.joining; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.testng.Assert.assertEquals; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java index d62c601f4214..97b0af34adfe 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java @@ -33,11 +33,11 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.AVRO; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public abstract class BaseTestAvroSchemaEvolution extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java index 606c3c9c1b24..88e550ab2b58 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java @@ -42,7 +42,6 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext; import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle; import static io.trino.tests.product.utils.QueryExecutors.onHive; @@ -63,6 +62,7 @@ import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.testng.Assert.assertEquals; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java index 1c33c37e4300..704ea07cf780 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java @@ -19,10 +19,10 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.hive.util.TableLocationUtils.getTableLocation; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; /** diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java index 6aa2df341b44..00614073c6db 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java @@ -33,7 +33,6 @@ import java.time.LocalDateTime; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle; @@ -65,6 +64,7 @@ import static java.sql.JDBCType.TINYINT; import static java.sql.JDBCType.VARBINARY; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; public class TestAllDatatypesFromHiveConnector extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java index f5f224eae13f..dbfed1b08d65 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java @@ -17,11 +17,11 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.AVRO; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestAvroSchemaLiteral extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java index 6fcb2991ef52..223321694065 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java @@ -23,13 +23,13 @@ import java.nio.file.Path; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryExecutor.param; import static io.trino.tests.product.TestGroups.AVRO; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.nio.file.Files.newInputStream; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; /** * Avro 1.8.2 was not strict about schema validation, causing the more-strict diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java index de49113624a4..9095708040c9 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java @@ -30,7 +30,6 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.AVRO; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES; @@ -39,6 +38,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.nio.file.Files.newInputStream; +import static org.assertj.core.api.Assertions.assertThat; public class TestAvroSchemaUrl extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java index d7cc28a0ffff..ef4ca83f70f7 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java @@ -24,13 +24,13 @@ import java.nio.file.Paths; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.AVRO; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.nio.file.Files.newInputStream; +import static org.assertj.core.api.Assertions.assertThat; public class TestAvroSymlinkInputFormat extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java index c669ff3afeca..94ecf31a6a20 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java @@ -24,7 +24,6 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.AZURE; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES; @@ -33,6 +32,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.assertj.core.api.Assertions.assertThat; public class TestAzureBlobFileSystem extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java index 581303f674a8..652e79e8663b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java @@ -23,7 +23,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES; @@ -31,6 +30,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestCsv extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java index 509f5cdaae55..3a97b21aa160 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java @@ -17,9 +17,9 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestCsvFileHiveTable diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java index 1d1e31ea540e..a4361cf8e821 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java @@ -26,7 +26,6 @@ import static io.trino.tempto.Requirements.compose; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; import static io.trino.tempto.fulfillment.table.hive.tpch.TpchTableDefinitions.NATION; @@ -35,6 +34,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestExternalHiveTable extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java index 2f29c442ccc0..0c9aa289d451 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java @@ -29,7 +29,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ContextDsl.executeWith; import static io.trino.tempto.sql.SqlContexts.createViewAs; import static io.trino.tests.product.TestGroups.AUTHORIZATION; @@ -38,6 +37,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestGrantRevoke extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java index a1e4429d1ced..6b6bfd37dfa8 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java @@ -36,7 +36,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.anyOf; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.PREPARED; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; @@ -59,6 +58,7 @@ import static java.lang.String.join; import static java.sql.JDBCType.VARCHAR; import static java.util.stream.Collectors.joining; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveBucketedTables extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java index cd01af15a9b1..5f473544e059 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java @@ -25,13 +25,13 @@ import static io.airlift.testing.Assertions.assertGreaterThan; import static io.airlift.testing.Assertions.assertGreaterThanOrEqual; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_CACHING; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.hive.util.CachingTestUtils.getCacheStats; import static io.trino.tests.product.utils.QueryAssertions.assertEventually; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class TestHiveCaching diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java index 2004b547219d..f21b44daa8b4 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java @@ -25,7 +25,6 @@ import java.util.Optional; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tests.product.TestGroups.HIVE_COERCION; import static io.trino.tests.product.TestGroups.JDBC; @@ -35,6 +34,7 @@ import static java.sql.JDBCType.BIGINT; import static java.sql.JDBCType.DOUBLE; import static java.util.Locale.ENGLISH; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveCoercionOnPartitionedTable extends BaseTestHiveCoercion diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java index 247683c2410f..16372f70dfee 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java @@ -40,7 +40,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS_DETAILED; import static io.trino.tests.product.utils.JdbcDriverUtils.setSessionProperty; import static io.trino.tests.product.utils.QueryExecutors.onHive; @@ -48,6 +47,7 @@ import static java.lang.String.format; import static java.util.Locale.ENGLISH; import static java.util.stream.Collectors.joining; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveCompatibility extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java index 3203ab777a67..39c91511ca52 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java @@ -20,7 +20,6 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tempto.fulfillment.table.hive.tpch.TpchTableDefinitions.ORDERS; import static io.trino.tests.product.TestGroups.HIVE_COMPRESSION; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java index de3a28aa47f6..f5390fd8a2c0 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java @@ -24,7 +24,6 @@ import java.util.Optional; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HDP3_ONLY; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; @@ -33,6 +32,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.Objects.requireNonNull; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveCreateTable extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java index 5771f5fd2974..28d8dfee5778 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java @@ -26,11 +26,11 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.hive.util.TableLocationUtils.getTablePath; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveHiddenFiles extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java index d50c6e563bda..78401a307fed 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java @@ -24,13 +24,13 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.LOADED; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; import static io.trino.tests.product.hive.HiveTableDefinitions.NATION_PARTITIONED_BY_BIGINT_REGIONKEY; import static io.trino.tests.product.hive.util.TableLocationUtils.getTablePath; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java index 36ed507ebdfd..accad931f3da 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java @@ -19,10 +19,10 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveMaterializedView extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java index 29285c2e6b9c..974d2a29f857 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java @@ -14,7 +14,6 @@ package io.trino.tests.product.hive; import io.trino.tempto.assertions.QueryAssert; -import io.trino.tempto.query.QueryExecutor; import io.trino.tempto.query.QueryResult; import io.trino.tests.product.hive.util.TemporaryHiveTable; import org.testng.SkipException; @@ -28,6 +27,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; +import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_TRANSACTIONAL; import static io.trino.tests.product.hive.BucketingType.BUCKETED_V2; @@ -374,9 +374,9 @@ public void testMergeMultipleRowsMatchFails(String createTableSql) onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Adelphi'), ('Aaron', 8, 'Ashland')", sourceTable)); - assertThat(() -> onTrino().executeQuery(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) + + assertQueryFailure(() -> onTrino().executeQuery(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) + " WHEN MATCHED THEN UPDATE SET address = s.address")) - .failsWithMessage("One MERGE target table row matched more than one source row"); + .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): One MERGE target table row matched more than one source row"); onTrino().executeQuery(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) + " WHEN MATCHED AND s.address = 'Adelphi' THEN UPDATE SET address = s.address"); @@ -662,11 +662,11 @@ public void testMergeOriginalFilesTarget() onTrino().executeQuery(format("CREATE TABLE %s WITH (transactional=true) AS TABLE tpch.tiny.region", targetTable)); // This merge is illegal, because many nations have the same region - assertThat(() -> onTrino().executeQuery(format("MERGE INTO %s r USING tpch.tiny.nation n", targetTable) + + assertQueryFailure(() -> onTrino().executeQuery(format("MERGE INTO %s r USING tpch.tiny.nation n", targetTable) + " ON r.regionkey = n.regionkey" + " WHEN MATCHED" + " THEN UPDATE SET comment = n.comment")) - .failsWithMessage("One MERGE target table row matched more than one source row"); + .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): One MERGE target table row matched more than one source row"); onTrino().executeQuery(format("MERGE INTO %s r USING tpch.tiny.nation n", targetTable) + " ON r.regionkey = n.regionkey AND n.name = 'FRANCE'" + @@ -740,11 +740,6 @@ public Object[][] insertersProvider() }; } - private static QueryResult execute(Engine engine, String sql, QueryExecutor.QueryParam... params) - { - return engine.queryExecutor().executeQuery(sql, params); - } - @DataProvider public Object[][] inserterAndDeleterProvider() { diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java index df2c1ba13651..778249f197cc 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java @@ -15,7 +15,6 @@ import com.google.inject.Inject; import io.trino.tempto.ProductTest; -import io.trino.tempto.assertions.QueryAssert; import io.trino.tempto.fulfillment.table.hive.HiveDataSource; import io.trino.tempto.hadoop.hdfs.HdfsClient; import io.trino.tempto.internal.hadoop.hdfs.HdfsDataSourceWriter; @@ -28,6 +27,7 @@ import java.util.stream.Collectors; import static com.google.common.collect.ImmutableSet.toImmutableSet; +import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createResourceDataSource; import static io.trino.tests.product.TestGroups.HIVE_PARTITIONING; import static io.trino.tests.product.TestGroups.SMOKE; @@ -78,7 +78,7 @@ public void testUnregisterViewTableShouldFail() createPartitionedTable(FIRST_TABLE); createView(VIEW_TABLE, FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> dropPartition(VIEW_TABLE, "col", "a")) + assertQueryFailure(() -> dropPartition(VIEW_TABLE, "col", "a")) .hasMessageContaining("Table is a view: default." + VIEW_TABLE); } @@ -88,7 +88,7 @@ public void testUnregisterMissingTableShouldFail() { createPartitionedTable(FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> dropPartition("missing_table", "col", "f")) + assertQueryFailure(() -> dropPartition("missing_table", "col", "f")) .hasMessageContaining("Table 'default.missing_table' not found"); } @@ -98,7 +98,7 @@ public void testUnregisterUnpartitionedTableShouldFail() { createUnpartitionedTable(SECOND_TABLE); - QueryAssert.assertQueryFailure(() -> dropPartition(SECOND_TABLE, "col", "a")) + assertQueryFailure(() -> dropPartition(SECOND_TABLE, "col", "a")) .hasMessageContaining("Table is not partitioned: default." + SECOND_TABLE); } @@ -108,7 +108,7 @@ public void testUnregisterInvalidPartitionColumnsShouldFail() { createPartitionedTable(FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> dropPartition(FIRST_TABLE, "not_existing_partition_col", "a")) + assertQueryFailure(() -> dropPartition(FIRST_TABLE, "not_existing_partition_col", "a")) .hasMessageContaining("Provided partition column names do not match actual partition column names: [col]"); } @@ -118,7 +118,7 @@ public void testUnregisterMissingPartitionShouldFail() { createPartitionedTable(FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> dropPartition(FIRST_TABLE, "col", "f")) + assertQueryFailure(() -> dropPartition(FIRST_TABLE, "col", "f")) .hasMessageContaining("Partition 'col=f' does not exist"); } @@ -126,7 +126,7 @@ public void testUnregisterMissingPartitionShouldFail() @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH) public void testRegisterPartitionMissingTableShouldFail() { - QueryAssert.assertQueryFailure(() -> addPartition("missing_table", "col", "f", "/")) + assertQueryFailure(() -> addPartition("missing_table", "col", "f", "/")) .hasMessageContaining("Table 'default.missing_table' not found"); } @@ -136,7 +136,7 @@ public void testRegisterUnpartitionedTableShouldFail() { createUnpartitionedTable(SECOND_TABLE); - QueryAssert.assertQueryFailure(() -> addPartition(SECOND_TABLE, "col", "a", "/")) + assertQueryFailure(() -> addPartition(SECOND_TABLE, "col", "a", "/")) .hasMessageContaining("Table is not partitioned: default." + SECOND_TABLE); } @@ -147,7 +147,7 @@ public void testRegisterViewTableShouldFail() createPartitionedTable(FIRST_TABLE); createView(VIEW_TABLE, FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> addPartition(VIEW_TABLE, "col", "a", "/")) + assertQueryFailure(() -> addPartition(VIEW_TABLE, "col", "a", "/")) .hasMessageContaining("Table is a view: default." + VIEW_TABLE); } @@ -157,7 +157,7 @@ public void testRegisterPartitionCollisionShouldFail() { createPartitionedTable(FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "a", "/")) + assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "a", "/")) .hasMessageContaining("Partition [col=a] is already registered"); } @@ -167,7 +167,7 @@ public void testRegisterPartitionInvalidPartitionColumnsShouldFail() { createPartitionedTable(FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> addPartition(FIRST_TABLE, "not_existing_partition_col", "a", "/")) + assertQueryFailure(() -> addPartition(FIRST_TABLE, "not_existing_partition_col", "a", "/")) .hasMessageContaining("Provided partition column names do not match actual partition column names: [col]"); } @@ -177,7 +177,7 @@ public void testRegisterPartitionInvalidLocationShouldFail() { createPartitionedTable(FIRST_TABLE); - QueryAssert.assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "f", "/some/non/existing/path")) + assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "f", "/some/non/existing/path")) .hasMessageContaining("Partition location does not exist: /some/non/existing/path"); } diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java index 347c08615dda..2fbe7ebe2c5f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java @@ -26,13 +26,13 @@ import java.util.function.Supplier; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.hive.util.TemporaryHiveTable.temporaryHiveTable; import static io.trino.tests.product.utils.JdbcDriverUtils.setSessionProperty; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestHivePartitionSchemaEvolution extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java index 8052480d7419..67584db0bb44 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java @@ -35,7 +35,6 @@ import static io.trino.tempto.Requirements.compose; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createResourceDataSource; @@ -48,6 +47,7 @@ import static java.lang.Math.min; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.testng.Assert.assertEquals; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java index 84c47edb4a9d..5febb4c55440 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java @@ -21,10 +21,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_VIEWS; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestHivePropertiesTable extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java index 3fe1f13b785d..de5c3ddc8b2c 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java @@ -23,13 +23,13 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HIVE_HUDI_REDIRECTIONS; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onHudi; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveRedirectionToHudi extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java index cd28b7c9ab4e..c3ef50741232 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java @@ -25,7 +25,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryExecutor.param; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HIVE_ICEBERG_REDIRECTIONS; @@ -33,6 +32,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveRedirectionToIceberg extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java index 2126a311dc1a..31e6ebefa986 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java @@ -24,12 +24,12 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.LOADED; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; import static io.trino.tests.product.hive.HiveTableDefinitions.NATION_PARTITIONED_BY_BIGINT_REGIONKEY; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveRequireQueryPartitionsFilter extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java index f34194cc900a..9044ef6969cc 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java @@ -31,11 +31,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.Objects.requireNonNull; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveSchema extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java index 942747255f0f..532ace4dfb03 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java @@ -26,7 +26,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HIVE_SPARK; import static io.trino.tests.product.TestGroups.HIVE_SPARK_NO_STATS_FALLBACK; @@ -38,6 +37,7 @@ import static java.lang.String.join; import static java.util.Collections.nCopies; import static java.util.Locale.ENGLISH; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveSparkCompatibility extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java index 5605372cb356..7c3c98672472 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java @@ -59,7 +59,6 @@ import static io.trino.plugin.hive.HiveTimestampPrecision.MILLISECONDS; import static io.trino.plugin.hive.HiveTimestampPrecision.NANOSECONDS; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryExecutor.param; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HMS_ONLY; @@ -78,6 +77,7 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveStorageFormats extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java index 567c5330bc17..1512451a5538 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java @@ -32,7 +32,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.anyOf; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; import static io.trino.tempto.fulfillment.table.hive.tpch.TpchTableDefinitions.NATION; @@ -45,6 +44,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveTableStatistics extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java index c2dde16d46e4..6a1718f23343 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java @@ -55,7 +55,6 @@ import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HIVE_TRANSACTIONAL; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; @@ -75,6 +74,7 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toUnmodifiableList; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java index d799bbbf0e92..07cfa1f9dc4b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java @@ -18,12 +18,12 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_TRANSACTIONAL; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.Locale.ENGLISH; import static java.util.stream.Collectors.joining; +import static org.assertj.core.api.Assertions.assertThat; public class TestHiveTransactionalTableInsert extends HiveProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java index 2a011fe138e3..6714de397a5e 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java @@ -23,12 +23,12 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_VIEW_COMPATIBILITY; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onCompatibilityTestServer; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; @Requires(ImmutableNationTable.class) public class TestHiveViewCompatibility diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java index 54d36e7bcce0..bc84ee4f2995 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java @@ -28,12 +28,12 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_VIEWS; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @Requires({ diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java index 4c68942ae460..5aa21f74550b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java @@ -27,12 +27,12 @@ import java.util.List; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_VIEWS; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES; import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @Requires({ diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java index b7be55de10ff..080bb706d6c8 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java @@ -28,7 +28,6 @@ import static io.trino.tempto.Requirements.compose; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; @@ -36,6 +35,7 @@ import static io.trino.tests.product.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_TEXTFILE; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; public class TestInsertIntoHiveTable extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java index c38837f8d2f1..3ce925d1e6b9 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java @@ -24,12 +24,12 @@ import static com.google.common.io.Resources.getResource; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.AVRO; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestParquetSymlinkInputFormat { diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java index 7fa4c5cfa5a3..439bd97f61a1 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java @@ -20,7 +20,6 @@ import com.google.inject.name.Named; import io.trino.tempto.AfterMethodWithContext; import io.trino.tempto.BeforeMethodWithContext; -import io.trino.tempto.assertions.QueryAssert; import io.trino.tempto.query.QueryExecutor; import io.trino.tempto.query.QueryResult; import org.testng.SkipException; @@ -32,6 +31,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.anyOf; +import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; import static io.trino.tests.product.TestGroups.AUTHORIZATION; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.TestGroups.ROLES; @@ -122,14 +122,14 @@ public void testListGrants() onTrino().executeQuery("CREATE TABLE test_list_grants(c int)"); - QueryAssert.assertThat(onTrino().executeQuery("SHOW GRANTS")) + assertThat(onTrino().executeQuery("SHOW GRANTS")) .contains( row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "SELECT", "YES", null), row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "INSERT", "YES", null), row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "UPDATE", "YES", null), row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "DELETE", "YES", null)); - QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM information_schema.table_privileges")) + assertThat(onTrino().executeQuery("SELECT * FROM information_schema.table_privileges")) .contains( row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "SELECT", "YES", null), row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "INSERT", "YES", null), @@ -143,14 +143,14 @@ public void testListGrants() public void testCreateDuplicateRole() { onTrino().executeQuery(format("CREATE ROLE %s IN hive", ROLE1)); - QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(format("CREATE ROLE %s IN hive", ROLE1))) + assertQueryFailure(() -> onTrino().executeQuery(format("CREATE ROLE %s IN hive", ROLE1))) .hasMessageContaining("Role '%s' already exists", ROLE1); } @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS}) public void testDropNonExistentRole() { - QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(format("DROP ROLE %s IN hive", ROLE3))) + assertQueryFailure(() -> onTrino().executeQuery(format("DROP ROLE %s IN hive", ROLE3))) .hasMessageContaining("Role '%s' does not exist", ROLE3); } @@ -159,27 +159,27 @@ public void testCreateDropRoleAccessControl() { // Only users that are granted with "admin" role can create, drop and list roles // Alice is not granted with "admin" role - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery(format("CREATE ROLE %s IN hive", ROLE3))) + assertQueryFailure(() -> onPrestoAlice().executeQuery(format("CREATE ROLE %s IN hive", ROLE3))) .hasMessageContaining("Cannot create role %s", ROLE3); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery(format("DROP ROLE %s IN hive", ROLE3))) + assertQueryFailure(() -> onPrestoAlice().executeQuery(format("DROP ROLE %s IN hive", ROLE3))) .hasMessageContaining("Cannot drop role %s", ROLE3); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.roles")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.roles")) .hasMessageContaining("Cannot select from table information_schema.roles"); } @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS}) public void testPublicRoleIsGrantedToEveryone() { - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .contains(row("alice", "USER", "public", "NO")); - QueryAssert.assertThat(onPrestoBob().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoBob().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .contains(row("bob", "USER", "public", "NO")); } @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS}) public void testAdminRoleIsGrantedToHdfs() { - QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .contains(row(userName, "USER", "admin", anyOf("YES", "NO"))); } @@ -188,7 +188,7 @@ public void testGrantRoleToUser() { onTrino().executeQuery("CREATE ROLE role1 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO")); @@ -201,7 +201,7 @@ public void testGrantRoleToRole() onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), @@ -215,7 +215,7 @@ public void testGrantRoleWithAdminOption() onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "YES"), @@ -235,7 +235,7 @@ public void testGrantRoleMultipleTimes() onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "YES"), @@ -247,13 +247,13 @@ public void testRevokeRoleFromUser() { onTrino().executeQuery("CREATE ROLE role1 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO")); onTrino().executeQuery("REVOKE role1 FROM USER alice IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO")); } @@ -265,14 +265,14 @@ public void testRevokeRoleFromRole() onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), row("role1", "ROLE", "role2", "NO")); onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO")); @@ -283,7 +283,7 @@ public void testRevokeRoleFromOwner() { try { onPrestoAlice().executeQuery("CREATE TABLE hive.default.test_table (foo BIGINT)"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of( row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "SELECT", "YES", null), row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "DELETE", "YES", null), @@ -293,7 +293,7 @@ public void testRevokeRoleFromOwner() onTrino().executeQuery("REVOKE SELECT ON hive.default.test_table FROM USER alice"); // now there should be no SELECT privileges shown even though alice has OWNERSHIP - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of( row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "DELETE", "YES", null), row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "UPDATE", "YES", null), @@ -309,13 +309,13 @@ public void testDropGrantedRole() { onTrino().executeQuery("CREATE ROLE role1 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO")); onTrino().executeQuery("DROP ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO")); } @@ -327,14 +327,14 @@ public void testRevokeTransitiveRoleFromUser() onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), row("role1", "ROLE", "role2", "NO")); onTrino().executeQuery("REVOKE role1 FROM USER alice IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO")); } @@ -348,7 +348,7 @@ public void testRevokeTransitiveRoleFromRole() onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive"); onTrino().executeQuery("GRANT role3 TO ROLE role2 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), @@ -356,7 +356,7 @@ public void testRevokeTransitiveRoleFromRole() row("role2", "ROLE", "role3", "NO")); onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO")); @@ -371,7 +371,7 @@ public void testDropTransitiveRole() onTrino().executeQuery("GRANT role1 TO USER alice IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive"); onTrino().executeQuery("GRANT role3 TO ROLE role2 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), @@ -379,7 +379,7 @@ public void testDropTransitiveRole() row("role2", "ROLE", "role3", "NO")); onTrino().executeQuery("DROP ROLE role2 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO")); @@ -392,7 +392,7 @@ public void testRevokeAdminOption() onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "YES"), @@ -401,7 +401,7 @@ public void testRevokeAdminOption() onTrino().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER alice IN hive"); onTrino().executeQuery("REVOKE ADMIN OPTION FOR role2 FROM ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), @@ -415,7 +415,7 @@ public void testRevokeMultipleTimes() onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive"); onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "YES"), @@ -426,7 +426,7 @@ public void testRevokeMultipleTimes() onTrino().executeQuery("REVOKE ADMIN OPTION FOR role2 FROM ROLE role1 IN hive"); onTrino().executeQuery("REVOKE ADMIN OPTION FOR role2 FROM ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO"), row("alice", "USER", "role1", "NO"), @@ -437,7 +437,7 @@ public void testRevokeMultipleTimes() onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive"); onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles")) .containsOnly( row("alice", "USER", "public", "NO")); } @@ -448,13 +448,13 @@ public void testGrantRevokeRoleAccessControl() onTrino().executeQuery("CREATE ROLE role1 IN hive"); onTrino().executeQuery("CREATE ROLE role2 IN hive"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive")) .hasMessageContaining("Cannot grant roles [role1] to [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive")) .hasMessageContaining("Cannot grant roles [role1] to [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive")) .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive")) .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]"); onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive"); @@ -466,13 +466,13 @@ public void testGrantRevokeRoleAccessControl() onTrino().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER alice IN hive"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive")) .hasMessageContaining("Cannot grant roles [role1] to [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive")) .hasMessageContaining("Cannot grant roles [role1] to [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive")) .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive")) .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]"); onTrino().executeQuery("GRANT role2 TO USER alice IN hive"); @@ -485,13 +485,13 @@ public void testGrantRevokeRoleAccessControl() onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM ROLE role2 IN hive"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive")) .hasMessageContaining("Cannot grant roles [role1] to [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive")) .hasMessageContaining("Cannot grant roles [role1] to [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive")) .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]"); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive")) .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]"); } @@ -506,7 +506,7 @@ public void testSetRole() onTrino().executeQuery("GRANT role3 TO ROLE role2 IN hive"); onPrestoAlice().executeQuery("SET ROLE ALL IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public"), row("role1"), @@ -514,12 +514,12 @@ public void testSetRole() row("role3")); onPrestoAlice().executeQuery("SET ROLE NONE IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public")); onPrestoAlice().executeQuery("SET ROLE role1 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public"), row("role1"), @@ -527,14 +527,14 @@ public void testSetRole() row("role3")); onPrestoAlice().executeQuery("SET ROLE role2 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public"), row("role2"), row("role3")); onPrestoAlice().executeQuery("SET ROLE role3 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public"), row("role3")); @@ -544,11 +544,11 @@ public void testSetRole() public void testSetAdminRole() { onTrino().executeQuery("SET ROLE NONE IN hive"); - QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public")); onTrino().executeQuery("SET ROLE admin IN hive"); - QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) + assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles")) .containsOnly( row("public"), row("admin")); @@ -557,21 +557,21 @@ public void testSetAdminRole() @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS}) public void testShowRoles() { - QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLES FROM hive")) + assertThat(onTrino().executeQuery("SHOW ROLES FROM hive")) .containsOnly( row("public"), row("admin")); onTrino().executeQuery("CREATE ROLE role1 IN hive"); - QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLES FROM hive")) + assertThat(onTrino().executeQuery("SHOW ROLES FROM hive")) .containsOnly( row("public"), row("admin"), row("role1")); - QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("SHOW ROLES FROM hive")) + assertQueryFailure(() -> onPrestoAlice().executeQuery("SHOW ROLES FROM hive")) .hasMessageContaining("Cannot show roles"); onTrino().executeQuery("GRANT admin TO alice IN hive"); onPrestoAlice().executeQuery("SET ROLE admin IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW ROLES FROM hive")) + assertThat(onPrestoAlice().executeQuery("SHOW ROLES FROM hive")) .containsOnly( row("public"), row("admin"), @@ -581,20 +581,20 @@ public void testShowRoles() @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS}) public void testShowCurrentRoles() { - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive")) + assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive")) .containsOnly( row("public")); onTrino().executeQuery("CREATE ROLE role1 IN hive"); onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO alice IN hive"); onTrino().executeQuery("GRANT role2 TO alice IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive")) + assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive")) .containsOnly( row("public"), row("role1"), row("role2")); onPrestoAlice().executeQuery("SET ROLE role2 IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive")) + assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive")) .containsOnly( row("public"), row("role2")); @@ -603,22 +603,22 @@ public void testShowCurrentRoles() @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS}) public void testShowRoleGrants() { - QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive")) + assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive")) .containsOnly( row("public"), row("admin")); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive")) + assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive")) .containsOnly( row("public")); onTrino().executeQuery("CREATE ROLE role1 IN hive"); onTrino().executeQuery("CREATE ROLE role2 IN hive"); onTrino().executeQuery("GRANT role1 TO alice IN hive"); onTrino().executeQuery("GRANT role2 TO role1 IN hive"); - QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive")) + assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive")) .containsOnly( row("public"), row("admin")); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive")) + assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive")) .containsOnly( row("public"), row("role1")); @@ -671,14 +671,14 @@ public void testAdminCanShowAllGrants() onTrino().executeQuery("GRANT admin TO alice IN hive"); onPrestoAlice().executeQuery("SET ROLE ADMIN IN hive"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice")) .containsOnly(ImmutableList.of( row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "SELECT", "YES", null), row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "DELETE", "YES", null), row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "UPDATE", "YES", null), row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "INSERT", "YES", null))); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob")) .containsOnly(ImmutableList.of( row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "SELECT", "YES", null), row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "DELETE", "YES", null), @@ -688,7 +688,7 @@ public void testAdminCanShowAllGrants() onPrestoAlice().executeQuery("GRANT SELECT ON hive.default.test_table_alice TO bob WITH GRANT OPTION"); onPrestoAlice().executeQuery("GRANT INSERT ON hive.default.test_table_alice TO bob"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice")) .containsOnly(ImmutableList.of( row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "SELECT", "YES", null), row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "DELETE", "YES", null), @@ -714,20 +714,20 @@ public void testAdminCanShowGrantsOnlyFromCurrentSchema() onPrestoAlice().executeQuery("SET ROLE ADMIN IN hive"); onPrestoAlice().executeQuery("CREATE TABLE hive.test.test_table_bob (foo BIGINT) with (external_location='/tmp')"); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob")) .containsOnly(ImmutableList.of( row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "SELECT", "YES", null), row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "DELETE", "YES", null), row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "UPDATE", "YES", null), row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "INSERT", "YES", null))); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.test.test_table_bob")) + assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.test.test_table_bob")) .containsOnly(ImmutableList.of( row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "SELECT", "YES", null), row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "DELETE", "YES", null), row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "UPDATE", "YES", null), row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "INSERT", "YES", null))); - QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.table_privileges where table_name = 'test_table_bob'")) + assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.table_privileges where table_name = 'test_table_bob'")) .containsOnly(ImmutableList.of( row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "SELECT", "YES", null), row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "DELETE", "YES", null), @@ -767,7 +767,7 @@ public void testSetRoleTablePermissions() onPrestoBob().executeQuery(select); onPrestoBob().executeQuery(insert); - QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of( row("alice", "USER", "role1", "ROLE", "hive", "default", "test_table", "SELECT", "NO", null), row("alice", "USER", "role2", "ROLE", "hive", "default", "test_table", "INSERT", "NO", null))); @@ -775,32 +775,32 @@ public void testSetRoleTablePermissions() onPrestoBob().executeQuery("SET ROLE ALL IN hive"); onPrestoBob().executeQuery(select); onPrestoBob().executeQuery(insert); - QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of( row("alice", "USER", "role1", "ROLE", "hive", "default", "test_table", "SELECT", "NO", null), row("alice", "USER", "role2", "ROLE", "hive", "default", "test_table", "INSERT", "NO", null))); onPrestoBob().executeQuery("SET ROLE NONE IN hive"); - QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(select)) + assertQueryFailure(() -> onPrestoBob().executeQuery(select)) .hasMessageContaining("Access Denied"); - QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(insert)) + assertQueryFailure(() -> onPrestoBob().executeQuery(insert)) .hasMessageContaining("Access Denied"); - QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of()); onPrestoBob().executeQuery("SET ROLE role1 IN hive"); onPrestoBob().executeQuery(select); - QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(insert)) + assertQueryFailure(() -> onPrestoBob().executeQuery(insert)) .hasMessageContaining("Access Denied"); - QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of( row("alice", "USER", "role1", "ROLE", "hive", "default", "test_table", "SELECT", "NO", null))); onPrestoBob().executeQuery("SET ROLE role2 IN hive"); - QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(select)) + assertQueryFailure(() -> onPrestoBob().executeQuery(select)) .hasMessageContaining("Access Denied"); onPrestoBob().executeQuery(insert); - QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) + assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table")) .containsOnly(ImmutableList.of( row("alice", "USER", "role2", "ROLE", "hive", "default", "test_table", "INSERT", "NO", null))); @@ -810,11 +810,11 @@ public void testSetRoleTablePermissions() private static void assertAdminExecute(String query) { onTrino().executeQuery("SET ROLE NONE IN hive"); - QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(query)) + assertQueryFailure(() -> onTrino().executeQuery(query)) .hasMessageContaining("Access Denied"); onTrino().executeQuery("SET ROLE ALL IN hive"); - QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(query)) + assertQueryFailure(() -> onTrino().executeQuery(query)) .hasMessageContaining("Access Denied"); onTrino().executeQuery("SET ROLE admin IN hive"); diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java index 6e3fcb184537..9a416f117374 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java @@ -21,12 +21,12 @@ import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.AUTHORIZATION; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.connectToTrino; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestSqlStandardAccessControlChecks extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java index 18b3303d0dcd..316e022ba94a 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java @@ -30,12 +30,12 @@ import static io.trino.tempto.Requirements.allOf; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.LOADED; import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable; import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createResourceDataSource; import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createStringDataSource; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestTablePartitioningSelect extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java index 7052dcf12d26..0564f48a081e 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java @@ -20,11 +20,11 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HIVE_PARTITIONING; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestTablePartitioningWithSpecialChars extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java index dd3acbe30510..017202f2891b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java @@ -25,10 +25,10 @@ import java.io.InputStream; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.utils.QueryExecutors.onHive; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestTextFileHiveTable diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java index 1ca9026ec68b..591f4a4b98d2 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java @@ -17,11 +17,11 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestWriteToHiveTransactionalTableInTrino extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java index aa8eb469fbf0..d7e6cddd6d38 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java @@ -24,7 +24,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HUDI; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; @@ -32,6 +31,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.assertj.core.api.Assertions.assertThat; public class TestHudiSparkCompatibility extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java index 1258f54fab42..fa0fd3ac9e23 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java @@ -21,13 +21,13 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestIcebergCreateTable extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java index 770610ab3cd7..9e0c5ff876f1 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java @@ -21,13 +21,13 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.ICEBERG_FORMAT_VERSION_COMPATIBILITY; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onCompatibilityTestServer; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class TestIcebergFormatVersionCompatibility diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java index ce0021ef2bdc..7564761a75a0 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java @@ -24,12 +24,12 @@ import static com.google.common.collect.Iterators.getOnlyElement; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; public class TestIcebergHiveMetadataListing extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java index f89631145eaa..d583b849a083 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java @@ -18,13 +18,13 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests interactions between Iceberg and Hive connectors, when one tries to read a table created by the other. diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java index 84f7cff66aed..e6d9d9b7b60b 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java @@ -22,12 +22,12 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; /** diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java index 66b7f142d964..9aecac6f802f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java @@ -30,13 +30,13 @@ import java.util.stream.IntStream; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS_DETAILED; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; public class TestIcebergInsert extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java index 310edc520472..33a8d7e5893f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java @@ -21,13 +21,13 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onSpark; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests compatibility between Iceberg connector and Spark Iceberg. diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java index 8dedd114b261..57a9f8184a69 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java @@ -19,11 +19,11 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onSpark; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestIcebergPartitionEvolution extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java index 051c395c5b46..ff16728efc00 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java @@ -21,7 +21,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; @@ -30,6 +29,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onSpark; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestIcebergProcedureCalls diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java index 50c1df6672a8..c6af9f895a12 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java @@ -26,7 +26,6 @@ import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryExecutor.param; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HIVE_ICEBERG_REDIRECTIONS; @@ -34,6 +33,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests interactions between Iceberg and Hive connectors, when one tries to read a table created by the other diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java index d5a1594e9c98..1d821cc4fde7 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java @@ -17,12 +17,12 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.tests.product.TestGroups.HMS_ONLY; import static io.trino.tests.product.TestGroups.ICEBERG; import static io.trino.tests.product.TestGroups.STORAGE_FORMATS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestIcebergRenameTable diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java index febcb90adffb..f34559cc74ba 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java @@ -58,7 +58,6 @@ import static io.trino.tempto.assertions.QueryAssert.Row; import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.testing.DataProviders.cartesianProduct; import static io.trino.testing.DataProviders.toDataProvider; import static io.trino.testing.TestingNames.randomNameSuffix; @@ -80,6 +79,7 @@ import static java.util.Locale.ENGLISH; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toUnmodifiableSet; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java index fd2959220b08..25ad5fc6fc0c 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java @@ -18,10 +18,10 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.IGNITE; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestIgnite extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java index 19a653a84df7..f44062a12260 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java @@ -40,12 +40,12 @@ import java.sql.ResultSet; import static com.google.common.base.Preconditions.checkState; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryResult.forResultSet; import static io.trino.tests.product.TestGroups.OAUTH2; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; public class TestExternalAuthorizerOAuth2 extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java index 762957252d01..41a0b4055157 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java @@ -44,12 +44,12 @@ import java.util.function.Consumer; import static com.google.common.base.Preconditions.checkState; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.query.QueryResult.forResultSet; import static io.trino.tests.product.TestGroups.OAUTH2_REFRESH; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; public class TestExternalAuthorizerOAuth2RefreshToken extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java index de3847e4f684..6035c5e836c2 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java @@ -31,7 +31,6 @@ import static io.trino.tempto.Requirements.compose; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java index e15810ce9a77..5d7377cbc100 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java @@ -22,7 +22,6 @@ import java.sql.DriverManager; import java.sql.SQLException; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.ImmutableLdapObjectDefinitions.CHILD_GROUP_USER; import static io.trino.tests.product.ImmutableLdapObjectDefinitions.ORPHAN_USER; import static io.trino.tests.product.ImmutableLdapObjectDefinitions.PARENT_GROUP_USER; @@ -35,6 +34,7 @@ import static io.trino.tests.product.TestGroups.TRINO_JDBC; import static io.trino.tests.product.TpchTableResults.PRESTO_NATION_RESULT; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; public class TestLdapTrinoJdbc diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java index 2a6660056a97..4640c593e3f4 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java @@ -30,7 +30,6 @@ import java.sql.Timestamp; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED; import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; @@ -55,6 +54,7 @@ import static java.sql.JDBCType.TINYINT; import static java.sql.JDBCType.VARBINARY; import static java.sql.JDBCType.VARCHAR; +import static org.assertj.core.api.Assertions.assertThat; // TODO Consider merging this class with TestJdbcPreparedStatement public class TestPreparedStatements diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java index c3680b9db5f2..f7907d57f8a0 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java @@ -48,7 +48,6 @@ import java.util.Map; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext; import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle; import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder; @@ -60,6 +59,7 @@ import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; @Test(singleThreaded = true) public class TestKafkaAvroReadsSmokeTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java index ce382203397e..ec051722b4ca 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java @@ -18,11 +18,11 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.KAFKA; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestKafkaAvroWritesSmokeTest extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java index e35efa03f963..ccb114198abd 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java @@ -41,7 +41,6 @@ import java.util.Map; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext; import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle; import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder; @@ -55,6 +54,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; @Test(singleThreaded = true) public class TestKafkaProtobufReadsSmokeTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java index 77f66dc7fb16..79eb5badcecb 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java @@ -26,13 +26,13 @@ import static io.trino.tempto.assertions.QueryAssert.Row.row; import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext; import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle; import static io.trino.tests.product.TestGroups.KAFKA; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestKafkaProtobufWritesSmokeTest extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java index 242765b2b1b3..c508172152f6 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java @@ -28,13 +28,13 @@ import java.util.stream.LongStream; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder; import static io.trino.tests.product.TestGroups.KAFKA; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestKafkaPushdownSmokeTest extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java index eb2cd22ca3ab..52c0a8c79c8f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java @@ -33,7 +33,6 @@ import java.time.LocalTime; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder; import static io.trino.tests.product.TestGroups.KAFKA; @@ -42,6 +41,7 @@ import static java.lang.Double.doubleToRawLongBits; import static java.lang.Float.floatToIntBits; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestKafkaReadsSmokeTest extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java index f7b5e1db847b..774b21341756 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java @@ -24,11 +24,11 @@ import java.time.LocalTime; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.KAFKA; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestKafkaWritesSmokeTest extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java index 7d185402015a..4ec06c9acb26 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java @@ -19,11 +19,11 @@ import java.util.UUID; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.KUDU; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestKuduConnectoKerberosSmokeTest { diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java index c8b32f316af7..945946f0f53f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java @@ -18,10 +18,10 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.MARIADB; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestMariaDb extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java index 741a592599bd..191e8f13d95c 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java @@ -20,12 +20,12 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.MYSQL; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onMySql; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestCreateTableAsSelect extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java index 0a0a01df614d..e48ccb8f8b6c 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java @@ -19,12 +19,12 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.MYSQL; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onMySql; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestJdbcDynamicFilteringJmx extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java index c0676e7d2eba..3d2ca3b1884d 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java @@ -18,10 +18,10 @@ import org.testng.annotations.Test; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.PHOENIX; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestPhoenix extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java index 72aae809314b..3920060777c0 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java @@ -25,7 +25,6 @@ import java.sql.Date; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.TestGroups.SQL_SERVER; @@ -34,6 +33,7 @@ import static io.trino.tests.product.utils.QueryExecutors.onSqlServer; import static io.trino.tests.product.utils.QueryExecutors.onTrino; import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; public class TestInsert extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java index f2864a0a09a6..075dc9af468f 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java @@ -28,7 +28,6 @@ import static io.trino.tempto.Requirements.compose; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable; import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS; import static io.trino.tests.product.TestGroups.SQL_SERVER; @@ -50,6 +49,7 @@ import static java.sql.JDBCType.TIMESTAMP; import static java.sql.JDBCType.VARCHAR; import static java.util.Collections.nCopies; +import static org.assertj.core.api.Assertions.assertThat; public class TestSelect extends ProductTest diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java index 83e48f196e55..f13fb80a6976 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java @@ -21,9 +21,9 @@ import java.time.LocalDateTime; import static io.trino.tempto.assertions.QueryAssert.Row.row; -import static io.trino.tempto.assertions.QueryAssert.assertThat; import static io.trino.tests.product.TestGroups.FUNCTIONS; import static io.trino.tests.product.utils.QueryExecutors.onTrino; +import static org.assertj.core.api.Assertions.assertThat; public class TestTeradataFunctions extends ProductTest