Skip to content

Commit e9f2620

Browse files
martinbonninmartinbonnin
authored
Use com.apollographql.mockserver.MockServer (#5939)
* Use com.apollographql.mockserver.MockServer * unbreak ctng
1 parent 5b6ad56 commit e9f2620

File tree

101 files changed

+295
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+295
-240
lines changed

‎benchmark/microbenchmark/src/androidTestIncubating/kotlin/com/apollographql/apollo3/benchmark/CacheIncubatingIntegrationTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
1616
import com.apollographql.apollo3.cache.normalized.fetchPolicy
1717
import com.apollographql.apollo3.cache.normalized.sql.SqlNormalizedCacheFactory
1818
import com.apollographql.apollo3.cache.normalized.store
19-
import com.apollographql.apollo3.mockserver.MockRequestBase
20-
import com.apollographql.apollo3.mockserver.MockResponse
21-
import com.apollographql.apollo3.mockserver.MockServer
22-
import com.apollographql.apollo3.mockserver.MockServerHandler
19+
import com.apollographql.mockserver.MockRequestBase
20+
import com.apollographql.mockserver.MockResponse
21+
import com.apollographql.mockserver.MockServer
22+
import com.apollographql.mockserver.MockServerHandler
2323
import com.apollographql.apollo3.testing.MapTestNetworkTransport
2424
import com.apollographql.apollo3.testing.registerTestResponse
2525
import kotlinx.coroutines.joinAll

‎benchmark/microbenchmark/src/androidTestStable/kotlin/com/apollographql/apollo3/benchmark/CacheIntegrationTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
1616
import com.apollographql.apollo3.cache.normalized.fetchPolicy
1717
import com.apollographql.apollo3.cache.normalized.sql.SqlNormalizedCacheFactory
1818
import com.apollographql.apollo3.cache.normalized.store
19-
import com.apollographql.apollo3.mockserver.MockRequestBase
20-
import com.apollographql.apollo3.mockserver.MockResponse
21-
import com.apollographql.apollo3.mockserver.MockServer
22-
import com.apollographql.apollo3.mockserver.MockServerHandler
19+
import com.apollographql.mockserver.MockRequestBase
20+
import com.apollographql.mockserver.MockResponse
21+
import com.apollographql.mockserver.MockServer
22+
import com.apollographql.mockserver.MockServerHandler
2323
import com.apollographql.apollo3.testing.MapTestNetworkTransport
2424
import com.apollographql.apollo3.testing.registerTestResponse
2525
import kotlinx.coroutines.joinAll

‎gradle/libraries.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ apollo-api = { group = "com.apollographql.apollo3", name = "apollo-api", version
6666
apollo-api-java = { group = "com.apollographql.apollo3", name = "apollo-api-java", version.ref = "apollo" }
6767
apollo-httpCache = { group = "com.apollographql.apollo3", name = "apollo-http-cache", version.ref = "apollo" }
6868
apollo-idlingresource = { group = "com.apollographql.apollo3", name = "apollo-idling-resource", version.ref = "apollo" }
69-
apollo-mockserver = { group = "com.apollographql.apollo3", name = "apollo-mockserver", version.ref = "apollo" }
70-
# Used by the apollo-tooling project which uses a published version of Apollo
71-
apollo-mockserver-published = { group = "com.apollographql.apollo3", name = "apollo-mockserver", version.ref = "apollo-published" }
69+
apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version = "0.0.1" }
7270
apollo-mpputils = { group = "com.apollographql.apollo3", name = "apollo-mpp-utils", version.ref = "apollo" }
7371
apollo-normalizedcache = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache", version.ref = "apollo" }
7472
apollo-normalizedcache-incubating = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache-incubating", version.ref = "apollo" }

‎libraries/apollo-http-cache/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
implementation(libs.moshi)
1414
implementation(libs.kotlinx.datetime)
1515

16-
testImplementation(project(":apollo-mockserver"))
16+
testImplementation(libs.apollo.mockserver)
1717
testImplementation(libs.kotlin.test.junit)
1818
testImplementation(libs.truth)
1919
}

‎libraries/apollo-http-cache/src/test/kotlin/com/apollographql/apollo3/cache/http/internal/CachingHttpInterceptorTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import com.apollographql.apollo3.api.http.HttpResponse
66
import com.apollographql.apollo3.api.http.valueOf
77
import com.apollographql.apollo3.cache.http.CachingHttpInterceptor
88
import com.apollographql.apollo3.exception.HttpCacheMissException
9-
import com.apollographql.apollo3.mockserver.MockResponse
10-
import com.apollographql.apollo3.mockserver.MockServer
11-
import com.apollographql.apollo3.mockserver.enqueueString
9+
import com.apollographql.mockserver.MockResponse
10+
import com.apollographql.mockserver.MockServer
11+
import com.apollographql.mockserver.enqueueString
1212
import com.apollographql.apollo3.network.http.DefaultHttpEngine
1313
import com.apollographql.apollo3.network.http.HttpInterceptorChain
1414
import kotlinx.coroutines.Dispatchers

‎libraries/apollo-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kotlin {
2424
}
2525

2626
fun KotlinDependencyHandler.commonTestDependencies() {
27-
implementation(project(":apollo-mockserver"))
27+
implementation(libs.apollo.mockserver)
2828
implementation(libs.turbine)
2929
implementation(project(":apollo-testing-support")) {
3030
because("runTest")

‎libraries/apollo-runtime/src/androidInstrumentedTest/kotlin/instrumented/NetworkMonitorTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import androidx.test.platform.app.InstrumentationRegistry
44
import com.apollographql.apollo3.api.http.HttpRequest
55
import com.apollographql.apollo3.api.http.HttpResponse
66
import com.apollographql.apollo3.exception.ApolloNetworkException
7-
import com.apollographql.apollo3.mockserver.assertNoRequest
8-
import com.apollographql.apollo3.mockserver.enqueueString
7+
import com.apollographql.mockserver.assertNoRequest
8+
import com.apollographql.mockserver.enqueueString
99
import com.apollographql.apollo3.network.NetworkMonitor
1010
import com.apollographql.apollo3.network.http.DefaultHttpEngine
1111
import com.apollographql.apollo3.network.http.HttpEngine

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.apollographql.apollo3.network.http
22

33
import com.apollographql.apollo3.api.http.HttpMethod
44
import com.apollographql.apollo3.api.http.HttpRequest
5-
import com.apollographql.apollo3.mockserver.MockServer
6-
import com.apollographql.apollo3.mockserver.enqueueString
5+
import com.apollographql.mockserver.MockServer
6+
import com.apollographql.mockserver.enqueueString
77
import com.apollographql.apollo3.testing.internal.runTest
88
import platform.Foundation.NSURLSessionConfiguration
99
import kotlin.test.Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import com.apollographql.apollo3.api.Operation
88
import com.apollographql.apollo3.exception.ApolloNetworkException
99
import com.apollographql.apollo3.interceptor.ApolloInterceptor
1010
import com.apollographql.apollo3.interceptor.ApolloInterceptorChain
11-
import com.apollographql.apollo3.mockserver.MockServer
12-
import com.apollographql.apollo3.mockserver.assertNoRequest
13-
import com.apollographql.apollo3.mockserver.enqueueString
11+
import com.apollographql.mockserver.MockServer
12+
import com.apollographql.mockserver.assertNoRequest
13+
import com.apollographql.mockserver.enqueueString
1414
import com.apollographql.apollo3.network.NetworkMonitor
1515
import com.apollographql.apollo3.testing.FooQuery
1616
import com.apollographql.apollo3.testing.internal.runTest

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package test.network
22

33
import com.apollographql.apollo3.exception.ApolloException
4-
import com.apollographql.apollo3.mockserver.CloseFrame
5-
import com.apollographql.apollo3.mockserver.DataMessage
6-
import com.apollographql.apollo3.mockserver.MockRequestBase
7-
import com.apollographql.apollo3.mockserver.MockServer
8-
import com.apollographql.apollo3.mockserver.PingFrame
9-
import com.apollographql.apollo3.mockserver.PongFrame
10-
import com.apollographql.apollo3.mockserver.TextMessage
11-
import com.apollographql.apollo3.mockserver.WebSocketBody
12-
import com.apollographql.apollo3.mockserver.WebSocketMessage
13-
import com.apollographql.apollo3.mockserver.WebsocketMockRequest
14-
import com.apollographql.apollo3.mockserver.awaitWebSocketRequest
15-
import com.apollographql.apollo3.mockserver.enqueueWebSocket
4+
import com.apollographql.mockserver.CloseFrame
5+
import com.apollographql.mockserver.DataMessage
6+
import com.apollographql.mockserver.MockRequestBase
7+
import com.apollographql.mockserver.MockServer
8+
import com.apollographql.mockserver.PingFrame
9+
import com.apollographql.mockserver.PongFrame
10+
import com.apollographql.mockserver.TextMessage
11+
import com.apollographql.mockserver.WebSocketBody
12+
import com.apollographql.mockserver.WebSocketMessage
13+
import com.apollographql.mockserver.WebsocketMockRequest
14+
import com.apollographql.mockserver.awaitWebSocketRequest
15+
import com.apollographql.mockserver.enqueueWebSocket
1616
import com.apollographql.apollo3.mpp.Platform
1717
import com.apollographql.apollo3.mpp.platform
1818
import com.apollographql.apollo3.network.websocket.WebSocket

0 commit comments

Comments
 (0)