review: use intTest dependencies

Author: dimas-b

build-logic/src/main/kotlin/polaris-runtime.gradle.kts

@@ -48,20 +48,32 @@ testing {
         tasks.named(sources.compileJavaTaskName).configure {
           dependsOn("compileQuarkusTestGeneratedSourcesJava")
         }
-        configurations.named(sources.runtimeOnlyConfigurationName).configure {
-          extendsFrom(configurations.getByName("testRuntimeOnly"))
-        }
-        configurations.named(sources.implementationConfigurationName).configure {
-          // Let the test's implementation config extend testImplementation, so it also inherits the
-          // project's "main" implementation dependencies (not just the "api" configuration)
-          extendsFrom(configurations.getByName("testImplementation"))
-        }
         sources { java.srcDirs(tasks.named("quarkusGenerateCodeTests")) }
       }
 
     listOf("intTest", "cloudTest").forEach {
       register<JvmTestSuite>(it).configure { intTestSuiteConfigure(this) }
     }
+
+    named<JvmTestSuite>("intTest").configure {
+      configurations.named(sources.runtimeOnlyConfigurationName).configure {
+        extendsFrom(configurations.getByName("testRuntimeOnly"))
+      }
+      configurations.named(sources.implementationConfigurationName).configure {
+        // Let the test's implementation config extend testImplementation, so it also inherits the
+        // project's "main" implementation dependencies (not just the "api" configuration)
+        extendsFrom(configurations.getByName("testImplementation"))
+      }
+    }
+
+    named<JvmTestSuite>("cloudTest").configure {
+      configurations.named(sources.runtimeOnlyConfigurationName).configure {
+        extendsFrom(configurations.getByName("intTestRuntimeOnly"))
+      }
+      configurations.named(sources.implementationConfigurationName).configure {
+        extendsFrom(configurations.getByName("intTestImplementation"))
+      }
+    }
   }
 }
 

runtime/server/build.gradle.kts

@@ -54,27 +54,28 @@ dependencies {
   implementation(enforcedPlatform(libs.quarkus.bom))
   implementation("io.quarkus:quarkus-container-image-docker")
 
+  testImplementation(enforcedPlatform(libs.quarkus.bom))
   testImplementation("io.quarkus:quarkus-junit5")
 
-  testImplementation(testFixtures(project(":polaris-runtime-service")))
-  testImplementation(project(":polaris-runtime-test-common"))
-  testImplementation(project(":polaris-core"))
-  testImplementation(project(":polaris-api-management-model"))
-  testImplementation(project(":polaris-minio-testcontainer"))
+  intTestImplementation(testFixtures(project(":polaris-runtime-service")))
+  intTestImplementation(project(":polaris-runtime-test-common"))
+  intTestImplementation(project(":polaris-core"))
+  intTestImplementation(project(":polaris-api-management-model"))
+  intTestImplementation(project(":polaris-minio-testcontainer"))
 
-  testImplementation(project(":polaris-tests")) {
+  intTestImplementation(project(":polaris-tests")) {
     // exclude all spark dependencies
     exclude(group = "org.apache.iceberg", module = "iceberg-spark-3.5_2.12")
     exclude(group = "org.apache.iceberg", module = "iceberg-spark-extensions-3.5_2.12")
     exclude(group = "org.apache.spark", module = "spark-sql_2.12")
   }
 
-  testImplementation(platform(libs.iceberg.bom))
-  testImplementation("org.apache.iceberg:iceberg-api")
-  testImplementation("org.apache.iceberg:iceberg-core")
-  testImplementation("org.apache.iceberg:iceberg-aws")
-  testImplementation("org.apache.iceberg:iceberg-api:${libs.versions.iceberg.get()}:tests")
-  testImplementation("org.apache.iceberg:iceberg-core:${libs.versions.iceberg.get()}:tests")
+  intTestImplementation(platform(libs.iceberg.bom))
+  intTestImplementation("org.apache.iceberg:iceberg-api")
+  intTestImplementation("org.apache.iceberg:iceberg-core")
+  intTestImplementation("org.apache.iceberg:iceberg-aws")
+  intTestImplementation("org.apache.iceberg:iceberg-api:${libs.versions.iceberg.get()}:tests")
+  intTestImplementation("org.apache.iceberg:iceberg-core:${libs.versions.iceberg.get()}:tests")
 
   // This dependency brings in RESTEasy Classic, which conflicts with Quarkus RESTEasy Reactive;
   // it must not be present during Quarkus augmentation otherwise Quarkus tests won't start.

…olaris/server/it/ServiceProducersIT.java …laris/service/it/ServiceProducersIT.javaruntime/server/src/intTest/java/org/apache/polaris/server/it/ServiceProducersIT.java renamed to runtime/service/src/test/java/org/apache/polaris/service/it/ServiceProducersIT.java runtime/server/src/intTest/java/org/apache/polaris/server/it/ServiceProducersIT.java renamed to runtime/service/src/test/java/org/apache/polaris/service/it/ServiceProducersIT.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.server.it;
+package org.apache.polaris.service.it;
 
 import static org.assertj.core.api.Assertions.assertThat;