Fix graal tests (#8906)

Author: yschimke

native-image-tests/build.gradle.kts

@@ -7,58 +7,58 @@ animalsniffer {
   isIgnoreFailures = true
 }
 
-val graal by sourceSets.creating
-
-sourceSets {
-  named("graal") {}
-  test {
-    java.srcDirs(
-      "../okhttp-brotli/src/test/java",
-      "../okhttp-dnsoverhttps/src/test/java",
-      "../okhttp-logging-interceptor/src/test/java",
-      "../okhttp-sse/src/test/java",
-    )
-  }
-}
+// TODO reenable other tests
+// https://github.com/square/okhttp/issues/8901
+//sourceSets {
+//  test {
+//    java.srcDirs(
+//      "../okhttp-brotli/src/test/java",
+//      "../okhttp-dnsoverhttps/src/test/java",
+//      "../okhttp-logging-interceptor/src/test/java",
+//      "../okhttp-sse/src/test/java",
+//    )
+//  }
+//}
 
 dependencies {
-  friendsImplementation(projects.okhttp)
-  friendsImplementation(projects.okhttpBrotli)
-  friendsImplementation(projects.okhttpDnsoverhttps)
-  friendsImplementation(projects.loggingInterceptor)
-  friendsImplementation(projects.okhttpSse)
-  friendsImplementation(projects.okhttpTestingSupport)
-  friendsImplementation(projects.okhttpTls)
-  friendsImplementation(projects.mockwebserver3)
-  friendsImplementation(projects.mockwebserver)
-  friendsImplementation(projects.okhttpJavaNetCookiejar)
-  friendsImplementation(projects.mockwebserver3Junit5)
-
-  implementation(libs.aqute.resolve)
-  implementation(libs.assertk)
-  implementation(libs.junit.jupiter.api)
-  implementation(libs.junit.jupiter.engine)
-  implementation(libs.junit.jupiter.params)
-  implementation(libs.junit.platform.console)
-  implementation(libs.kotlin.test.common)
-  implementation(libs.kotlin.test.junit)
-  implementation(libs.squareup.okio.fakefilesystem)
+  implementation(projects.okhttp)
 
-  "graalCompileOnly"(libs.nativeImageSvm)
-  "graalCompileOnly"(libs.graal.sdk)
-  nativeImageTestCompileOnly(graal.output.classesDirs)
+  testImplementation(projects.mockwebserver3Junit5)
+  testImplementation(libs.assertk)
+  testImplementation(kotlin("test"))
 }
 
 graalvmNative {
   testSupport = true
 
   binaries {
     named("test") {
-      buildArgs.add("--features=okhttp3.nativeimage.TestRegistration")
-      buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.TestTag")
-      buildArgs.add("--strict-image-heap")
-
       // speed up development testing
+      buildArgs.add("--strict-image-heap")
+      // see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13
+      // should not be needed after updating native build tools to 0.11.0
+      val initializeAtBuildTime = listOf(
+        "kotlin.coroutines.intrinsics.CoroutineSingletons",
+        "org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences",
+        "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo",
+        "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods",
+        "org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor",
+        "org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor",
+        "org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode",
+        "org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1",
+        "org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo",
+        "org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter",
+        "org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext",
+        "org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue",
+        "org.junit.platform.launcher.core.DiscoveryIssueNotifier",
+        "org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider",
+        "org.junit.platform.launcher.core.LauncherConfig",
+        "org.junit.platform.launcher.core.LauncherPhase",
+        "org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo",
+        "org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods"
+      )
+      buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}")
+      buildArgs.add("--trace-class-initialization=kotlin.annotation.AnnotationTarget,org.junit.platform.launcher.core.DiscoveryIssueNotifier,org.junit.platform.launcher.core.LauncherPhase,org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider,kotlin.annotation.AnnotationRetention,org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue")
       buildArgs.add("-Ob")
     }
   }

native-image-tests/src/graal/java/okhttp3/nativeimage/TestRegistration.kt

@@ -18,15 +18,9 @@ package okhttp3.nativeimage
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.testing.PlatformRule
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
 
 class PublicSuffixDatabaseTest {
-  @RegisterExtension
-  @JvmField
-  val platform = PlatformRule()
-
   @Test
   fun testResourcesLoaded() {
     val url = "https://api.twitter.com".toHttpUrl()

native-image-tests/src/test/kotlin/okhttp3/nativeimage/PublicSuffixDatabaseTest.kt

@@ -17,25 +17,18 @@ package okhttp3.nativeimage
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import kotlin.test.Test
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
-import mockwebserver3.junit5.StartStop
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClientTestRule
+import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.SimpleProvider
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.ArgumentsSource
 
 class SampleTest {
-  @JvmField @RegisterExtension
-  val clientRule = OkHttpClientTestRule()
-
-  @StartStop
   private val server = MockWebServer()
 
+  private val client = OkHttpClient()
+
   @Test
   fun passingTest() {
     assertThat("hello").isEqualTo("hello")
@@ -45,7 +38,7 @@ class SampleTest {
   fun testMockWebServer() {
     server.enqueue(MockResponse(body = "abc"))
 
-    val client = clientRule.newClient()
+    server.start()
 
     client.newCall(Request(url = server.url("/"))).execute().use {
       assertThat(it.body.string()).isEqualTo("abc")
@@ -54,19 +47,8 @@ class SampleTest {
 
   @Test
   fun testExternalSite() {
-    val client = clientRule.newClient()
-
     client.newCall(Request(url = "https://google.com/robots.txt".toHttpUrl())).execute().use {
       assertThat(it.code).isEqualTo(200)
     }
   }
-
-  @ParameterizedTest
-  @ArgumentsSource(SampleTestProvider::class)
-  fun testParams(mode: String) {
-  }
-}
-
-class SampleTestProvider : SimpleProvider() {
-  override fun arguments() = listOf("A", "B")
 }