chore(gradle): fix testclient tests

include logback configuration in output

Author: xeruf

gradle/build.gradle.kts

@@ -195,12 +195,10 @@ tasks {
             serverDir.deleteRecursively()
             unzipTo(serverDir, deployDir.resolve("software-challenge-server.zip"))
 
-            println("Testing TestClient...")
-            val testClient =
-                    ProcessBuilder(
-                            (project(":test-client").getTasksByName("createStartScripts", false).single() as ScriptsTask).content.split(' ') +
-                            arrayOf("--start-server", "--tests", testClientGames.toString(), "--port", "13055")
-                    ).directory(serverDir).start()
+            val command = (project(":test-client").getTasksByName("createStartScripts", false).single() as ScriptsTask).content.split(' ') +
+                          arrayOf("--start-server", "--tests", testClientGames.toString(), "--port", "13055")
+            println("Testing TestClient with $command")
+            val testClient = ProcessBuilder(command).directory(serverDir).start()
             if (testClient.waitFor(maxGameLength * testClientGames, TimeUnit.SECONDS)) {
                 val value = testClient.exitValue()
                 // TODO check whether TestClient actually played games
@@ -306,11 +304,6 @@ allprojects {
                     manifest.attributes(
                             "Main-Class" to project.extensions.getByType<JavaApplication>().mainClass.get(),
                             "Add-Opens" to arrayOf(
-                                    "javafx.controls/javafx.scene.control.skin",
-                                    "javafx.controls/javafx.scene.control",
-                                    "javafx.graphics/javafx.scene",
-                                    // For accessing InputMap used in RangeSliderBehavior
-                                    "javafx.controls/com.sun.javafx.scene.control.inputmap",
                                     // Expose list internals for xstream conversion: https://github.com/x-stream/xstream/issues/253
                                     "java.base/java.util").joinToString(" ")
                     )

helpers/test-client/build.gradle.kts

@@ -26,19 +26,20 @@ tasks {
         content = "java -Dfile.encoding=UTF-8 -Dlogback.configurationFile=logback-tests.xml -jar test-client.jar"
     }
 
+    val copyLogbackConfig by creating(Copy::class) {
+        from("src/logback-tests.xml")
+        into(jar.get().destinationDirectory)
+    }
+    
     jar {
-        dependsOn(createStartScripts)
+        dependsOn(createStartScripts, copyLogbackConfig)
         doFirst {
             manifest.attributes(
                     "Class-Path" to configurations.default.get()
                             .map { "lib/" + it.name }
                             .plus("server.jar")
                             .joinToString(" ")
             )
-            copy {
-                from("src/logback-tests.xml")
-                into(destinationDirectory)
-            }
         }
     }
 

server/build.gradle.kts

@@ -56,7 +56,7 @@ tasks {
         from(runnableDir)
         doFirst {
             if(project.property("enableTestClient") !in arrayOf(null, false))
-                from(project(":test-client").getTasksByName("jar", false))
+                from(arrayOf("jar", "copyLogbackConfig").map { project(":test-client").getTasksByName(it, false) })
             from(project(":player").getTasksByName("shadowJar", false))
             exec {
                 commandLine("git", "rev-parse", "HEAD")