refactor: Call consolidated newTestContext function for test setup over generateTestContext (#116)

Author: kggilmer

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/protocols/core/EndpointResolverGeneratorTest.kt

@@ -8,14 +8,14 @@ package aws.sdk.kotlin.codegen.protocols.core
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.build.MockManifest
-import software.amazon.smithy.kotlin.codegen.test.generateTestContext
+import software.amazon.smithy.kotlin.codegen.test.newTestContext
 import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
 import software.amazon.smithy.model.node.Node
 
 class EndpointResolverGeneratorTest {
 
     private fun getGeneratedResolverContents(model: String): String {
-        val ctx = model.toSmithyModel().generateTestContext("test", "Example")
+        val (ctx, _, _) = model.toSmithyModel().newTestContext("Example", "test")
         val endpointData = Node.parse(endpointsJson).expectObjectNode()
         EndpointResolverGenerator(endpointData).render(ctx)
         ctx.delegator.flushWriters()

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/protocols/json/AwsJsonHttpBindingResolverTest.kt

@@ -8,7 +8,7 @@ package aws.sdk.kotlin.codegen.protocols.json
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.kotlin.codegen.model.expectShape
-import software.amazon.smithy.kotlin.codegen.test.generateTestContext
+import software.amazon.smithy.kotlin.codegen.test.newTestContext
 import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
 import software.amazon.smithy.model.knowledge.HttpBinding
 import software.amazon.smithy.model.shapes.OperationShape
@@ -47,7 +47,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it resolves all operations associated with a service`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
 
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 
@@ -59,7 +59,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it returns no request bindings for operations without inputs`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val operation = testModel.expectShape<OperationShape>("smithy.example#GetEmptyFoo")
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 
@@ -70,7 +70,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it returns request bindings for operations with inputs`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val operation = testModel.expectShape<OperationShape>("smithy.example#GetFoo")
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 
@@ -87,7 +87,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it returns no response bindings for operations without inputs`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val operation = testModel.expectShape<OperationShape>("smithy.example#GetEmptyFoo")
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 
@@ -98,7 +98,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it returns response bindings for operations with inputs`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val operation = testModel.expectShape<OperationShape>("smithy.example#GetFoo")
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 
@@ -115,7 +115,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it returns no response bindings for structures without members`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val structure = testModel.expectShape<StructureShape>("smithy.example#GetFooError")
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 
@@ -126,7 +126,7 @@ class AwsJsonHttpBindingResolverTest {
 
     @Test
     fun `it returns response bindings for structures with members`() {
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val structure = testModel.expectShape<StructureShape>("smithy.example#GetFooOutput")
         val unit = AwsJsonHttpBindingResolver(ctx, "application/json")
 

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/protocols/json/AwsJsonModeledExceptionsFeatureTest.kt

@@ -9,7 +9,7 @@ import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.kotlin.codegen.test.generateCode
-import software.amazon.smithy.kotlin.codegen.test.generateTestContext
+import software.amazon.smithy.kotlin.codegen.test.newTestContext
 import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
 
 class AwsJsonModeledExceptionsFeatureTest {
@@ -39,7 +39,7 @@ class AwsJsonModeledExceptionsFeatureTest {
             register(code = "GetFooError", deserializer = GetFooErrorDeserializer())
         """.trimIndent()
 
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
 
         val bindingResolver = AwsJsonHttpBindingResolver(ctx, "application/json")
         val unit = AwsJsonModeledExceptionsMiddleware(ctx, bindingResolver)
@@ -65,7 +65,7 @@ class AwsJsonModeledExceptionsFeatureTest {
             operation GetFoo { }
         """.toSmithyModel()
 
-        val ctx = testModel.generateTestContext("smithy.example", "Example")
+        val (ctx, _, _) = testModel.newTestContext("Example", "smithy.example")
         val bindingResolver = AwsJsonHttpBindingResolver(ctx, "application/json")
         val unit = AwsJsonModeledExceptionsMiddleware(ctx, bindingResolver)