Use com.apollographql.mockserver.MockServer (apollographql#5939)

* Use com.apollographql.mockserver.MockServer * unbreak ctng
BoD · Jul 1, 2024 · ad7f498 · ad7f498
1 parent 32a20a1
commit ad7f498
Show file tree

Hide file tree

Showing 101 changed files with 295 additions and 240 deletions.
diff --git a/...tIncubating/kotlin/com/apollographql/apollo3/benchmark/CacheIncubatingIntegrationTests.kt b/...tIncubating/kotlin/com/apollographql/apollo3/benchmark/CacheIncubatingIntegrationTests.kt
@@ -16,10 +16,10 @@ import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
 import com.apollographql.apollo3.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.apollo3.cache.normalized.store
-import com.apollographql.apollo3.mockserver.MockRequestBase
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.MockServerHandler
+import com.apollographql.mockserver.MockRequestBase
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.MockServerHandler
 import com.apollographql.apollo3.testing.MapTestNetworkTransport
 import com.apollographql.apollo3.testing.registerTestResponse
 import kotlinx.coroutines.joinAll

diff --git a/...src/androidTestStable/kotlin/com/apollographql/apollo3/benchmark/CacheIntegrationTests.kt b/...src/androidTestStable/kotlin/com/apollographql/apollo3/benchmark/CacheIntegrationTests.kt
@@ -16,10 +16,10 @@ import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
 import com.apollographql.apollo3.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.apollo3.cache.normalized.store
-import com.apollographql.apollo3.mockserver.MockRequestBase
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.MockServerHandler
+import com.apollographql.mockserver.MockRequestBase
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.MockServerHandler
 import com.apollographql.apollo3.testing.MapTestNetworkTransport
 import com.apollographql.apollo3.testing.registerTestResponse
 import kotlinx.coroutines.joinAll

diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -66,9 +66,7 @@ apollo-api = { group = "com.apollographql.apollo3", name = "apollo-api", version
 apollo-api-java = { group = "com.apollographql.apollo3", name = "apollo-api-java", version.ref = "apollo" }
 apollo-httpCache = { group = "com.apollographql.apollo3", name = "apollo-http-cache", version.ref = "apollo" }
 apollo-idlingresource = { group = "com.apollographql.apollo3", name = "apollo-idling-resource", version.ref = "apollo" }
-apollo-mockserver = { group = "com.apollographql.apollo3", name = "apollo-mockserver", version.ref = "apollo" }
-# Used by the apollo-tooling project which uses a published version of Apollo
-apollo-mockserver-published = { group = "com.apollographql.apollo3", name = "apollo-mockserver", version.ref = "apollo-published" }
+apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version = "0.0.1" }
 apollo-mpputils = { group = "com.apollographql.apollo3", name = "apollo-mpp-utils", version.ref = "apollo" }
 apollo-normalizedcache = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache", version.ref = "apollo" }
 apollo-normalizedcache-incubating = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache-incubating", version.ref = "apollo" }

diff --git a/libraries/apollo-http-cache/build.gradle.kts b/libraries/apollo-http-cache/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
   implementation(libs.moshi)
   implementation(libs.kotlinx.datetime)
 
-  testImplementation(project(":apollo-mockserver"))
+  testImplementation(libs.apollo.mockserver)
   testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.truth)
 }
diff --git a/...c/test/kotlin/com/apollographql/apollo3/cache/http/internal/CachingHttpInterceptorTest.kt b/...c/test/kotlin/com/apollographql/apollo3/cache/http/internal/CachingHttpInterceptorTest.kt
@@ -6,9 +6,9 @@ import com.apollographql.apollo3.api.http.HttpResponse
 import com.apollographql.apollo3.api.http.valueOf
 import com.apollographql.apollo3.cache.http.CachingHttpInterceptor
 import com.apollographql.apollo3.exception.HttpCacheMissException
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.network.http.DefaultHttpEngine
 import com.apollographql.apollo3.network.http.HttpInterceptorChain
 import kotlinx.coroutines.Dispatchers

diff --git a/libraries/apollo-runtime/build.gradle.kts b/libraries/apollo-runtime/build.gradle.kts
@@ -24,7 +24,7 @@ kotlin {
     }
 
     fun KotlinDependencyHandler.commonTestDependencies() {
-      implementation(project(":apollo-mockserver"))
+      implementation(libs.apollo.mockserver)
       implementation(libs.turbine)
       implementation(project(":apollo-testing-support")) {
         because("runTest")

diff --git a/...ries/apollo-runtime/src/androidInstrumentedTest/kotlin/instrumented/NetworkMonitorTest.kt b/...ries/apollo-runtime/src/androidInstrumentedTest/kotlin/instrumented/NetworkMonitorTest.kt
@@ -4,8 +4,8 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.apollographql.apollo3.api.http.HttpRequest
 import com.apollographql.apollo3.api.http.HttpResponse
 import com.apollographql.apollo3.exception.ApolloNetworkException
-import com.apollographql.apollo3.mockserver.assertNoRequest
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.assertNoRequest
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.network.NetworkMonitor
 import com.apollographql.apollo3.network.http.DefaultHttpEngine
 import com.apollographql.apollo3.network.http.HttpEngine

diff --git a/...time/src/appleTest/kotlin/com/apollographql/apollo3/network/http/DefaultHttpEngineTest.kt b/...time/src/appleTest/kotlin/com/apollographql/apollo3/network/http/DefaultHttpEngineTest.kt
@@ -2,8 +2,8 @@ package com.apollographql.apollo3.network.http
 
 import com.apollographql.apollo3.api.http.HttpMethod
 import com.apollographql.apollo3.api.http.HttpRequest
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.testing.internal.runTest
 import platform.Foundation.NSURLSessionConfiguration
 import kotlin.test.Test

diff --git a/libraries/apollo-runtime/src/commonTest/kotlin/test/network/NetworkMonitorTest.kt b/libraries/apollo-runtime/src/commonTest/kotlin/test/network/NetworkMonitorTest.kt
@@ -8,9 +8,9 @@ import com.apollographql.apollo3.api.Operation
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.interceptor.ApolloInterceptor
 import com.apollographql.apollo3.interceptor.ApolloInterceptorChain
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.assertNoRequest
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.assertNoRequest
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.network.NetworkMonitor
 import com.apollographql.apollo3.testing.FooQuery
 import com.apollographql.apollo3.testing.internal.runTest

diff --git a/libraries/apollo-runtime/src/commonTest/kotlin/test/network/WebSocketEngineTest.kt b/libraries/apollo-runtime/src/commonTest/kotlin/test/network/WebSocketEngineTest.kt
@@ -1,18 +1,18 @@
 package test.network
 
 import com.apollographql.apollo3.exception.ApolloException
-import com.apollographql.apollo3.mockserver.CloseFrame
-import com.apollographql.apollo3.mockserver.DataMessage
-import com.apollographql.apollo3.mockserver.MockRequestBase
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.PingFrame
-import com.apollographql.apollo3.mockserver.PongFrame
-import com.apollographql.apollo3.mockserver.TextMessage
-import com.apollographql.apollo3.mockserver.WebSocketBody
-import com.apollographql.apollo3.mockserver.WebSocketMessage
-import com.apollographql.apollo3.mockserver.WebsocketMockRequest
-import com.apollographql.apollo3.mockserver.awaitWebSocketRequest
-import com.apollographql.apollo3.mockserver.enqueueWebSocket
+import com.apollographql.mockserver.CloseFrame
+import com.apollographql.mockserver.DataMessage
+import com.apollographql.mockserver.MockRequestBase
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.PingFrame
+import com.apollographql.mockserver.PongFrame
+import com.apollographql.mockserver.TextMessage
+import com.apollographql.mockserver.WebSocketBody
+import com.apollographql.mockserver.WebSocketMessage
+import com.apollographql.mockserver.WebsocketMockRequest
+import com.apollographql.mockserver.awaitWebSocketRequest
+import com.apollographql.mockserver.enqueueWebSocket
 import com.apollographql.apollo3.mpp.Platform
 import com.apollographql.apollo3.mpp.platform
 import com.apollographql.apollo3.network.websocket.WebSocket

diff --git a/libraries/apollo-runtime/src/commonTest/kotlin/test/network/WebSocketNetworkTransportTest.kt b/libraries/apollo-runtime/src/commonTest/kotlin/test/network/WebSocketNetworkTransportTest.kt
@@ -8,13 +8,13 @@ import com.apollographql.apollo3.exception.ApolloWebSocketClosedException
 import com.apollographql.apollo3.exception.DefaultApolloException
 import com.apollographql.apollo3.exception.SubscriptionOperationException
 import com.apollographql.apollo3.interceptor.addRetryOnErrorInterceptor
-import com.apollographql.apollo3.mockserver.CloseFrame
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.TextMessage
-import com.apollographql.apollo3.mockserver.WebSocketBody
-import com.apollographql.apollo3.mockserver.WebsocketMockRequest
-import com.apollographql.apollo3.mockserver.awaitWebSocketRequest
-import com.apollographql.apollo3.mockserver.enqueueWebSocket
+import com.apollographql.mockserver.CloseFrame
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.TextMessage
+import com.apollographql.mockserver.WebSocketBody
+import com.apollographql.mockserver.WebsocketMockRequest
+import com.apollographql.mockserver.awaitWebSocketRequest
+import com.apollographql.mockserver.enqueueWebSocket
 import com.apollographql.apollo3.mpp.Platform
 import com.apollographql.apollo3.mpp.platform
 import com.apollographql.apollo3.network.websocket.WebSocketNetworkTransport
@@ -23,7 +23,6 @@ import com.apollographql.apollo3.testing.FooSubscription
 import com.apollographql.apollo3.testing.FooSubscription.Companion.completeMessage
 import com.apollographql.apollo3.testing.FooSubscription.Companion.errorMessage
 import com.apollographql.apollo3.testing.FooSubscription.Companion.nextMessage
-import com.apollographql.apollo3.testing.awaitSubscribe
 import com.apollographql.apollo3.testing.connectionAckMessage
 import com.apollographql.apollo3.testing.internal.runTest
 import kotlinx.coroutines.CoroutineScope

diff --git a/libraries/apollo-runtime/src/commonTest/kotlin/test/network/utils.kt b/libraries/apollo-runtime/src/commonTest/kotlin/test/network/utils.kt
@@ -0,0 +1,44 @@
+package test.network
+
+import com.apollographql.apollo3.annotations.ApolloExperimental
+import com.apollographql.apollo3.api.json.jsonReader
+import com.apollographql.apollo3.api.json.readAny
+import com.apollographql.mockserver.TextMessage
+import com.apollographql.mockserver.WebsocketMockRequest
+import okio.Buffer
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+suspend fun WebsocketMockRequest.awaitSubscribe(timeout: Duration = 1.seconds, messagesToIgnore: Set<String> = emptySet()): String {
+  while(true) {
+    val message = awaitMessage(timeout)
+    if (message !is TextMessage) {
+      TODO()
+    }
+    val map = (Buffer().writeUtf8(message.text).jsonReader().readAny() as Map<*, *>)
+
+    if (messagesToIgnore.contains(map["type"])) {
+      continue
+    }
+    check(map["type"] == "subscribe") {
+      "Expected subscribe, got '${map.get("type")}'"
+    }
+    return map.get("id") as String
+  }
+}
+
+/**
+ * Extracts the operationId from a graphql-ws message, ignores "complete messages"
+ */
+@ApolloExperimental
+suspend fun WebsocketMockRequest.awaitComplete(timeout: Duration = 1.seconds) {
+  val message = awaitMessage(timeout)
+  if (message !is TextMessage) {
+    TODO()
+  }
+  val map = (Buffer().writeUtf8(message.text).jsonReader().readAny() as Map<*, *>)
+
+  check(map["type"] == "complete") {
+    "Expected complete, got '${map.get("type")}"
+  }
+}
diff --git a/libraries/apollo-runtime/src/jvmTest/kotlin/RetryWebSocketsTest.kt b/libraries/apollo-runtime/src/jvmTest/kotlin/RetryWebSocketsTest.kt
@@ -5,16 +5,15 @@ import com.apollographql.apollo3.api.Subscription
 import com.apollographql.apollo3.exception.ApolloHttpException
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.interceptor.addRetryOnErrorInterceptor
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.awaitWebSocketRequest
-import com.apollographql.apollo3.mockserver.enqueueWebSocket
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.awaitWebSocketRequest
+import com.apollographql.mockserver.enqueueWebSocket
 import com.apollographql.apollo3.network.websocket.WebSocketNetworkTransport
 import com.apollographql.apollo3.testing.FooQuery
 import com.apollographql.apollo3.testing.FooSubscription
 import com.apollographql.apollo3.testing.FooSubscription.Companion.completeMessage
 import com.apollographql.apollo3.testing.FooSubscription.Companion.nextMessage
-import com.apollographql.apollo3.testing.awaitSubscribe
 import com.apollographql.apollo3.testing.connectionAckMessage
 import com.apollographql.apollo3.testing.internal.runTest
 import kotlinx.coroutines.CoroutineScope
@@ -31,6 +30,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertNotEquals
 import kotlin.time.Duration.Companion.seconds
+import test.network.awaitSubscribe
 
 class RetryWebSocketsTest {
   @Test

diff --git a/libraries/apollo-tooling/build.gradle.kts b/libraries/apollo-tooling/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 
   testImplementation(libs.junit)
   testImplementation(libs.truth)
-  testImplementation(libs.apollo.mockserver.published)
+  testImplementation(libs.apollo.mockserver)
   testImplementation(libs.apollo.testingsupport.published)
 }
 

diff --git a/...es/apollo-tooling/src/test/kotlin/com/apollographql/apollo3/tooling/FieldInsightsTests.kt b/...es/apollo-tooling/src/test/kotlin/com/apollographql/apollo3/tooling/FieldInsightsTests.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo3.tooling
 
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.testing.internal.runTest
 import com.google.common.truth.Truth
 import org.junit.Test

diff --git a/...apollo-tooling/src/test/kotlin/com/apollographql/apollo3/tooling/SchemaDownloaderTests.kt b/...apollo-tooling/src/test/kotlin/com/apollographql/apollo3/tooling/SchemaDownloaderTests.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo3.tooling
 
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.testing.internal.runTest
 import com.apollographql.apollo3.testing.pathToUtf8
 import org.junit.Assert.assertEquals

diff --git a/tests/defer/build.gradle.kts b/tests/defer/build.gradle.kts
@@ -17,8 +17,8 @@ kotlin {
     findByName("commonTest")?.apply {
       dependencies {
         implementation(libs.apollo.normalizedcache)
-        implementation(libs.apollo.mockserver)
         implementation(libs.apollo.testingsupport)
+        implementation(libs.apollo.mockserver)
       }
     }
 

diff --git a/tests/defer/src/commonTest/kotlin/test/DeferNormalizedCacheTest.kt b/tests/defer/src/commonTest/kotlin/test/DeferNormalizedCacheTest.kt
@@ -17,12 +17,12 @@ import com.apollographql.apollo3.exception.ApolloException
 import com.apollographql.apollo3.exception.ApolloHttpException
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.exception.CacheMissException
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.assertNoRequest
-import com.apollographql.apollo3.mockserver.awaitRequest
-import com.apollographql.apollo3.mockserver.enqueueError
-import com.apollographql.apollo3.mockserver.enqueueMultipart
-import com.apollographql.apollo3.mockserver.enqueueStrings
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.assertNoRequest
+import com.apollographql.mockserver.awaitRequest
+import com.apollographql.mockserver.enqueueError
+import com.apollographql.mockserver.enqueueMultipart
+import com.apollographql.mockserver.enqueueStrings
 import com.apollographql.apollo3.mpp.Platform
 import com.apollographql.apollo3.mpp.platform
 import com.apollographql.apollo3.network.NetworkTransport

diff --git a/tests/defer/src/commonTest/kotlin/test/DeferTest.kt b/tests/defer/src/commonTest/kotlin/test/DeferTest.kt
@@ -4,10 +4,10 @@ import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.api.ApolloResponse
 import com.apollographql.apollo3.api.Error
 import com.apollographql.apollo3.autoPersistedQueryInfo
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.enqueueMultipart
-import com.apollographql.apollo3.mockserver.enqueueString
-import com.apollographql.apollo3.mockserver.enqueueStrings
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.enqueueMultipart
+import com.apollographql.mockserver.enqueueString
+import com.apollographql.mockserver.enqueueStrings
 import com.apollographql.apollo3.mpp.Platform
 import com.apollographql.apollo3.mpp.currentTimeMillis
 import com.apollographql.apollo3.mpp.platform

diff --git a/tests/defer/src/jvmTest/kotlin/test/DeferJvmTest.kt b/tests/defer/src/jvmTest/kotlin/test/DeferJvmTest.kt
@@ -4,8 +4,8 @@ import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.cache.http.HttpFetchPolicy
 import com.apollographql.apollo3.cache.http.httpCache
 import com.apollographql.apollo3.cache.http.httpFetchPolicy
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.enqueueMultipart
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.enqueueMultipart
 import com.apollographql.apollo3.mpp.currentTimeMillis
 import com.apollographql.apollo3.testing.awaitElement
 import com.apollographql.apollo3.testing.internal.runTest

diff --git a/tests/engine/build.gradle.kts b/tests/engine/build.gradle.kts
@@ -19,8 +19,8 @@ kotlin {
 
     val commonTest = getByName("commonTest").apply {
       dependencies {
-        implementation(libs.apollo.mockserver)
         implementation(libs.apollo.testingsupport)
+        implementation(libs.apollo.mockserver)
         implementation(libs.turbine)
       }
     }

diff --git a/tests/engine/src/commonTest/kotlin/GzipTest.kt b/tests/engine/src/commonTest/kotlin/GzipTest.kt
@@ -1,6 +1,6 @@
 
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
 import com.apollographql.apollo3.network.http.DefaultHttpEngine
 import com.apollographql.apollo3.network.http.HttpEngine
 import com.apollographql.apollo3.network.http.get

diff --git a/tests/engine/src/commonTest/kotlin/HttpEngineTest.kt b/tests/engine/src/commonTest/kotlin/HttpEngineTest.kt
@@ -3,10 +3,10 @@ import com.apollographql.apollo3.api.http.HttpMethod
 import com.apollographql.apollo3.api.http.HttpRequest
 import com.apollographql.apollo3.api.http.valueOf
 import com.apollographql.apollo3.exception.ApolloException
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.awaitRequest
-import com.apollographql.apollo3.mockserver.enqueueString
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.awaitRequest
+import com.apollographql.mockserver.enqueueString
 import com.apollographql.apollo3.testing.internal.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/tests/engine/src/commonTest/kotlin/WebSocketEngineTest.kt b/tests/engine/src/commonTest/kotlin/WebSocketEngineTest.kt
@@ -3,12 +3,12 @@ import com.apollographql.apollo3.api.http.HttpHeader
 import com.apollographql.apollo3.exception.ApolloException
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.exception.ApolloWebSocketClosedException
-import com.apollographql.apollo3.mockserver.CloseFrame
-import com.apollographql.apollo3.mockserver.DataMessage
-import com.apollographql.apollo3.mockserver.MockServer
-import com.apollographql.apollo3.mockserver.TextMessage
-import com.apollographql.apollo3.mockserver.awaitWebSocketRequest
-import com.apollographql.apollo3.mockserver.enqueueWebSocket
+import com.apollographql.mockserver.CloseFrame
+import com.apollographql.mockserver.DataMessage
+import com.apollographql.mockserver.MockServer
+import com.apollographql.mockserver.TextMessage
+import com.apollographql.mockserver.awaitWebSocketRequest
+import com.apollographql.mockserver.enqueueWebSocket
 import com.apollographql.apollo3.mpp.Platform
 import com.apollographql.apollo3.mpp.platform
 import com.apollographql.apollo3.testing.internal.runTest

diff --git a/tests/gzip/build.gradle.kts b/tests/gzip/build.gradle.kts
@@ -16,6 +16,7 @@ kotlin {
     findByName("commonTest")?.apply {
       dependencies {
         implementation(libs.apollo.testingsupport)
+        implementation(libs.apollo.mockserver)
       }
     }
   }

diff --git a/tests/gzip/src/commonTest/kotlin/test/GzipTest.kt b/tests/gzip/src/commonTest/kotlin/test/GzipTest.kt
@@ -1,8 +1,8 @@
 package test
 
 import com.apollographql.apollo3.ApolloClient
-import com.apollographql.apollo3.mockserver.MockResponse
-import com.apollographql.apollo3.mockserver.MockServer
+import com.apollographql.mockserver.MockResponse
+import com.apollographql.mockserver.MockServer
 import com.apollographql.apollo3.testing.HostFileSystem
 import com.apollographql.apollo3.testing.internal.runTest
 import com.apollographql.apollo3.testing.testsPath