fix: server tests on jdk17

Signed-off-by: Sam Gammon <[email protected]>
apple · Jan 31, 2025 · d6a8801 · d6a8801
1 parent b36b647
commit d6a8801
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/pkl-server/pkl-server.gradle.kts b/pkl-server/pkl-server.gradle.kts
@@ -108,7 +108,3 @@ testNative {
   }
 }
 
-tasks.withType(Test::class).configureEach {
-  // Disable multi-JDK testing for pkl-server.
-  enabled = !name.lowercase().contains("jdk")
-}
diff --git a/pkl-server/src/test/kotlin/org/pkl/server/AbstractServerTest.kt b/pkl-server/src/test/kotlin/org/pkl/server/AbstractServerTest.kt
@@ -25,6 +25,7 @@ import kotlin.io.path.outputStream
 import kotlin.io.path.writeText
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
@@ -38,13 +39,18 @@ abstract class AbstractServerTest {
   companion object {
     /** Set to `true` to bypass messagepack serialization when running [JvmServerTest]. */
     internal const val USE_DIRECT_TRANSPORT = false
+    lateinit var executor: ExecutorService
 
-    val executor: ExecutorService =
-      if (USE_DIRECT_TRANSPORT) {
-        createDirectExecutor()
-      } else {
-        Executors.newCachedThreadPool()
-      }
+    @BeforeAll
+    @JvmStatic
+    fun beforeAll() {
+      executor =
+        if (USE_DIRECT_TRANSPORT) {
+          createDirectExecutor()
+        } else {
+          Executors.newCachedThreadPool()
+        }
+    }
 
     @AfterAll
     @JvmStatic