@@ -7,7 +7,7 @@ package aws.sdk.kotlin.runtime.region
77
88import aws.sdk.kotlin.runtime.util.TestInstanceMetadataProvider
99import aws.smithy.kotlin.runtime.util.TestPlatformProvider
10- import kotlinx.coroutines.test.runTest
10+ import kotlinx.coroutines.runBlocking
1111import kotlinx.serialization.json.*
1212import kotlin.test.Test
1313import kotlin.test.assertEquals
@@ -116,47 +116,67 @@ private const val REGION_PROVIDER_CHAIN_TEST_SUITE = """
116116]
117117"""
118118
119- internal fun runRegionProviderChainTestSuite (testSuite : String ) = runTest {
120- data class RegionProviderChainTest (
121- val name : String ,
122- val platformProvider : TestPlatformProvider ,
123- val instanceMetadataProvider : TestInstanceMetadataProvider ,
124- val region : String? ,
125- val targets : List <String > = emptyList(),
126- )
119+ private data class RegionProviderChainTest (
120+ val name : String ,
121+ val platformProvider : TestPlatformProvider ,
122+ val instanceMetadataProvider : TestInstanceMetadataProvider ,
123+ val region : String? ,
124+ val targets : List <String > = emptyList(),
125+ )
127126
128- /* *
129- * Construct a [TestPlatformProvider] from a JSON node like:
130- *
131- * ```json
132- * {
133- * "env": {
134- * "ENV_VAR": "value"
135- * },
136- * "props": {
137- * "aws.property": "value"
138- * },
139- * "fs": {
140- * "filename": "contents"
141- * }
142- * }
143- * ```
144- */
145- fun TestPlatformProvider.Companion.fromJsonNode (obj : JsonObject ): TestPlatformProvider {
146- val env = obj[" env" ]?.jsonObject?.mapValues { it.value.jsonPrimitive.content } ? : emptyMap()
147- val props = obj[" props" ]?.jsonObject?.mapValues { it.value.jsonPrimitive.content } ? : emptyMap()
148- val fs = obj[" fs" ]?.jsonObject?.mapValues { it.value.jsonPrimitive.content } ? : emptyMap()
149- return TestPlatformProvider (env, props, fs)
150- }
127+ /* *
128+ * Construct a [TestPlatformProvider] from a JSON node like:
129+ *
130+ * ```json
131+ * {
132+ * "env": {
133+ * "ENV_VAR": "value"
134+ * },
135+ * "props": {
136+ * "aws.property": "value"
137+ * },
138+ * "fs": {
139+ * "filename": "contents"
140+ * }
141+ * }
142+ * ```
143+ */
144+ /* *
145+ * Construct a [TestPlatformProvider] from a JSON node like:
146+ *
147+ * ```json
148+ * {
149+ * "env": {
150+ * "ENV_VAR": "value"
151+ * },
152+ * "props": {
153+ * "aws.property": "value"
154+ * },
155+ * "fs": {
156+ * "filename": "contents"
157+ * }
158+ * }
159+ * ```
160+ */
161+ private fun TestPlatformProvider.Companion.fromJsonNode (obj : JsonObject ): TestPlatformProvider {
162+ val env = obj[" env" ]?.jsonObject?.mapValues { it.value.jsonPrimitive.content } ? : emptyMap()
163+ val props = obj[" props" ]?.jsonObject?.mapValues { it.value.jsonPrimitive.content } ? : emptyMap()
164+ val fs = obj[" fs" ]?.jsonObject?.mapValues { it.value.jsonPrimitive.content } ? : emptyMap()
165+ return TestPlatformProvider (env, props, fs)
166+ }
151167
152- /* *
153- * Construct a [TestInstanceMetadataProvider] from a JSON object containing metadata as key-value pairs.
154- */
155- fun TestInstanceMetadataProvider.Companion.fromJsonNode (obj : JsonObject ): TestInstanceMetadataProvider {
156- val metadata = obj.jsonObject.mapValues { it.value.jsonPrimitive.content }
157- return TestInstanceMetadataProvider (metadata)
158- }
168+ /* *
169+ * Construct a [TestInstanceMetadataProvider] from a JSON object containing metadata as key-value pairs.
170+ */
171+ /* *
172+ * Construct a [TestInstanceMetadataProvider] from a JSON object containing metadata as key-value pairs.
173+ */
174+ private fun TestInstanceMetadataProvider.Companion.fromJsonNode (obj : JsonObject ): TestInstanceMetadataProvider {
175+ val metadata = obj.jsonObject.mapValues { it.value.jsonPrimitive.content }
176+ return TestInstanceMetadataProvider (metadata)
177+ }
159178
179+ internal fun runRegionProviderChainTestSuite (testSuite : String ) = runBlocking {
160180 val tests = Json .parseToJsonElement(testSuite).jsonArray
161181 .map { it.jsonObject }
162182 .map {
0 commit comments