Preserve original test models and add union tests

Author: vcjana

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/AwsQueryTest.kt

@@ -15,6 +15,30 @@ class AwsQueryTest {
         namespace test
         use aws.protocols#awsQuery
 
+        @awsQuery
+        @xmlNamespace(uri: "https://example.com/")
+        service TestService {
+            version: "2019-12-16",
+            operations: [SomeOperation]
+        }
+
+        operation SomeOperation {
+            input: SomeOperationInputOutput,
+            output: SomeOperationInputOutput,
+        }
+
+        structure SomeOperationInputOutput {
+            payload: String,
+            a: String,
+            b: Integer
+        }
+        """.asSmithyModel()
+
+    private val modelWithObjectEncryptionFilter =
+        """
+        namespace test
+        use aws.protocols#awsQuery
+
         @awsQuery
         @xmlNamespace(uri: "https://example.com/")
         service TestService {
@@ -85,6 +109,11 @@ class AwsQueryTest {
         clientIntegrationTest(model) { _, _ -> }
     }
 
+    @Test
+    fun `generate aws query service with object encryption filter union`() {
+        clientIntegrationTest(modelWithObjectEncryptionFilter) { _, _ -> }
+    }
+
     @Test
     fun `union with empty struct generates warning-free code`() {
         // This test will fail with unused variable warnings if the fix is not applied

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/RestJsonTest.kt

@@ -15,6 +15,35 @@ internal class RestJsonTest {
         namespace test
         use aws.protocols#restJson1
         use aws.api#service
+        use smithy.test#httpRequestTests
+        use smithy.test#httpResponseTests
+
+        /// A REST JSON service that sends JSON requests and responses.
+        @service(sdkId: "Rest Json Protocol")
+        @restJson1
+        service RestJsonExtras {
+            version: "2019-12-16",
+            operations: [StringPayload]
+        }
+
+        @http(uri: "/StringPayload", method: "POST")
+        operation StringPayload {
+            input: StringPayloadInput,
+            output: StringPayloadInput
+        }
+
+        structure StringPayloadInput {
+            payload: String,
+            a: String,
+            b: Integer
+        }
+        """.asSmithyModel()
+
+    private val modelWithUnion =
+        """
+        namespace test
+        use aws.protocols#restJson1
+        use aws.api#service
 
         @restJson1
         service TestService {

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/RestXmlTest.kt

@@ -17,6 +17,78 @@ internal class RestXmlTest {
         use aws.api#service
 
 
+        /// A REST XML service that sends XML requests and responses.
+        @service(sdkId: "Rest XML UT")
+        @restXml
+        service RestXmlExtras {
+            version: "2019-12-16",
+            operations: [Op]
+        }
+
+
+        @http(uri: "/top", method: "POST")
+        operation Op {
+            input: Top,
+            output: Top
+        }
+        union Choice {
+            @xmlFlattened
+            @xmlName("Hi")
+            flatMap: MyMap,
+
+            deepMap: MyMap,
+
+            @xmlFlattened
+            flatList: SomeList,
+
+            deepList: SomeList,
+
+            s: String,
+
+            enum: FooEnum,
+
+            date: Timestamp,
+
+            number: Double,
+
+            top: Top,
+
+            blob: Blob
+        }
+
+        @enum([{name: "FOO", value: "FOO"}])
+        string FooEnum
+
+        map MyMap {
+            @xmlName("Name")
+            key: String,
+
+            @xmlName("Setting")
+            value: Choice,
+        }
+
+        list SomeList {
+            member: Choice
+        }
+
+        structure Top {
+            choice: Choice,
+
+            @xmlAttribute
+            extra: Long,
+
+            @xmlName("prefix:local")
+            renamedWithPrefix: String
+        }
+
+        """.asSmithyModel()
+
+    private val modelWithObjectEncryption =
+        """
+        namespace test
+        use aws.protocols#restXml
+        use aws.api#service
+
         /// A REST XML service that sends XML requests and responses.
         @service(sdkId: "Rest XML UT")
         @restXml
@@ -29,7 +101,7 @@ internal class RestXmlTest {
             sses3: SSES3Filter,
         }
 
-        structure SSES3Filter {
+        structure SSES3Filter { 
             // Empty structure - no members
         }
 
@@ -74,7 +146,6 @@ internal class RestXmlTest {
         union TestUnion {
             // Empty struct - should generate _inner to avoid unused variable warning
             emptyStruct: EmptyStruct,
-
             // Normal struct - should generate inner (without underscore)
             normalStruct: NormalStruct
         }
@@ -91,6 +162,11 @@ internal class RestXmlTest {
         clientIntegrationTest(model) { _, _ -> }
     }
 
+    @Test
+    fun `generate rest xml service with object encryption filter`() {
+        clientIntegrationTest(modelWithObjectEncryption) { _, _ -> }
+    }
+
     @Test
     fun `union with empty struct generates warning-free code`() {
         // This test will fail with unused variable warnings if the fix is not applied