chore: Organize codegen tests & Kotlin unit tests

smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/HttpProtocolClientGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -6,7 +8,7 @@
 import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Test
-import software.amazon.smithy.swift.codegen.DefaultClientConfigurationIntegration
+import software.amazon.smithy.swift.codegen.protocolgeneratormocks.MockHTTPRestJsonProtocolGenerator
 
 class HttpProtocolClientGeneratorTests {
     @Test

smithy-swift-codegen/src/test/kotlin/HttpProtocolUnitTestErrorGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/HttpProtocolUnitTestErrorGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.

smithy-swift-codegen/src/test/kotlin/HttpProtocolUnitTestResponseGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/HttpProtocolUnitTestResponseGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -8,7 +10,7 @@ import org.junit.jupiter.api.Test
 import software.amazon.smithy.swift.codegen.model.AddOperationShapes
 
 open class HttpProtocolUnitTestResponseGeneratorTests {
-    var model = javaClass.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
+    var model = javaClass.classLoader.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
     private fun newTestContext(): TestContext {
         val settings = model.defaultSettings()
         model = AddOperationShapes.execute(model, settings.getService(model), settings.moduleName)

smithy-swift-codegen/src/test/kotlin/PaginatorGeneratorTest.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/PaginatorGeneratorTest.kt

@@ -1,17 +1,20 @@
+package software.amazon.smithy.swift.codegen
+
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
 
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.build.FileManifest
 import software.amazon.smithy.codegen.core.SymbolProvider
 import software.amazon.smithy.codegen.core.WriterDelegator
 import software.amazon.smithy.model.Model
-import software.amazon.smithy.swift.codegen.PaginatorGenerator
-import software.amazon.smithy.swift.codegen.SwiftDelegator
-import software.amazon.smithy.swift.codegen.SwiftSettings
-import software.amazon.smithy.swift.codegen.SwiftWriter
 import software.amazon.smithy.swift.codegen.core.SwiftCodegenContext
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.SwiftIntegration
+import software.amazon.smithy.swift.codegen.protocolgeneratormocks.MockHTTPRestJsonProtocolGenerator
 
 class PaginatorGeneratorTest {
     @Test

smithy-swift-codegen/src/test/kotlin/ServiceRenamesTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/ServiceRenamesTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.

smithy-swift-codegen/src/test/kotlin/TestUtils.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/TestUtils.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -21,9 +23,6 @@ import software.amazon.smithy.model.traits.DocumentationTrait
 import software.amazon.smithy.model.traits.ErrorTrait
 import software.amazon.smithy.model.traits.HttpErrorTrait
 import software.amazon.smithy.model.traits.RetryableTrait
-import software.amazon.smithy.swift.codegen.SwiftCodegenPlugin
-import software.amazon.smithy.swift.codegen.SwiftDelegator
-import software.amazon.smithy.swift.codegen.SwiftSettings
 import software.amazon.smithy.swift.codegen.customtraits.SwiftBoxTrait
 import software.amazon.smithy.swift.codegen.integration.HTTPBindingProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
@@ -32,6 +31,7 @@ import software.amazon.smithy.swift.codegen.model.AddOperationShapes
 import software.amazon.smithy.swift.codegen.model.NeedsReaderWriterTransformer
 import software.amazon.smithy.swift.codegen.model.NestedShapeTransformer
 import software.amazon.smithy.swift.codegen.model.RecursiveShapeBoxer
+import software.amazon.smithy.swift.codegen.protocolgeneratormocks.MockHTTPRestJsonProtocolGenerator
 import java.net.URL
 
 /**
@@ -277,7 +277,7 @@ class TestContext(
 
             var modelAssembler = Model.assembler()
             for (smithyFile in smithyFiles) {
-                modelAssembler.addImport(javaClass.getResource(smithyFile))
+                modelAssembler.addImport(javaClass.classLoader.getResource(smithyFile))
             }
             var model = modelAssembler
                 .discoverModels()

smithy-swift-codegen/src/test/kotlin/EnumGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/EnumGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -15,6 +17,10 @@ import software.amazon.smithy.model.traits.EnumTrait
 import software.amazon.smithy.swift.codegen.EnumGenerator
 import software.amazon.smithy.swift.codegen.SwiftCodegenPlugin
 import software.amazon.smithy.swift.codegen.SwiftWriter
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.buildMockPluginContext
+import software.amazon.smithy.swift.codegen.createModelFromShapes
+import software.amazon.smithy.swift.codegen.defaultSettings
 
 class EnumGeneratorTests {
 
@@ -130,7 +136,7 @@ public enum MyEnum: Swift.Equatable, Swift.RawRepresentable, Swift.CaseIterable,
 
     @Test
     fun `generates enums from IDL-2 enum shape`() {
-        val model = javaClass.getResource("enum-shape-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("enum-shape-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)

smithy-swift-codegen/src/test/kotlin/IntEnumGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/IntEnumGeneratorTests.kt

@@ -1,14 +1,23 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
 import io.kotest.matchers.string.shouldContain
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.build.MockManifest
 import software.amazon.smithy.swift.codegen.SwiftCodegenPlugin
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.buildMockPluginContext
 
 class IntEnumGeneratorTests {
 
     @Test
     fun `generates int enum`() {
-        val model = javaClass.getResource("int-enum-shape-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("int-enum-shape-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)

smithy-swift-codegen/src/test/kotlin/StructDecodeGenerationTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructDecodeGenerationTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -6,13 +8,19 @@
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
+import software.amazon.smithy.swift.codegen.TestContext
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.defaultSettings
+import software.amazon.smithy.swift.codegen.getModelFileContents
 import software.amazon.smithy.swift.codegen.model.AddOperationShapes
 import software.amazon.smithy.swift.codegen.model.NeedsReaderWriterTransformer
 import software.amazon.smithy.swift.codegen.model.NestedShapeTransformer
 import software.amazon.smithy.swift.codegen.model.RecursiveShapeBoxer
+import software.amazon.smithy.swift.codegen.newTestContext
+import software.amazon.smithy.swift.codegen.shouldSyntacticSanityCheck
 
 class StructDecodeGenerationTests {
-    var model = javaClass.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
+    var model = javaClass.classLoader.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
     private fun newTestContext(): TestContext {
         val settings = model.defaultSettings()
         model = AddOperationShapes.execute(model, settings.getService(model), settings.moduleName)

smithy-swift-codegen/src/test/kotlin/StructEncodeGenerationIsolatedTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructEncodeGenerationIsolatedTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -6,6 +8,10 @@
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
+import software.amazon.smithy.swift.codegen.TestContext
+import software.amazon.smithy.swift.codegen.getFileContents
+import software.amazon.smithy.swift.codegen.getModelFileContents
+import software.amazon.smithy.swift.codegen.shouldSyntacticSanityCheck
 
 class StructEncodeGenerationIsolatedTests {
     @Test

smithy-swift-codegen/src/test/kotlin/StructEncodeGenerationTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructEncodeGenerationTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -6,12 +8,18 @@
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
+import software.amazon.smithy.swift.codegen.TestContext
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.defaultSettings
+import software.amazon.smithy.swift.codegen.getModelFileContents
 import software.amazon.smithy.swift.codegen.model.AddOperationShapes
 import software.amazon.smithy.swift.codegen.model.NeedsReaderWriterTransformer
 import software.amazon.smithy.swift.codegen.model.RecursiveShapeBoxer
+import software.amazon.smithy.swift.codegen.newTestContext
+import software.amazon.smithy.swift.codegen.shouldSyntacticSanityCheck
 
 class StructEncodeGenerationTests {
-    var model = javaClass.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
+    var model = javaClass.classLoader.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
     private fun newTestContext(): TestContext {
         val settings = model.defaultSettings()
         model = AddOperationShapes.execute(model, settings.getService(model), settings.moduleName)

smithy-swift-codegen/src/test/kotlin/StructureGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructureGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -16,6 +18,15 @@ import software.amazon.smithy.model.shapes.StructureShape
 import software.amazon.smithy.swift.codegen.StructureGenerator
 import software.amazon.smithy.swift.codegen.SwiftCodegenPlugin
 import software.amazon.smithy.swift.codegen.SwiftWriter
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.buildMockPluginContext
+import software.amazon.smithy.swift.codegen.createModelWithStructureWithoutErrorTrait
+import software.amazon.smithy.swift.codegen.createStructureContainingNestedRecursiveShape
+import software.amazon.smithy.swift.codegen.createStructureContainingNestedRecursiveShapeList
+import software.amazon.smithy.swift.codegen.createStructureWithOptionalErrorMessage
+import software.amazon.smithy.swift.codegen.defaultSettings
+import software.amazon.smithy.swift.codegen.getModelFileContents
+import software.amazon.smithy.swift.codegen.shouldSyntacticSanityCheck
 import java.util.function.Consumer
 
 class StructureGeneratorTests {
@@ -58,7 +69,7 @@ class StructureGeneratorTests {
 
     @Test
     fun `it renders struct with primitive types`() {
-        val model = javaClass.getResource("primitive-type-encode-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("primitive-type-encode-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)
@@ -127,7 +138,7 @@ class StructureGeneratorTests {
     @Test
     fun `it renders recursive nested shapes`() {
         val structs = createStructureContainingNestedRecursiveShape()
-        val model = javaClass.getResource("recursive-shape-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("recursive-shape-test.smithy").asSmithy()
         val swiftSettings = model.defaultSettings()
         val provider = SwiftCodegenPlugin.createSymbolProvider(model, swiftSettings)
         val writer = SwiftWriter("MockPackage")
@@ -185,7 +196,7 @@ public struct RecursiveShapesInputOutput {
     @Test
     fun `it renders recursive nested shapes in lists`() {
         val structs = createStructureContainingNestedRecursiveShapeList()
-        val model = javaClass.getResource("recursive-shape-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("recursive-shape-test.smithy").asSmithy()
         val swiftSettings = model.defaultSettings()
         val provider = SwiftCodegenPlugin.createSymbolProvider(model, swiftSettings)
         val writer = SwiftWriter("MockPackage")
@@ -301,7 +312,7 @@ public struct MyError: ClientRuntime.ModeledError, ClientRuntime.ServiceError, C
 
     @Test
     fun `check for sparse and dense datatypes in list`() {
-        val model = javaClass.getResource("sparse-trait-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("sparse-trait-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)
@@ -347,7 +358,7 @@ public struct JsonListsInput {
             separate structs for input and output with members given in smithy model, without creating
             additional structs in the model
          */
-        val model = javaClass.getResource("sparse-trait-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("sparse-trait-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)
@@ -431,7 +442,7 @@ public struct JsonMapsOutput {
 
     @Test
     fun `deprecated trait on structure`() {
-        val model = javaClass.getResource("deprecated-trait-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("deprecated-trait-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)
@@ -459,7 +470,7 @@ public struct JsonMapsOutput {
 
     @Test
     fun `deprecated trait on synthetically cloned structure and structure member`() {
-        val model = javaClass.getResource("deprecated-trait-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("deprecated-trait-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)
@@ -485,7 +496,7 @@ public struct JsonMapsOutput {
 
     @Test
     fun `deprecated trait fetched from the target of a struct member`() {
-        val model = javaClass.getResource("deprecated-trait-test.smithy").asSmithy()
+        val model = javaClass.classLoader.getResource("deprecated-trait-test.smithy").asSmithy()
         val manifest = MockManifest()
         val context = buildMockPluginContext(model, manifest, "smithy.example#Example")
         SwiftCodegenPlugin().execute(context)

smithy-swift-codegen/src/test/kotlin/UnionDecodeGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/UnionDecodeGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -6,12 +8,18 @@
 import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
+import software.amazon.smithy.swift.codegen.TestContext
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.defaultSettings
+import software.amazon.smithy.swift.codegen.getModelFileContents
 import software.amazon.smithy.swift.codegen.model.AddOperationShapes
 import software.amazon.smithy.swift.codegen.model.NeedsReaderWriterTransformer
 import software.amazon.smithy.swift.codegen.model.NestedShapeTransformer
+import software.amazon.smithy.swift.codegen.newTestContext
+import software.amazon.smithy.swift.codegen.shouldSyntacticSanityCheck
 
 class UnionDecodeGeneratorTests {
-    var model = javaClass.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
+    var model = javaClass.classLoader.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
     private fun newTestContext(): TestContext {
         val settings = model.defaultSettings()
         model = AddOperationShapes.execute(model, settings.getService(model), settings.moduleName)

smithy-swift-codegen/src/test/kotlin/UnionEncodeGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/UnionEncodeGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -7,13 +9,19 @@ import io.kotest.matchers.string.shouldContainOnlyOnce
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.swift.codegen.TestContext
+import software.amazon.smithy.swift.codegen.asSmithy
+import software.amazon.smithy.swift.codegen.defaultSettings
+import software.amazon.smithy.swift.codegen.getModelFileContents
 import software.amazon.smithy.swift.codegen.model.AddOperationShapes
 import software.amazon.smithy.swift.codegen.model.NeedsReaderWriterTransformer
 import software.amazon.smithy.swift.codegen.model.NestedShapeTransformer
 import software.amazon.smithy.swift.codegen.model.RecursiveShapeBoxer
+import software.amazon.smithy.swift.codegen.newTestContext
+import software.amazon.smithy.swift.codegen.shouldSyntacticSanityCheck
 
 class UnionEncodeGeneratorTests {
-    var model = javaClass.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
+    var model = javaClass.classLoader.getResource("http-binding-protocol-generator-test.smithy").asSmithy()
     private fun newTestContext(): TestContext {
         model = preprocessModel(model)
         return model.newTestContext()

smithy-swift-codegen/src/test/kotlin/UnionGeneratorTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/UnionGeneratorTests.kt

@@ -1,3 +1,5 @@
+package software.amazon.smithy.swift.codegen.basicshapes
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -13,6 +15,8 @@ import software.amazon.smithy.model.traits.DocumentationTrait
 import software.amazon.smithy.swift.codegen.SwiftCodegenPlugin
 import software.amazon.smithy.swift.codegen.SwiftWriter
 import software.amazon.smithy.swift.codegen.UnionGenerator
+import software.amazon.smithy.swift.codegen.createModelFromShapes
+import software.amazon.smithy.swift.codegen.defaultSettings
 import software.amazon.smithy.swift.codegen.model.UnionIndirectivizer
 
 class UnionGeneratorTests {

smithy-swift-codegen/src/test/kotlin/CaseUtilsTests.kt → smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/codegencomponents/CaseUtilsTests.kt

@@ -1,3 +1,10 @@
+package software.amazon.smithy.swift.codegen.codegencomponents
+
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.swift.codegen.utils.toLowerCamelCase