Skip to content

Commit b388eec

Browse files
bencehornakbencehornak
committed
Convert resource files into const val fields
Signed-off-by: Bence Hornák <[email protected]>
1 parent 25cfe6f commit b388eec

File tree

12 files changed

+57
-51
lines changed

12 files changed

+57
-51
lines changed

‎gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ openfeature-kotlin-sdk = { group="dev.openfeature", name="kotlin-sdk", version.r
1515
kotlin-test = { group="org.jetbrains.kotlin", name="kotlin-test", version.ref="kotlin" }
1616
kotlinx-coroutines-core = { group="org.jetbrains.kotlinx", name="kotlinx-coroutines-core", version.ref="kotlinx-coroutines" }
1717
kotlinx-coroutines-test = { group="org.jetbrains.kotlinx", name="kotlinx-coroutines-test", version.ref="kotlinx-coroutines" }
18-
okio = { module="com.squareup.okio:okio", version="3.13.0" }
1918

2019
[plugins]
2120
kotlin-multiplatform = { id="org.jetbrains.kotlin.multiplatform", version.ref="kotlin" }

‎providers/ofrep/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ kotlin {
2727
implementation(libs.ktor.cio)
2828
implementation(libs.ktor.client.content.negotiation)
2929
implementation(libs.ktor.serialization.kotlinx.json)
30-
implementation(libs.okio)
3130
}
3231
commonTest.dependencies {
3332
implementation(libs.kotlin.test)

‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/GetResourceAsString.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/OfrepProviderTest.kt

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
package dev.openfeature.kotlin.contrib.providers.ofrep
44

5+
import INVALID_CONTEXT_PAYLOAD
6+
import PARSE_ERROR_PAYLOAD
7+
import VALID_1_FLAG_IN_PARSE_ERROR_PAYLOAD
8+
import VALID_API_RESPONSE2_PAYLOAD
9+
import VALID_API_RESPONSE_PAYLOAD
10+
import VALID_API_SHORT_RESPONSE_PAYLOAD
511
import dev.openfeature.kotlin.contrib.providers.ofrep.bean.OfrepOptions
612
import dev.openfeature.kotlin.sdk.Client
713
import dev.openfeature.kotlin.sdk.EvaluationContext
@@ -86,7 +92,7 @@ class OfrepProviderTest {
8692
runTest {
8793
val mockEngine =
8894
mockEngineWithOneResponse(
89-
getResourceAsString("ofrep/valid_api_response.json"),
95+
VALID_API_RESPONSE_PAYLOAD,
9096
status = HttpStatusCode.fromValue(401),
9197
)
9298

@@ -114,7 +120,7 @@ class OfrepProviderTest {
114120
runTest {
115121
val mockEngine =
116122
mockEngineWithOneResponse(
117-
getResourceAsString("ofrep/valid_api_response.json"),
123+
VALID_API_RESPONSE_PAYLOAD,
118124
status = HttpStatusCode.fromValue(403),
119125
)
120126

@@ -142,7 +148,7 @@ class OfrepProviderTest {
142148
runTest {
143149
val mockEngine =
144150
mockEngineWithOneResponse(
145-
getResourceAsString("ofrep/valid_api_response.json"),
151+
VALID_API_RESPONSE_PAYLOAD,
146152
status = HttpStatusCode.fromValue(429),
147153
additionalHeaders = headersOf(HttpHeaders.RetryAfter, "3"),
148154
)
@@ -174,7 +180,7 @@ class OfrepProviderTest {
174180
fun `should be in Error status if error targeting key is empty`(): Unit =
175181
runTest {
176182
val mockEngine =
177-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
183+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
178184

179185
val provider = createOfrepProvider(mockEngine)
180186
var providerErrorReceived = false
@@ -205,7 +211,7 @@ class OfrepProviderTest {
205211
fun `should be in Error status if error targeting key is missing`(): Unit =
206212
runTest {
207213
val mockEngine =
208-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
214+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
209215

210216
val provider = createOfrepProvider(mockEngine)
211217
var providerErrorReceived = false
@@ -237,7 +243,7 @@ class OfrepProviderTest {
237243
runTest {
238244
val mockEngine =
239245
mockEngineWithOneResponse(
240-
getResourceAsString("ofrep/invalid_context.json"),
246+
INVALID_CONTEXT_PAYLOAD,
241247
status = HttpStatusCode.fromValue(400),
242248
)
243249
val provider = createOfrepProvider(mockEngine)
@@ -267,7 +273,7 @@ class OfrepProviderTest {
267273
runTest {
268274
val mockEngine =
269275
mockEngineWithOneResponse(
270-
getResourceAsString("ofrep/parse_error.json"),
276+
PARSE_ERROR_PAYLOAD,
271277
status = HttpStatusCode.fromValue(400),
272278
)
273279

@@ -297,7 +303,7 @@ class OfrepProviderTest {
297303
fun `should return a flag not found error if the flag does not exist`(): Unit =
298304
runTest {
299305
val mockEngine =
300-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
306+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
301307
val provider = createOfrepProvider(mockEngine)
302308
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
303309
val got = client.getBooleanDetails("non-existent-flag", false)
@@ -319,7 +325,7 @@ class OfrepProviderTest {
319325
runTest {
320326
val mockEngine =
321327
mockEngineWithOneResponse(
322-
getResourceAsString("ofrep/valid_api_short_response.json"),
328+
VALID_API_SHORT_RESPONSE_PAYLOAD,
323329
)
324330
val provider = createOfrepProvider(mockEngine)
325331
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
@@ -348,7 +354,7 @@ class OfrepProviderTest {
348354
runTest {
349355
val mockEngine =
350356
mockEngineWithOneResponse(
351-
getResourceAsString("ofrep/valid_1_flag_in_parse_error.json"),
357+
VALID_1_FLAG_IN_PARSE_ERROR_PAYLOAD,
352358
)
353359
val provider = createOfrepProvider(mockEngine)
354360
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
@@ -371,8 +377,8 @@ class OfrepProviderTest {
371377
runTest {
372378
val mockEngine =
373379
mockEngineWithTwoResponses(
374-
firstContent = getResourceAsString("ofrep/valid_api_response.json"),
375-
secondContent = getResourceAsString("ofrep/valid_api_response_2.json"),
380+
firstContent = VALID_API_RESPONSE_PAYLOAD,
381+
secondContent = VALID_API_RESPONSE2_PAYLOAD,
376382
)
377383
val provider = createOfrepProvider(mockEngine)
378384
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
@@ -432,7 +438,7 @@ class OfrepProviderTest {
432438
fun `should return a valid evaluation for Boolean`(): Unit =
433439
runTest {
434440
val mockEngine =
435-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
441+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
436442
val provider = createOfrepProvider(mockEngine)
437443
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
438444
val got = client.getBooleanDetails("bool-flag", false)
@@ -460,7 +466,7 @@ class OfrepProviderTest {
460466
fun `should return a valid evaluation for Int`(): Unit =
461467
runTest {
462468
val mockEngine =
463-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
469+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
464470
val provider = createOfrepProvider(mockEngine)
465471
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
466472
val got = client.getIntegerDetails("int-flag", 1)
@@ -488,7 +494,7 @@ class OfrepProviderTest {
488494
fun `should return a valid evaluation for Double`(): Unit =
489495
runTest {
490496
val mockEngine =
491-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
497+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
492498
val provider = createOfrepProvider(mockEngine)
493499
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
494500
val got = client.getDoubleDetails("double-flag", 1.1)
@@ -516,7 +522,7 @@ class OfrepProviderTest {
516522
fun `should return a valid evaluation for String`(): Unit =
517523
runTest {
518524
val mockEngine =
519-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
525+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
520526
val provider = createOfrepProvider(mockEngine)
521527
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
522528
val got = client.getStringDetails("string-flag", "default")
@@ -544,7 +550,7 @@ class OfrepProviderTest {
544550
fun `should return a valid evaluation for List`(): Unit =
545551
runTest {
546552
val mockEngine =
547-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
553+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
548554
val provider = createOfrepProvider(mockEngine)
549555
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
550556
val got =
@@ -577,7 +583,7 @@ class OfrepProviderTest {
577583
fun `should return a valid evaluation for Map`(): Unit =
578584
runTest {
579585
val mockEngine =
580-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
586+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
581587
val provider = createOfrepProvider(mockEngine)
582588
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
583589
val got =
@@ -624,7 +630,7 @@ class OfrepProviderTest {
624630
fun `should return TypeMismatch Bool`(): Unit =
625631
runTest {
626632
val mockEngine =
627-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
633+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
628634
val provider = createOfrepProvider(mockEngine)
629635
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
630636
val got = client.getBooleanDetails("object-flag", false)
@@ -647,7 +653,7 @@ class OfrepProviderTest {
647653
fun `should return TypeMismatch String`(): Unit =
648654
runTest {
649655
val mockEngine =
650-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
656+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
651657
val provider = createOfrepProvider(mockEngine)
652658
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
653659
val got = client.getStringDetails("object-flag", "default")
@@ -670,7 +676,7 @@ class OfrepProviderTest {
670676
fun `should return TypeMismatch Double`(): Unit =
671677
runTest {
672678
val mockEngine =
673-
mockEngineWithOneResponse(getResourceAsString("ofrep/valid_api_response.json"))
679+
mockEngineWithOneResponse(VALID_API_RESPONSE_PAYLOAD)
674680
val provider = createOfrepProvider(mockEngine)
675681
withClient(provider, defaultEvalCtx, Dispatchers.IO) { client ->
676682
val got = client.getDoubleDetails("object-flag", 1.233)
@@ -697,8 +703,8 @@ class OfrepProviderTest {
697703
) {
698704
val mockEngine =
699705
mockEngineWithTwoResponses(
700-
firstContent = getResourceAsString("ofrep/valid_api_short_response.json"),
701-
secondContent = getResourceAsString("ofrep/valid_api_response_2.json"),
706+
firstContent = VALID_API_SHORT_RESPONSE_PAYLOAD,
707+
secondContent = VALID_API_RESPONSE2_PAYLOAD,
702708
)
703709

704710
val provider = createOfrepProvider(mockEngine)

‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/controller/OfrepApiTest.kt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package dev.openfeature.kotlin.contrib.providers.ofrep.controller
22

3+
import INVALID_API_RESPONSE_PAYLOAD
4+
import VALID_API_RESPONSE_PAYLOAD
5+
import VALID_API_SHORT_RESPONSE_PAYLOAD
36
import dev.openfeature.kotlin.contrib.providers.ofrep.FAKE_ENDPOINT
47
import dev.openfeature.kotlin.contrib.providers.ofrep.bean.FlagDto
58
import dev.openfeature.kotlin.contrib.providers.ofrep.bean.OfrepApiResponse
69
import dev.openfeature.kotlin.contrib.providers.ofrep.bean.OfrepOptions
710
import dev.openfeature.kotlin.contrib.providers.ofrep.error.OfrepError
8-
import dev.openfeature.kotlin.contrib.providers.ofrep.getResourceAsString
911
import dev.openfeature.kotlin.contrib.providers.ofrep.mockEngineWithOneResponse
1012
import dev.openfeature.kotlin.contrib.providers.ofrep.mockEngineWithTwoResponses
1113
import dev.openfeature.kotlin.sdk.EvaluationMetadata
@@ -34,8 +36,7 @@ class OfrepApiTest {
3436
@Test
3537
fun shouldReturnAValidEvaluationResponse() =
3638
runTest {
37-
val jsonString = getResourceAsString("ofrep/valid_api_short_response.json")
38-
val mockEngine = mockEngineWithOneResponse(content = jsonString)
39+
val mockEngine = mockEngineWithOneResponse(content = VALID_API_SHORT_RESPONSE_PAYLOAD)
3940

4041
val ofrepApi = createOfrepApi(mockEngine)
4142

@@ -219,11 +220,9 @@ class OfrepApiTest {
219220
@Test
220221
fun shouldThrowUnmarshallErrorWithInvalidJson(): Unit =
221222
runTest {
222-
val jsonString = getResourceAsString("ofrep/invalid_api_response.json")
223-
224223
val mockEngine =
225224
mockEngineWithOneResponse(
226-
content = jsonString,
225+
content = INVALID_API_RESPONSE_PAYLOAD,
227226
status = HttpStatusCode.fromValue(400),
228227
)
229228
val ofrepApi = createOfrepApi(mockEngine)
@@ -245,10 +244,9 @@ class OfrepApiTest {
245244
@Test
246245
fun shouldETagShouldNotMatch(): Unit =
247246
runTest {
248-
val jsonString = getResourceAsString("ofrep/valid_api_response.json")
249247
val mockEngine =
250248
mockEngineWithTwoResponses(
251-
firstContent = jsonString,
249+
firstContent = VALID_API_RESPONSE_PAYLOAD,
252250
firstStatus = HttpStatusCode.fromValue(200),
253251
firstAdditionalHeaders = headersOf(HttpHeaders.ETag, "123"),
254252
secondContent = "",
@@ -269,10 +267,9 @@ class OfrepApiTest {
269267
@Test
270268
fun shouldHaveIfNoneNullInTheHeaders(): Unit =
271269
runTest {
272-
val jsonString = getResourceAsString("ofrep/valid_api_response.json")
273270
val mockEngine =
274271
mockEngineWithTwoResponses(
275-
firstContent = jsonString,
272+
firstContent = VALID_API_RESPONSE_PAYLOAD,
276273
firstStatus = HttpStatusCode.fromValue(200),
277274
firstAdditionalHeaders = headersOf(HttpHeaders.ETag, "123"),
278275
secondContent = "",

‎providers/ofrep/src/commonTest/resources/ofrep/invalid_api_response.json renamed to ‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/payloads/InvalidApiResponsePayload.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
internal const val INVALID_API_RESPONSE_PAYLOAD = """
12
{
23
"flags": [
34
{
@@ -22,4 +23,5 @@
2223
"title": "Feature Flag Title"
2324
}
2425
}
25-
}
26+
}
27+
"""

‎providers/ofrep/src/commonTest/resources/ofrep/invalid_context.json renamed to ‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/payloads/InvalidContextPayload.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
internal const val INVALID_CONTEXT_PAYLOAD = """
12
{
23
"errorCode": "INVALID_CONTEXT",
34
"errorDetails": "Error details about INVALID_CONTEXT"
4-
}
5+
}
6+
"""

‎providers/ofrep/src/commonTest/resources/ofrep/parse_error.json renamed to ‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/payloads/ParseErrorPayload.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
internal const val PARSE_ERROR_PAYLOAD = """
12
{
23
"errorCode": "PARSE_ERROR",
34
"errorDetails": "Error details about PARSE_ERROR"
4-
}
5+
}
6+
"""

‎providers/ofrep/src/commonTest/resources/ofrep/valid_1_flag_in_parse_error.json renamed to ‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/payloads/Valid1FlagInParseErrorPayload.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
internal const val VALID_1_FLAG_IN_PARSE_ERROR_PAYLOAD = """
12
{
23
"flags": [
34
{
@@ -17,4 +18,5 @@
1718
"errorDetails": "Error details about PARSE_ERROR"
1819
}
1920
]
20-
}
21+
}
22+
"""

‎providers/ofrep/src/commonTest/resources/ofrep/valid_api_response_2.json renamed to ‎providers/ofrep/src/commonTest/kotlin/dev/openfeature/kotlin/contrib/providers/ofrep/payloads/ValidApiResponse2Payload.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
internal const val VALID_API_RESPONSE2_PAYLOAD = """
12
{
23
"flags": [
34
{
@@ -107,4 +108,5 @@
107108
}
108109
}
109110
]
110-
}
111+
}
112+
"""

0 commit comments

Comments
 (0)