Skip to content

Commit 404c805

Browse files
authored
Arrow, AWS, Azure, Core, GCP, Hive, Kafka, Snowflake: Rename test classes to use Test as prefix instead of suffix (apache#12879)
It appears that we have some tests that use `Test` as a suffix in the test class name, while all other modules use it in their prefix.
1 parent 97a1f3b commit 404c805

File tree

60 files changed

+60
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+60
-143
lines changed

arrow/src/test/java/org/apache/iceberg/arrow/ArrowSchemaUtilTest.java renamed to arrow/src/test/java/org/apache/iceberg/arrow/TestArrowSchemaUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.iceberg.types.Types.TimestampType;
3939
import org.junit.jupiter.api.Test;
4040

41-
public class ArrowSchemaUtilTest {
41+
public class TestArrowSchemaUtil {
4242

4343
private static final String INTEGER_FIELD = "i";
4444
private static final String BOOLEAN_FIELD = "b";

arrow/src/test/java/org/apache/iceberg/arrow/vectorized/ArrowReaderTest.java renamed to arrow/src/test/java/org/apache/iceberg/arrow/vectorized/TestArrowReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
*
9494
* <p>All tests create a table with monthly partitions and write 1 year of data to the table.
9595
*/
96-
public class ArrowReaderTest {
96+
public class TestArrowReader {
9797

9898
private static final int NUM_ROWS_PER_MONTH = 20;
9999
private static final ImmutableList<String> ALL_COLUMNS =

arrow/src/test/java/org/apache/iceberg/arrow/vectorized/parquet/DecimalVectorUtilTest.java renamed to arrow/src/test/java/org/apache/iceberg/arrow/vectorized/parquet/TestDecimalVectorUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.math.BigInteger;
2525
import org.junit.jupiter.api.Test;
2626

27-
public class DecimalVectorUtilTest {
27+
public class TestDecimalVectorUtil {
2828

2929
@Test
3030
public void testPadBigEndianBytes() {

aws/src/test/java/org/apache/iceberg/aws/HttpClientPropertiesTest.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

aws/src/test/java/org/apache/iceberg/aws/AwsClientPropertiesTest.java renamed to aws/src/test/java/org/apache/iceberg/aws/TestAwsClientProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import software.amazon.awssdk.regions.Region;
3838
import software.amazon.awssdk.services.s3.S3ClientBuilder;
3939

40-
public class AwsClientPropertiesTest {
40+
public class TestAwsClientProperties {
4141

4242
@Test
4343
public void testApplyClientRegion() {

azure/src/integration/java/org/apache/iceberg/azure/adlsv2/BaseAzuriteTest.java renamed to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/AzuriteTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.junit.jupiter.api.BeforeAll;
3030
import org.junit.jupiter.api.BeforeEach;
3131

32-
public class BaseAzuriteTest {
32+
public class AzuriteTestBase {
3333
protected static final AzuriteContainer AZURITE_CONTAINER = new AzuriteContainer();
3434

3535
@BeforeAll

azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOTest.java renamed to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/TestADLSFileIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import org.junit.jupiter.params.ParameterizedTest;
5353
import org.junit.jupiter.params.provider.MethodSource;
5454

55-
public class ADLSFileIOTest extends BaseAzuriteTest {
55+
public class TestADLSFileIO extends AzuriteTestBase {
5656

5757
@Test
5858
public void testFileOperations() throws IOException {

azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSInputStreamTest.java renamed to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/TestADLSInputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.iceberg.metrics.MetricsContext;
3333
import org.junit.jupiter.api.Test;
3434

35-
public class ADLSInputStreamTest extends BaseAzuriteTest {
35+
public class TestADLSInputStream extends AzuriteTestBase {
3636

3737
private static final String FILE_PATH = "path/to/file";
3838

azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSOutputStreamTest.java renamed to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/TestADLSOutputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.junit.jupiter.params.ParameterizedTest;
3434
import org.junit.jupiter.params.provider.ValueSource;
3535

36-
public class ADLSOutputStreamTest extends BaseAzuriteTest {
36+
public class TestADLSOutputStream extends AzuriteTestBase {
3737

3838
private final Random random = new Random(1);
3939
private final AzureProperties azureProperties = new AzureProperties();

azure/src/test/java/org/apache/iceberg/azure/AzurePropertiesTest.java renamed to azure/src/test/java/org/apache/iceberg/azure/TestAzureProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.junit.jupiter.params.ParameterizedTest;
5050
import org.junit.jupiter.params.provider.MethodSource;
5151

52-
public class AzurePropertiesTest {
52+
public class TestAzureProperties {
5353

5454
@ParameterizedTest
5555
@MethodSource("org.apache.iceberg.TestHelpers#serializers")

azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSLocationTest.java renamed to azure/src/test/java/org/apache/iceberg/azure/adlsv2/TestADLSLocation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.junit.jupiter.params.provider.CsvSource;
2828
import org.junit.jupiter.params.provider.ValueSource;
2929

30-
public class ADLSLocationTest {
30+
public class TestADLSLocation {
3131
@ParameterizedTest
3232
@ValueSource(strings = {"abfs", "abfss"})
3333
public void testLocationParsing(String scheme) {

azure/src/test/java/org/apache/iceberg/azure/adlsv2/VendedAdlsCredentialProviderTest.java renamed to azure/src/test/java/org/apache/iceberg/azure/adlsv2/TestVendedAdlsCredentialProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.mockserver.model.HttpResponse;
4747
import org.mockserver.verify.VerificationTimes;
4848

49-
public class VendedAdlsCredentialProviderTest extends BaseVendedCredentialsTest {
49+
public class TestVendedAdlsCredentialProvider extends VendedCredentialsTestBase {
5050
private static final String CREDENTIALS_URI = String.format("%s%s", baseUri, "/v1/credentials");
5151
private static final String CATALOG_URI = String.format("%s%s", baseUri, "/v1/");
5252
private static final String STORAGE_ACCOUNT = "account1";

azure/src/test/java/org/apache/iceberg/azure/adlsv2/VendedAzureSasCredentialPolicyTest.java renamed to azure/src/test/java/org/apache/iceberg/azure/adlsv2/TestVendedAzureSasCredentialPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.mockserver.model.HttpResponse;
3535
import org.mockserver.verify.VerificationTimes;
3636

37-
public class VendedAzureSasCredentialPolicyTest extends BaseVendedCredentialsTest {
37+
public class TestVendedAzureSasCredentialPolicy extends VendedCredentialsTestBase {
3838

3939
private static final String STORAGE_ACCOUNT = "account1";
4040
private static final String ACCOUNT_ENDPOINT = String.format("%s/%s", baseUri, STORAGE_ACCOUNT);

azure/src/test/java/org/apache/iceberg/azure/adlsv2/BaseVendedCredentialsTest.java renamed to azure/src/test/java/org/apache/iceberg/azure/adlsv2/VendedCredentialsTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.junit.jupiter.api.BeforeEach;
2626
import org.mockserver.integration.ClientAndServer;
2727

28-
public class BaseVendedCredentialsTest {
28+
public class VendedCredentialsTestBase {
2929
protected static String baseUri;
3030
protected static ClientAndServer mockServer;
3131

core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java renamed to core/src/test/java/org/apache/iceberg/TestTableMetadataParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.junit.jupiter.api.extension.ExtendWith;
4545

4646
@ExtendWith(ParameterizedTestExtension.class)
47-
public class TableMetadataParserTest {
47+
public class TestTableMetadataParser {
4848

4949
private static final Schema SCHEMA = new Schema(optional(1, "b", BooleanType.get()));
5050

core/src/test/java/org/apache/iceberg/TableMetadataParserCodecTest.java renamed to core/src/test/java/org/apache/iceberg/TestTableMetadataParserCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.iceberg.TableMetadataParser.Codec;
2525
import org.junit.jupiter.api.Test;
2626

27-
public class TableMetadataParserCodecTest {
27+
public class TestTableMetadataParserCodec {
2828

2929
@Test
3030
public void testCompressionCodec() {

core/src/test/java/org/apache/iceberg/hadoop/HadoopFileIOTest.java renamed to core/src/test/java/org/apache/iceberg/hadoop/TestHadoopFileIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.junit.jupiter.params.ParameterizedTest;
4949
import org.junit.jupiter.params.provider.MethodSource;
5050

51-
public class HadoopFileIOTest {
51+
public class TestHadoopFileIO {
5252
private final Random random = new Random(1);
5353

5454
private FileSystem fs;

gcp/src/test/java/org/apache/iceberg/gcp/GCPPropertiesTest.java renamed to gcp/src/test/java/org/apache/iceberg/gcp/TestGCPProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
2929
import org.junit.jupiter.api.Test;
3030

31-
public class GCPPropertiesTest {
31+
public class TestGCPProperties {
3232

3333
@Test
3434
public void testOAuthWithNoAuth() {

gcp/src/test/java/org/apache/iceberg/gcp/gcs/GCSFileIOTest.java renamed to gcp/src/test/java/org/apache/iceberg/gcp/gcs/TestGCSFileIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
import org.junit.jupiter.params.ParameterizedTest;
6666
import org.junit.jupiter.params.provider.MethodSource;
6767

68-
public class GCSFileIOTest {
68+
public class TestGCSFileIO {
6969
private static final String TEST_BUCKET = "TEST_BUCKET";
7070
private final Random random = new Random(1);
7171

gcp/src/test/java/org/apache/iceberg/gcp/gcs/GCSInputStreamTest.java renamed to gcp/src/test/java/org/apache/iceberg/gcp/gcs/TestGCSInputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.iceberg.metrics.MetricsContext;
3737
import org.junit.jupiter.api.Test;
3838

39-
public class GCSInputStreamTest {
39+
public class TestGCSInputStream {
4040

4141
private final Random random = new Random(1);
4242

gcp/src/test/java/org/apache/iceberg/gcp/gcs/GCSLocationTest.java renamed to gcp/src/test/java/org/apache/iceberg/gcp/gcs/TestGCSLocation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.iceberg.exceptions.ValidationException;
2525
import org.junit.jupiter.api.Test;
2626

27-
public class GCSLocationTest {
27+
public class TestGCSLocation {
2828
@Test
2929
public void testLocationParsing() {
3030
String p1 = "gs://bucket/path/to/prefix";

gcp/src/test/java/org/apache/iceberg/gcp/gcs/GCSOutputStreamTest.java renamed to gcp/src/test/java/org/apache/iceberg/gcp/gcs/TestGCSOutputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;
3636

37-
public class GCSOutputStreamTest {
38-
private static final Logger LOG = LoggerFactory.getLogger(GCSOutputStreamTest.class);
37+
public class TestGCSOutputStream {
38+
private static final Logger LOG = LoggerFactory.getLogger(TestGCSOutputStream.class);
3939
private static final String BUCKET = "test-bucket";
4040

4141
private final GCPProperties properties = new GCPProperties();

gcp/src/test/java/org/apache/iceberg/gcp/gcs/OAuth2RefreshCredentialsHandlerTest.java renamed to gcp/src/test/java/org/apache/iceberg/gcp/gcs/TestOAuth2RefreshCredentialsHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.mockserver.model.HttpResponse;
4646
import org.mockserver.verify.VerificationTimes;
4747

48-
public class OAuth2RefreshCredentialsHandlerTest {
48+
public class TestOAuth2RefreshCredentialsHandler {
4949
private static final int PORT = 3333;
5050
private static final String CREDENTIALS_URI =
5151
String.format("http://127.0.0.1:%d/v1/credentials", PORT);

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveTableBaseTest.java renamed to hive-metastore/src/test/java/org/apache/iceberg/hive/HiveTableTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.junit.jupiter.api.BeforeEach;
4444
import org.junit.jupiter.api.extension.RegisterExtension;
4545

46-
public class HiveTableBaseTest {
46+
public class HiveTableTestBase {
4747

4848
static final String TABLE_NAME = "tbl";
4949
static final String DB_NAME = "hivedb";

hive-metastore/src/test/java/org/apache/iceberg/hive/TestHiveCommits.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.junit.jupiter.api.Test;
4848
import org.junit.platform.commons.support.ReflectionSupport;
4949

50-
public class TestHiveCommits extends HiveTableBaseTest {
50+
public class TestHiveCommits extends HiveTableTestBase {
5151

5252
@Test
5353
public void testSuppressUnlockExceptions() {

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java renamed to hive-metastore/src/test/java/org/apache/iceberg/hive/TestHiveCreateReplaceTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.junit.jupiter.params.ParameterizedTest;
5252
import org.junit.jupiter.params.provider.ValueSource;
5353

54-
public class HiveCreateReplaceTableTest {
54+
public class TestHiveCreateReplaceTable {
5555

5656
private static final String DB_NAME = "hivedb";
5757
private static final String TABLE_NAME = "tbl";

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveTableTest.java renamed to hive-metastore/src/test/java/org/apache/iceberg/hive/TestHiveTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
import org.junit.jupiter.params.ParameterizedTest;
8484
import org.junit.jupiter.params.provider.EnumSource;
8585

86-
public class HiveTableTest extends HiveTableBaseTest {
86+
public class TestHiveTable extends HiveTableTestBase {
8787
static final String NON_DEFAULT_DATABASE = "nondefault";
8888

8989
@TempDir private Path tempFolder;

hive-metastore/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.awaitility.Awaitility;
4040
import org.junit.jupiter.api.Test;
4141

42-
public class TestHiveTableConcurrency extends HiveTableBaseTest {
42+
public class TestHiveTableConcurrency extends HiveTableTestBase {
4343

4444
@Test
4545
public synchronized void testConcurrentFastAppends() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.UUID;
2626
import org.junit.jupiter.api.Test;
2727

28-
public class EventSerializationTest {
28+
public class TestEventSerialization {
2929

3030
@Test
3131
public void testStartCommitSerialization() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.junit.jupiter.params.provider.NullSource;
3030
import org.junit.jupiter.params.provider.ValueSource;
3131

32-
public class IntegrationDynamicTableTest extends IntegrationTestBase {
32+
public class TestIntegrationDynamicTable extends IntegrationTestBase {
3333

3434
private static final String TEST_TABLE1 = "tbl1";
3535
private static final String TEST_TABLE2 = "tbl2";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.junit.jupiter.params.provider.NullSource;
3030
import org.junit.jupiter.params.provider.ValueSource;
3131

32-
public class IntegrationMultiTableTest extends IntegrationTestBase {
32+
public class TestIntegrationMultiTable extends IntegrationTestBase {
3333

3434
private static final String TEST_TABLE1 = "foobar1";
3535
private static final String TEST_TABLE2 = "foobar2";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.kafka.connect.sink.SinkRecord;
3030
import org.junit.jupiter.api.Test;
3131

32-
public class CopyValueTest {
32+
public class TestCopyValue {
3333

3434
@Test
3535
public void testCopyValueNull() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.apache.kafka.connect.sink.SinkRecord;
3232
import org.junit.jupiter.api.Test;
3333

34-
public class DebeziumTransformTest {
34+
public class TestDebeziumTransform {
3535

3636
private static final Schema KEY_SCHEMA =
3737
SchemaBuilder.struct().field("account_id", Schema.INT64_SCHEMA).build();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.apache.kafka.connect.sink.SinkRecord;
2727
import org.junit.jupiter.api.Test;
2828

29-
public class DmsTransformTest {
29+
public class TestDmsTransform {
3030

3131
@Test
3232
@SuppressWarnings("unchecked")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.junit.jupiter.api.DisplayName;
3333
import org.junit.jupiter.api.Test;
3434

35-
public class JsonToMapTransformTest extends FileLoads {
35+
public class TestJsonToMapTransform extends FileLoads {
3636

3737
private String loadJson() {
3838
try {

0 commit comments

Comments
 (0)