wip

Author: Yingjian Wu

metacat-functional-tests/build.gradle

@@ -29,11 +29,11 @@ apply plugin: 'nebula.facet'
 facets {
     functionalTest {
         parentSourceSet = "test"
-        testTaskName = 'functionalTestWithDifferentDB'
         includeInCheckLifecycle = false
     }
 }
 
+// Explicitly configure the functionalTest source set for clarity and classpath
 sourceSets {
     functionalTest {
         groovy {
@@ -54,23 +54,7 @@ dependencies {
     testImplementation project(path: ':metacat-metadata-mysql')
     warproject(project(path: ':metacat-war', configuration: 'archives'))
 
-    /*******************************
-     * Compile Dependencies
-     *******************************/
-
-    /*******************************
-     * Provided Dependencies
-     *******************************/
-
-    /*******************************
-     * Runtime Dependencies
-     *******************************/
-
-    /*******************************
-     * Test Dependencies
-     *******************************/
-
-    // Test that metacat-client can be used with jersey 1
+    // Test dependencies
     testImplementation(project(":metacat-common-server"))
     testImplementation(project(":metacat-connector-hive"))
     testImplementation(project(":metacat-testdata-provider"))
@@ -79,18 +63,16 @@ dependencies {
     functionalTestImplementation("org.apache.hive:hive-exec:${hive_version}") {
         exclude module: "pentaho-aggdesigner-algorithm"
     }
-
     testImplementation("org.skyscreamer:jsonassert")
 }
 
 task expandWar(type: Copy) {
     dependsOn ':metacat-war:war'
-
     from { configurations.warproject.collect { zipTree(it) } }
     into file("${buildDir}/metacat-war-expanded/ROOT")
 }
 
-// Aurora configuration tasks
+// Aurora cluster setup/teardown and port discovery
 task startMetacatClusterAurora(type: Exec) {
     dependsOn 'expandWar'
     if (project.ext.startCluster) {
@@ -136,19 +118,10 @@ task metacatPortsAurora {
         ext.metacat_embedded_fast_hive_thrift_port = get_docker_port('com.netflix.metacat.oss.test.war', 12004)
         ext.hive_thrift_port = get_docker_port('com.netflix.metacat.oss.test.hive', 9083)
         ext.hive_debug_port = get_docker_port('com.netflix.metacat.oss.test.hive', 8005)
-
-        println '++ Container Exposed ports ++'
-        println '+++ Metacat Web Port: [' + ext.http_port + ']'
-        println '+++ Metacat Web Debug Port: [' + ext.metacat_http_debug_port + ']'
-        println '+++ Metacat Hive Thrift Port: [' + ext.metacat_hive_thrift_port + ']'
-        println '+++ Metacat Embedded Hive Thrift Port: [' + ext.metacat_embedded_hive_thrift_port + ']'
-        println '+++ Metacat Embedded Fast Hive Thrift Port: [' + ext.metacat_embedded_fast_hive_thrift_port + ']'
-        println '+++ Metacat Hive Metastore Port: [' + ext.hive_thrift_port + ']'
-        println '+++ Metacat Hive Metastore Debug Port: [' + ext.hive_debug_port + ']'
     }
 }
 
-// CRDB configuration tasks
+// CRDB cluster setup/teardown and port discovery
 task startMetacatClusterCRDB(type: Exec) {
     dependsOn 'expandWar'
     if (project.ext.startCluster) {
@@ -194,22 +167,12 @@ task metacatPortsCRDB {
         ext.metacat_embedded_fast_hive_thrift_port = get_docker_port('com.netflix.metacat.oss.test.war', 12004)
         ext.hive_thrift_port = get_docker_port('com.netflix.metacat.oss.test.hive', 9083)
         ext.hive_debug_port = get_docker_port('com.netflix.metacat.oss.test.hive', 8005)
-
-        println '++ Container Exposed ports ++'
-        println '+++ Metacat Web Port: [' + ext.http_port + ']'
-        println '+++ Metacat Web Debug Port: [' + ext.metacat_http_debug_port + ']'
-        println '+++ Metacat Hive Thrift Port: [' + ext.metacat_hive_thrift_port + ']'
-        println '+++ Metacat Embedded Hive Thrift Port: [' + ext.metacat_embedded_hive_thrift_port + ']'
-        println '+++ Metacat Embedded Fast Hive Thrift Port: [' + ext.metacat_embedded_fast_hive_thrift_port + ']'
-        println '+++ Metacat Hive Metastore Port: [' + ext.hive_thrift_port + ']'
-        println '+++ Metacat Hive Metastore Debug Port: [' + ext.hive_debug_port + ']'
     }
 }
 
 // Functional test tasks for Aurora
 task functionalTestAurora(type: Test) {
     outputs.upToDateWhen { false }
-
     testClassesDirs = sourceSets.functionalTest.output.classesDirs
     classpath = sourceSets.functionalTest.runtimeClasspath
 
@@ -227,20 +190,14 @@ task functionalTestAurora(type: Test) {
         }
         systemProperties = properties
     }
-
-
-    testLogging {
-        showStandardStreams = true
-    }
-
+    testLogging { showStandardStreams = true }
     dependsOn 'expandWar', 'startMetacatClusterAurora', 'metacatPortsAurora'
     finalizedBy 'stopMetacatClusterAurora'
 }
 
 // Functional test tasks for CRDB
 task functionalTestCRDB(type: Test) {
     outputs.upToDateWhen { false }
-
     testClassesDirs = sourceSets.functionalTest.output.classesDirs
     classpath = sourceSets.functionalTest.runtimeClasspath
 
@@ -258,11 +215,7 @@ task functionalTestCRDB(type: Test) {
         }
         systemProperties = properties
     }
-
-    testLogging {
-        showStandardStreams = true
-    }
-
+    testLogging { showStandardStreams = true }
     dependsOn 'expandWar', 'startMetacatClusterCRDB', 'metacatPortsCRDB'
     finalizedBy 'stopMetacatClusterCRDB'
 }