Add the ability to run a testNg/testStreaming test on its own (#5338)

Motivation: Currently, `testNg` is run after `shadedTest` is run when the `check` command is invoked. However, even if there are updates to the source code, `testNg` won't attempt to recompile the source code. This can be easily reproduced by modifying a testNg class, and trying to run `./gradlew testNg`. This is because `testNg` currently depends on the classpath of `shadedTest`. As long as `shadedTest` isn't invoked, the `shadedTest.classpath` won't be updated. Modifications: - Since `copyShadedTestClasses` declares the test classpath as an input, it is safe to rely on `copyShadedTestClasses` (just like `shadedTest` does). Modified `testNg`, `testStreaming` to depend on `copyShadedTestClasses` instead. - Removed the `finalizedBy` dependency since it doesn't make sense to have a dependency between `shadedTest` and `testNg`/`testStreaming`. Result: - We can run `./gradlew testNg` and receive results correctly
line · Jan 17, 2024 · c4c6b3d · c4c6b3d
1 parent 20827c0
commit c4c6b3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -185,7 +185,7 @@ testing.suites {
 
                 project.ext.configureCommonTestSettings(it)
 
-                dependsOn(tasks.shadedTestClasses)
+                dependsOn(tasks.copyShadedTestClasses)
                 // Use small heap for streaming tests to quickly ensure we can stream the content larger than heap.
                 maxHeapSize = '64m'
 
@@ -201,7 +201,6 @@ testing.suites {
         }
     }
 }
-tasks.shadedTest.finalizedBy testing.suites.testStreaming
 tasks.check.dependsOn testing.suites.testStreaming
 
 // Run the test cases based on reactive-streams-tck only with non-flaky mode
@@ -215,7 +214,7 @@ if (rootProject.findProperty('flakyTests') != 'true') {
 
                     project.ext.configureCommonTestSettings(it)
                     include '/com/linecorp/armeria/**/common/**'
-                    dependsOn tasks.shadedTestClasses
+                    dependsOn tasks.copyShadedTestClasses
                     scanForTestClasses = false
                     testClassesDirs = tasks.shadedTest.testClassesDirs
                     classpath = testClassesDirs
@@ -229,7 +228,6 @@ if (rootProject.findProperty('flakyTests') != 'true') {
             }
         }
     }
-    tasks.shadedTest.finalizedBy testing.suites.testNg
     tasks.check.dependsOn testing.suites.testNg
 }
 

diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
@@ -28,6 +28,13 @@ testing {
                     testTask.configure {
                         group = "Verification"
                         description = "Runs the TestNG unit tests"
+                        dependsOn(tasks.copyShadedTestClasses)
+                        val shadedTestTask = tasks.shadedTest.get()
+                        testClassesDirs = shadedTestTask.testClassesDirs
+                        classpath = shadedTestTask.testClassesDirs
+                        doFirst {
+                            classpath += project.files(configurations.shadedJarTestRuntime.get().resolve())
+                        }
                     }
                 }
             }
@@ -39,5 +46,4 @@ testing {
     }
 }
 
-tasks.shadedTest { finalizedBy(testing.suites.named("testNg")) }
 tasks.check { dependsOn(testing.suites.named("testNg")) }