Move our internal testing stuff to an unpublished module (#6449)

* move our internal stuff to a repo that is not published

* update apiDump

* typo

* remove workaround

* remove uneeded dependency

Author: martinbonnin

benchmark/microbenchmark/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
   androidTestImplementation(libs.benchmark.junit4)
   androidTestImplementation(libs.androidx.test.core)
   androidTestImplementation(libs.apollo.mockserver)
-  androidTestImplementation(libs.apollo.testingsupport)
+  androidTestImplementation(libs.apollo.testingsupport.internal)
 }
 
 java {

build.gradle.kts

@@ -139,6 +139,7 @@ configure<kotlinx.validation.ApiValidationExtension> {
   )
 
   ignoredProjects.add("intellij-plugin")
+  ignoredProjects.add("apollo-testing-support-internal")
 }
 
 tasks.register("rmbuild") {

gradle.properties

@@ -29,3 +29,5 @@ org.jetbrains.dokka.gradle.enableLogHtmlPublicationLink=false
 ksp.useKSP2=true
 org.jetbrains.dokka.experimental.tryK2=true
 org.jetbrains.dokka.experimental.tryK2.nowarn=true
+# https://youtrack.jetbrains.com/issue/KT-75605/Dependency-resolution-fails-in-commonTest-nativeTest-source-sets-for-KMP-module-when-depending-on-another-project-due-to-missing#focus=Comments-27-11699378.0-0
+kotlin.kmp.isolated-projects.support=auto

gradle/libraries.toml

@@ -82,6 +82,7 @@ apollo-runtime-published = { group = "com.apollographql.apollo", name = "apollo-
 apollo-annotations = { group = "com.apollographql.apollo", name = "apollo-annotations", version.ref = "apollo" }
 apollo-engine-ktor = { group = "com.apollographql.apollo", name = "apollo-engine-ktor", version.ref = "apollo" }
 apollo-testingsupport = { group = "com.apollographql.apollo", name = "apollo-testing-support", version.ref = "apollo" }
+apollo-testingsupport-internal = { group = "com.apollographql.apollo", name = "apollo-testing-support-internal", version.ref = "apollo" }
 apollo-tooling = { group = "com.apollographql.apollo", name = "apollo-tooling", version.ref = "apollo" }
 assertj = { group = "org.assertj", name = "assertj-core", version = "3.24.2" }
 atomicfu-library = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.ref = "atomicfu" }

libraries/apollo-engine-tests/build.gradle.kts

@@ -18,7 +18,7 @@ kotlin {
     }
     findByName("commonTest")?.apply {
       dependencies {
-        implementation(project(":apollo-testing-support"))
+        implementation(project(":apollo-testing-support-internal"))
       }
     }
     findByName("jvmTest")?.apply {

libraries/apollo-engine-tests/src/commonTest/kotlin/AllTests.kt

@@ -3,17 +3,21 @@ import com.apollographql.apollo.engine.tests.platform
 import com.apollographql.apollo.engine.tests.runAllTests
 import com.apollographql.apollo.network.http.DefaultHttpEngine
 import com.apollographql.apollo.network.ws.DefaultWebSocketEngine
-import com.apollographql.apollo.testing.internal.runTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withContext
 import kotlin.test.Test
 
 class AllTests {
 
   @Test
   fun runAllTest() = runTest {
-    runAllTests(
-        engine = { DefaultHttpEngine(it) },
-        webSocketEngine = { DefaultWebSocketEngine() },
-        platform() != Platform.Native
-    )
+    withContext(Dispatchers.Default.limitedParallelism(1)) {
+      runAllTests(
+          engine = { DefaultHttpEngine(it) },
+          webSocketEngine = { DefaultWebSocketEngine() },
+          platform() != Platform.Native
+      )
+    }
   }
 }

libraries/apollo-normalized-cache-sqlite/build.gradle.kts

@@ -66,7 +66,7 @@ kotlin {
 
     findByName("commonTest")?.apply {
       dependencies {
-        implementation(project(":apollo-testing-support"))
+        implementation(project(":apollo-testing-support-internal"))
       }
     }
   }

libraries/apollo-runtime/build.gradle.kts

@@ -27,7 +27,7 @@ kotlin {
     fun KotlinDependencyHandler.commonTestDependencies() {
       implementation(libs.apollo.mockserver)
       implementation(libs.turbine)
-      implementation(project(":apollo-testing-support")) {
+      implementation(project(":apollo-testing-support-internal")) {
         because("runTest")
         // We have a circular dependency here that creates a warning in JS
         // w: duplicate library name: com.apollographql.apollo:apollo-mockserver

libraries/apollo-runtime/src/appleTest/kotlin/com/apollographql/apollo/network/http/DefaultHttpEngineTest.kt

@@ -2,9 +2,9 @@ package com.apollographql.apollo.network.http
 
 import com.apollographql.apollo.api.http.HttpMethod
 import com.apollographql.apollo.api.http.HttpRequest
+import com.apollographql.apollo.testing.internal.runTest
 import com.apollographql.mockserver.MockServer
 import com.apollographql.mockserver.enqueueString
-import com.apollographql.apollo.testing.internal.runTest
 import platform.Foundation.NSURLSessionConfiguration
 import kotlin.test.Test
 import kotlin.test.assertEquals

libraries/apollo-runtime/src/commonTest/kotlin/test/network/NetworkMonitorTest.kt

@@ -14,19 +14,15 @@ import com.apollographql.mockserver.assertNoRequest
 import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo.network.NetworkMonitor
 import com.apollographql.apollo.network.waitForNetwork
-import test.FooQuery
 import com.apollographql.apollo.testing.internal.runTest
+import test.FooQuery
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.test.TestResult
 import okio.use
 import kotlin.test.Test
@@ -115,7 +111,7 @@ class MockServerTest(val mockServer: MockServer, val apolloClient: ApolloClient,
 fun mockServerTest(
     clientBuilder: ApolloClient.Builder.() -> Unit = {},
     block: suspend MockServerTest.() -> Unit
-) = runTest() {
+) = runTest {
   MockServer().use { mockServer ->
     ApolloClient.Builder()
         .serverUrl(mockServer.url())