You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by et...@apache.org on 2025/02/28 19:05:49 UTC
(iceberg) branch main updated: Azure: Move docker-based tests to integrationTest (#12274)
This is an automated email from the ASF dual-hosted git repository.
etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 291a5c9ca5 Azure: Move docker-based tests to integrationTest (#12274)
291a5c9ca5 is described below
commit 291a5c9ca5f29bf2504f9162cb2dd760890bbeb2
Author: Anurag Mantripragada <am...@apple.com>
AuthorDate: Fri Feb 28 11:05:44 2025 -0800
Azure: Move docker-based tests to integrationTest (#12274)
---
.baseline/checkstyle/checkstyle-suppressions.xml | 16 ++++++++--------
.../iceberg/azure/adlsv2/ADLSFileIOTest.java | 0
.../iceberg/azure/adlsv2/ADLSInputStreamTest.java | 0
.../iceberg/azure/adlsv2/ADLSOutputStreamTest.java | 0
.../iceberg/azure/adlsv2/AzuriteContainer.java | 0
.../iceberg/azure/adlsv2/BaseAzuriteTest.java | 0
baseline.gradle | 2 +-
build.gradle | 22 ++++++++++++++++++++++
8 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 0db6ef1e28..9fe7c38974 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -23,16 +23,16 @@
for your changes to take effect in its Checkstyle integration. -->
<suppressions>
<!-- Suppress test classes -->
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="Javadoc*" />
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VisibilityModifier" />
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemOut" />
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemErr" />
- <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanGuavaTesting" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" checks="Javadoc*" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" checks="VisibilityModifier" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" id="BanSystemOut" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" id="BanSystemErr" />
+ <suppress files="[/\\]src[/\\].*([Tt]est|integration)[/\\](java|groovy)[/\\]" id="BanGuavaTesting" />
<!-- Suppress test resources -->
- <suppress files="[/\\]src[/\\]test[/\\]resources.*" checks="." />
+ <suppress files="[/\\]src[/\\](test|integration)[/\\]resources.*" checks="." />
<!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
<suppress files="package-info.java" checks="JavadocStyle" />
diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOTest.java b/azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOTest.java
similarity index 100%
rename from azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOTest.java
rename to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOTest.java
diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSInputStreamTest.java b/azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSInputStreamTest.java
similarity index 100%
rename from azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSInputStreamTest.java
rename to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSInputStreamTest.java
diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSOutputStreamTest.java b/azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSOutputStreamTest.java
similarity index 100%
rename from azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSOutputStreamTest.java
rename to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/ADLSOutputStreamTest.java
diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/AzuriteContainer.java b/azure/src/integration/java/org/apache/iceberg/azure/adlsv2/AzuriteContainer.java
similarity index 100%
rename from azure/src/test/java/org/apache/iceberg/azure/adlsv2/AzuriteContainer.java
rename to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/AzuriteContainer.java
diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/BaseAzuriteTest.java b/azure/src/integration/java/org/apache/iceberg/azure/adlsv2/BaseAzuriteTest.java
similarity index 100%
rename from azure/src/test/java/org/apache/iceberg/azure/adlsv2/BaseAzuriteTest.java
rename to azure/src/integration/java/org/apache/iceberg/azure/adlsv2/BaseAzuriteTest.java
diff --git a/baseline.gradle b/baseline.gradle
index 25dab14afb..1c0aca9401 100644
--- a/baseline.gradle
+++ b/baseline.gradle
@@ -78,7 +78,7 @@ subprojects {
tasks.withType(JavaCompile).configureEach {
options.errorprone.errorproneArgs.addAll (
// error-prone is slow, don't run on tests/generated-src/generated
- '-XepExcludedPaths:.*/(test|generated-src|generated)/.*',
+ '-XepExcludedPaths:.*/(test|integration|generated-src|generated)/.*',
'-Xep:AnnotateFormatMethod:ERROR',
'-Xep:BadComparable:ERROR',
'-Xep:BadInstanceof:ERROR',
diff --git a/build.gradle b/build.gradle
index 7fd4c51065..4470bcf8a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -546,6 +546,28 @@ project(':iceberg-azure') {
testImplementation libs.esotericsoftware.kryo
testImplementation libs.testcontainers
}
+
+ sourceSets {
+ integration {
+ java.srcDir "$projectDir/src/integration/java"
+ resources.srcDir "$projectDir/src/integration/resources"
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ }
+ }
+
+ configurations {
+ integrationImplementation.extendsFrom testImplementation
+ integrationRuntime.extendsFrom testRuntimeOnly
+ }
+
+ task integrationTest(type: Test) {
+ useJUnitPlatform()
+ testClassesDirs = sourceSets.integration.output.classesDirs
+ classpath = sourceSets.integration.runtimeClasspath
+ jvmArgs += project.property('extraJvmArgs')
+ }
+ check.dependsOn integrationTest
}
project(':iceberg-delta-lake') {