Skip to content

Commit

Permalink
Use uniform Assertions AssertJ class
Browse files Browse the repository at this point in the history 
According to javadocs, the `AssertionsFor(Class|Interface)Types` were
introduced to circumvent type inference issues with generic classes in
Java 8. But it seems that we don't have these issues in our code base,
so it looks like importing from these classes was just a mistake.
  • Loading branch information
@ksobolew @wendigo
ksobolew authored and wendigo committed Sep 13, 2023
1 parent 77e5bd2 commit 83d9c6e
Show file tree
Hide file tree
Showing 32 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpiller.java
View file
Expand Up @@ -48,7 +48,7 @@
import static io.trino.spi.type.VarbinaryType.VARBINARY;
import static java.nio.file.Files.newInputStream;
import static java.util.concurrent.Executors.newCachedThreadPool;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

Expand Down
2 changes: 1 addition & 1 deletion lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3HadoopPaths.java
View file
Expand Up @@ -20,7 +20,7 @@
import java.net.URI;

import static io.trino.filesystem.hdfs.HadoopPaths.hadoopPath;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestS3HadoopPaths
{
Expand Down
2 changes: 1 addition & 1 deletion lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestHiveFormatUtils.java
View file
Expand Up @@ -18,7 +18,7 @@
import java.time.LocalDate;

import static io.trino.hive.formats.HiveFormatUtils.parseHiveDate;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestHiveFormatUtils
{
Expand Down
4 changes: 2 additions & 2 deletions lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroBase.java
View file
Expand Up @@ -82,8 +82,8 @@
import static io.trino.spi.type.VarcharType.VARCHAR;
import static java.lang.Double.doubleToLongBits;
import static java.lang.Float.floatToIntBits;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.within;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.within;

public abstract class TestAvroBase
{
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithAvroNativeTypeManagement.java
View file
Expand Up @@ -56,7 +56,7 @@
import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.UUID_SCHEMA;
import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.padBigEndianToSize;
import static io.trino.spi.type.Decimals.MAX_SHORT_PRECISION;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestAvroPageDataReaderWithAvroNativeTypeManagement
extends TestAvroBase
Expand Down
2 changes: 1 addition & 1 deletion ...ts/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithoutTypeManager.java
View file
Expand Up @@ -45,7 +45,7 @@
import static io.trino.block.BlockAssertions.createStringsBlock;
import static io.trino.spi.type.IntegerType.INTEGER;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestAvroPageDataReaderWithoutTypeManager
extends TestAvroBase
Expand Down
2 changes: 1 addition & 1 deletion ...ts/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataWriterWithoutTypeManager.java
View file
Expand Up @@ -45,7 +45,7 @@
import static io.trino.spi.type.SmallintType.SMALLINT;
import static io.trino.spi.type.TinyintType.TINYINT;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestAvroPageDataWriterWithoutTypeManager
extends TestAvroBase
Expand Down
4 changes: 2 additions & 2 deletions lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestLongFromBigEndian.java
View file
Expand Up @@ -23,8 +23,8 @@
import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.fitBigEndianValueToByteArraySize;
import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.fromBigEndian;
import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.padBigEndianToSize;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestLongFromBigEndian
{
Expand Down
4 changes: 2 additions & 2 deletions lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestLineBuffer.java
View file
Expand Up @@ -24,8 +24,8 @@
import static io.airlift.slice.SizeOf.sizeOf;
import static java.lang.Math.min;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestLineBuffer
{
Expand Down
2 changes: 1 addition & 1 deletion ...rmats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileReaderWriter.java
View file
Expand Up @@ -60,7 +60,7 @@
import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_CODEC;
import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_TYPE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
Expand Down
2 changes: 1 addition & 1 deletion lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/RcFileTester.java
View file
Expand Up @@ -110,7 +110,7 @@
import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.getStandardStructObjectInspector;
import static org.apache.hadoop.mapred.Reporter.NULL;
import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_CODEC;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
Expand Down
2 changes: 1 addition & 1 deletion lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetReaderMemoryUsage.java
View file
Expand Up @@ -35,7 +35,7 @@
import static io.trino.parquet.ParquetTestUtils.writeParquetFile;
import static io.trino.spi.type.BigintType.BIGINT;
import static io.trino.spi.type.IntegerType.INTEGER;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestParquetReaderMemoryUsage
{
Expand Down
2 changes: 1 addition & 1 deletion ...rquet/src/test/java/org/apache/parquet/column/values/dictionary/TestDictionaryWriter.java
View file
Expand Up @@ -46,7 +46,7 @@
import static io.trino.parquet.reader.flat.LongColumnAdapter.LONG_ADAPTER;
import static org.apache.parquet.column.Encoding.PLAIN;
import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestDictionaryWriter
{
Expand Down
2 changes: 1 addition & 1 deletion ...ino-plugin-toolkit/src/test/java/io/trino/plugin/base/logging/TestFormatInterpolator.java
View file
Expand Up @@ -15,7 +15,7 @@

import org.testng.annotations.Test;

import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestReusableConnectionFactory.java
View file
Expand Up @@ -24,7 +24,7 @@
import static com.google.common.base.Preconditions.checkState;
import static java.lang.Thread.sleep;
import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestReusableConnectionFactory
{
Expand Down
2 changes: 1 addition & 1 deletion ...in/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestStaticCredentialsConfig.java
View file
Expand Up @@ -26,7 +26,7 @@

import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;

Expand Down
2 changes: 1 addition & 1 deletion ...rino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaFailureRecoveryTest.java
View file
Expand Up @@ -26,7 +26,7 @@
import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_GET_RESULTS_REQUEST_TIMEOUT;
import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_MANAGEMENT_REQUEST_FAILURE;
import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_MANAGEMENT_REQUEST_TIMEOUT;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public abstract class BaseDeltaFailureRecoveryTest
extends BaseFailureRecoveryTest
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMetadata.java
View file
Expand Up @@ -94,8 +94,8 @@
import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
import static java.nio.file.Files.createTempDirectory;
import static java.util.Locale.ENGLISH;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestDeltaLakeMetadata
{
Expand Down
2 changes: 1 addition & 1 deletion ...ta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressionParser.java
View file
Expand Up @@ -18,7 +18,7 @@
import org.testng.annotations.Test;

import static io.trino.plugin.deltalake.expression.SparkExpressionParser.createExpression;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestSparkExpressionParser
Expand Down
2 changes: 1 addition & 1 deletion ...ke/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeSchemaSupport.java
View file
Expand Up @@ -69,7 +69,7 @@
import static io.trino.type.IntervalDayTimeType.INTERVAL_DAY_TIME;
import static io.trino.type.IntervalYearMonthType.INTERVAL_YEAR_MONTH;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.testng.Assert.assertEquals;

public class TestDeltaLakeSchemaSupport
Expand Down
2 changes: 1 addition & 1 deletion ...-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestProtocolEntry.java
View file
Expand Up @@ -20,7 +20,7 @@

import java.util.Optional;

import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestProtocolEntry
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcWriterOptions.java
View file
Expand Up @@ -27,8 +27,8 @@
import static io.trino.plugin.hive.HiveMetadata.ORC_BLOOM_FILTER_COLUMNS_KEY;
import static io.trino.plugin.hive.HiveMetadata.ORC_BLOOM_FILTER_FPP_KEY;
import static io.trino.plugin.hive.util.HiveUtil.getOrcWriterOptions;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestOrcWriterOptions
{
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidBucketCodec.java
View file
Expand Up @@ -15,7 +15,7 @@

import org.testng.annotations.Test;

import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestAcidBucketCodec
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveBucketing.java
View file
Expand Up @@ -54,7 +54,7 @@
import static java.util.Map.Entry;
import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils.getStandardJavaObjectInspectorFromTypeInfo;
import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils.getTypeInfoFromTypeString;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestHiveBucketing
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergBucketing.java
View file
Expand Up @@ -69,7 +69,7 @@
import static java.lang.String.format;
import static java.time.ZoneOffset.UTC;
import static org.apache.iceberg.types.Type.TypeID.DECIMAL;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestIcebergBucketing
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionFields.java
View file
Expand Up @@ -29,7 +29,7 @@
import static com.google.common.collect.Iterables.getOnlyElement;
import static io.trino.plugin.iceberg.PartitionFields.parsePartitionField;
import static io.trino.plugin.iceberg.PartitionFields.toPartitionFields;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestPartitionFields
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduKerberosConfig.java
View file
Expand Up @@ -26,7 +26,7 @@
import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
import static java.nio.file.Files.createTempFile;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestKuduKerberosConfig
{
Expand Down
2 changes: 1 addition & 1 deletion ...o-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionalityWithoutKeyPrefix.java
View file
Expand Up @@ -20,7 +20,7 @@

import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

@Test(singleThreaded = true)
public class TestMinimalFunctionalityWithoutKeyPrefix
Expand Down
2 changes: 1 addition & 1 deletion ...server/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTransactionIsolationTest.java
View file
Expand Up @@ -25,7 +25,7 @@
import static io.trino.plugin.sqlserver.SqlServerQueryRunner.createSqlServerQueryRunner;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static io.trino.tpch.TpchTable.NATION;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public abstract class BaseSqlServerTransactionIsolationTest
extends AbstractTestQueryFramework
Expand Down
2 changes: 1 addition & 1 deletion ...t-tests-launcher/src/test/java/io/trino/tests/product/launcher/util/TestConsoleTable.java
View file
Expand Up @@ -15,7 +15,7 @@

import org.testng.annotations.Test;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class TestConsoleTable
{
Expand Down
2 changes: 1 addition & 1 deletion ...sts/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java
View file
Expand Up @@ -25,7 +25,7 @@
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;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/**
* @see TestIcebergHiveViewsCompatibility
Expand Down
2 changes: 1 addition & 1 deletion testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java
View file
Expand Up @@ -35,7 +35,7 @@
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;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestLdapTrinoJdbc
extends BaseLdapJdbcTest
Expand Down

0 comments on commit 83d9c6e

Please sign in to comment.