Skip to content

Commit 1c44e92

Browse files
martinbonninmartinbonnin
authored
make apollo-engine-tests internal (#6014)
1 parent 84e5481 commit 1c44e92

File tree

6 files changed

+16
-36
lines changed

6 files changed

+16
-36
lines changed

‎libraries/apollo-engine-tests/api/apollo-engine-tests.api

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +0,0 @@
1-
public final class com/apollographql/apollo3/engine/tests/All_testsKt {
2-
public static final fun runAllTests (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
3-
}
4-
5-
public final class com/apollographql/apollo3/engine/tests/GzipTestKt {
6-
public static final fun gzipTest (Lcom/apollographql/apollo3/network/http/HttpEngine;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
7-
}
8-
9-
public final class com/apollographql/apollo3/engine/tests/HttpEngineTestKt {
10-
public static final fun connectTimeout (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
11-
public static final fun errorWithBody (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
12-
public static final fun headers (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
13-
public static final fun post (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
14-
public static final fun readTimeout (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
15-
}
16-
17-
public final class com/apollographql/apollo3/engine/tests/WebSocketEngineTestKt {
18-
public static final fun binaryFrames (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
19-
public static final fun headers (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
20-
public static final fun serverCloseAbruptly (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
21-
public static final fun serverCloseNicely (Lkotlin/jvm/functions/Function0;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
22-
public static final fun textFrames (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
23-
}
24-

‎libraries/apollo-engine-tests/api/apollo-engine-tests.klib.api

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,3 @@
66
// - Show declarations: true
77

88
// Library unique name: <com.apollographql.apollo3:apollo-engine-tests>
9-
final suspend fun com.apollographql.apollo3.engine.tests/binaryFrames(kotlin/Function0<com.apollographql.apollo3.network.ws/WebSocketEngine>) // com.apollographql.apollo3.engine.tests/binaryFrames|binaryFrames(kotlin.Function0<com.apollographql.apollo3.network.ws.WebSocketEngine>){}[0]
10-
final suspend fun com.apollographql.apollo3.engine.tests/connectTimeout(kotlin/Function1<kotlin/Long, com.apollographql.apollo3.network.http/HttpEngine>): com.apollographql.apollo3.exception/ApolloException // com.apollographql.apollo3.engine.tests/connectTimeout|connectTimeout(kotlin.Function1<kotlin.Long,com.apollographql.apollo3.network.http.HttpEngine>){}[0]
11-
final suspend fun com.apollographql.apollo3.engine.tests/errorWithBody(kotlin/Function1<kotlin/Long, com.apollographql.apollo3.network.http/HttpEngine>) // com.apollographql.apollo3.engine.tests/errorWithBody|errorWithBody(kotlin.Function1<kotlin.Long,com.apollographql.apollo3.network.http.HttpEngine>){}[0]
12-
final suspend fun com.apollographql.apollo3.engine.tests/gzipTest(com.apollographql.apollo3.network.http/HttpEngine) // com.apollographql.apollo3.engine.tests/gzipTest|gzipTest(com.apollographql.apollo3.network.http.HttpEngine){}[0]
13-
final suspend fun com.apollographql.apollo3.engine.tests/headers(kotlin/Function0<com.apollographql.apollo3.network.ws/WebSocketEngine>) // com.apollographql.apollo3.engine.tests/headers|headers(kotlin.Function0<com.apollographql.apollo3.network.ws.WebSocketEngine>){}[0]
14-
final suspend fun com.apollographql.apollo3.engine.tests/headers(kotlin/Function1<kotlin/Long, com.apollographql.apollo3.network.http/HttpEngine>) // com.apollographql.apollo3.engine.tests/headers|headers(kotlin.Function1<kotlin.Long,com.apollographql.apollo3.network.http.HttpEngine>){}[0]
15-
final suspend fun com.apollographql.apollo3.engine.tests/post(kotlin/Function1<kotlin/Long, com.apollographql.apollo3.network.http/HttpEngine>) // com.apollographql.apollo3.engine.tests/post|post(kotlin.Function1<kotlin.Long,com.apollographql.apollo3.network.http.HttpEngine>){}[0]
16-
final suspend fun com.apollographql.apollo3.engine.tests/readTimeout(kotlin/Function1<kotlin/Long, com.apollographql.apollo3.network.http/HttpEngine>): com.apollographql.apollo3.exception/ApolloException // com.apollographql.apollo3.engine.tests/readTimeout|readTimeout(kotlin.Function1<kotlin.Long,com.apollographql.apollo3.network.http.HttpEngine>){}[0]
17-
final suspend fun com.apollographql.apollo3.engine.tests/runAllTests(kotlin/Function1<kotlin/Long, com.apollographql.apollo3.network.http/HttpEngine>, kotlin/Function0<com.apollographql.apollo3.network.ws/WebSocketEngine>, kotlin/Boolean) // com.apollographql.apollo3.engine.tests/runAllTests|runAllTests(kotlin.Function1<kotlin.Long,com.apollographql.apollo3.network.http.HttpEngine>;kotlin.Function0<com.apollographql.apollo3.network.ws.WebSocketEngine>;kotlin.Boolean){}[0]
18-
final suspend fun com.apollographql.apollo3.engine.tests/serverCloseAbruptly(kotlin/Function0<com.apollographql.apollo3.network.ws/WebSocketEngine>) // com.apollographql.apollo3.engine.tests/serverCloseAbruptly|serverCloseAbruptly(kotlin.Function0<com.apollographql.apollo3.network.ws.WebSocketEngine>){}[0]
19-
final suspend fun com.apollographql.apollo3.engine.tests/serverCloseNicely(kotlin/Function0<com.apollographql.apollo3.network.ws/WebSocketEngine>, kotlin/Boolean) // com.apollographql.apollo3.engine.tests/serverCloseNicely|serverCloseNicely(kotlin.Function0<com.apollographql.apollo3.network.ws.WebSocketEngine>;kotlin.Boolean){}[0]
20-
final suspend fun com.apollographql.apollo3.engine.tests/textFrames(kotlin/Function0<com.apollographql.apollo3.network.ws/WebSocketEngine>) // com.apollographql.apollo3.engine.tests/textFrames|textFrames(kotlin.Function0<com.apollographql.apollo3.network.ws.WebSocketEngine>){}[0]

‎libraries/apollo-engine-tests/src/commonMain/kotlin/com/apollographql/apollo3/engine/tests/GzipTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.apollographql.apollo3.engine.tests
22

3+
import com.apollographql.apollo3.annotations.ApolloInternal
34
import com.apollographql.apollo3.network.http.HttpEngine
45
import com.apollographql.apollo3.network.http.get
56
import com.apollographql.mockserver.MockResponse
@@ -23,6 +24,7 @@ private fun String.toByteString(): ByteString {
2324
return buffer.readByteString()
2425
}
2526

27+
@ApolloInternal
2628
suspend fun gzipTest(engine: HttpEngine) {
2729
val mockServer = MockServer()
2830

‎libraries/apollo-engine-tests/src/commonMain/kotlin/com/apollographql/apollo3/engine/tests/HttpEngineTest.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.apollographql.apollo3.engine.tests
22

3+
import com.apollographql.apollo3.annotations.ApolloInternal
34
import com.apollographql.apollo3.api.http.ByteStringHttpBody
45
import com.apollographql.apollo3.api.http.HttpMethod
56
import com.apollographql.apollo3.api.http.HttpRequest
@@ -16,6 +17,7 @@ import kotlin.test.assertFailsWith
1617
import kotlin.test.assertTrue
1718

1819

20+
@ApolloInternal
1921
suspend fun errorWithBody(engine: (Long) -> HttpEngine) = MockServer().use { mockServer ->
2022
mockServer.enqueueString(
2123
statusCode = 500,
@@ -26,6 +28,7 @@ suspend fun errorWithBody(engine: (Long) -> HttpEngine) = MockServer().use { moc
2628
assertEquals("Ooops", httpResponse.body?.readUtf8())
2729
}
2830

31+
@ApolloInternal
2932
suspend fun headers(engine: (Long) -> HttpEngine) = MockServer().use { mockServer ->
3033
mockServer.enqueue(
3134
MockResponse.Builder()
@@ -48,6 +51,7 @@ suspend fun headers(engine: (Long) -> HttpEngine) = MockServer().use { mockServe
4851
assertEquals("responseValue2", httpResponse.headers.valueOf("responseHeader2"))
4952
}
5053

54+
@ApolloInternal
5155
suspend fun post(engine: (Long) -> HttpEngine) = MockServer().use { mockServer ->
5256
mockServer.enqueue(
5357
MockResponse.Builder()
@@ -67,6 +71,7 @@ suspend fun post(engine: (Long) -> HttpEngine) = MockServer().use { mockServer -
6771
assertEquals("body".length.toString(), request.headers["Content-Length"])
6872
}
6973

74+
@ApolloInternal
7075
suspend fun connectTimeout(engine: (Long) -> HttpEngine) = MockServer().use { mockServer ->
7176
assertFailsWith<ApolloException> {
7277

@@ -75,6 +80,7 @@ suspend fun connectTimeout(engine: (Long) -> HttpEngine) = MockServer().use { mo
7580
}
7681
}
7782

83+
@ApolloInternal
7884
suspend fun readTimeout(engine: (Long) -> HttpEngine) = MockServer().use { mockServer ->
7985
mockServer.enqueue(
8086
MockResponse.Builder()

‎libraries/apollo-engine-tests/src/commonMain/kotlin/com/apollographql/apollo3/engine/tests/WebSocketEngineTest.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.apollographql.apollo3.engine.tests
22

3+
import com.apollographql.apollo3.annotations.ApolloInternal
34
import com.apollographql.apollo3.api.http.HttpHeader
45
import com.apollographql.apollo3.exception.ApolloException
56
import com.apollographql.apollo3.exception.ApolloNetworkException
@@ -34,6 +35,7 @@ private fun maySkipCloseFrame(): Boolean {
3435
return platform() == Platform.Native
3536
}
3637

38+
@ApolloInternal
3739
suspend fun textFrames(webSocketEngine: () -> WebSocketEngine) {
3840
val webSocketServer = MockServer()
3941

@@ -61,6 +63,7 @@ suspend fun textFrames(webSocketEngine: () -> WebSocketEngine) {
6163
webSocketServer.close()
6264
}
6365

66+
@ApolloInternal
6467
suspend fun binaryFrames(webSocketEngine: () -> WebSocketEngine) {
6568
if (platform() == Platform.Js) return
6669

@@ -90,6 +93,7 @@ suspend fun binaryFrames(webSocketEngine: () -> WebSocketEngine) {
9093
webSocketServer.close()
9194
}
9295

96+
@ApolloInternal
9397
suspend fun serverCloseNicely(webSocketEngine: () -> WebSocketEngine, checkCloseCode: Boolean) {
9498
if (platform() == Platform.Js) return // It's not clear how termination works on JS
9599

@@ -117,6 +121,7 @@ suspend fun serverCloseNicely(webSocketEngine: () -> WebSocketEngine, checkClose
117121
webSocketServer.close()
118122
}
119123

124+
@ApolloInternal
120125
suspend fun serverCloseAbruptly(webSocketEngine: () -> WebSocketEngine) {
121126
if (platform() == Platform.Js) return // It's not clear how termination works on JS
122127
if (platform() == Platform.Native) return // https://youtrack.jetbrains.com/issue/KTOR-6406
@@ -135,6 +140,7 @@ suspend fun serverCloseAbruptly(webSocketEngine: () -> WebSocketEngine) {
135140
connection.close()
136141
}
137142

143+
@ApolloInternal
138144
suspend fun headers(webSocketEngine: () -> WebSocketEngine) {
139145
val webSocketServer = MockServer()
140146

‎libraries/apollo-engine-tests/src/commonMain/kotlin/com/apollographql/apollo3/engine/tests/all-tests.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.apollographql.apollo3.engine.tests
22

3+
import com.apollographql.apollo3.annotations.ApolloInternal
34
import com.apollographql.apollo3.network.http.HttpEngine
45
import com.apollographql.apollo3.network.ws.WebSocketEngine
56

7+
@ApolloInternal
68
suspend fun runAllTests(engine: (Long) -> HttpEngine, webSocketEngine: () -> WebSocketEngine, checkCloseFrame: Boolean) {
79
gzipTest(engine(60_000))
810
errorWithBody(engine)

0 commit comments

Comments
 (0)