From a7c2ba72cdf5c7a2d898525b9983f86998de3a15 Mon Sep 17 00:00:00 2001
From: kstich <kevin@kstich.com>
Date: Thu, 10 Sep 2020 10:29:19 -0700
Subject: [PATCH] Fix unbound operations/shapes in protocol tests

---
 .../model/awsJson1_0/empty-input-output.smithy              | 1 -
 smithy-aws-protocol-tests/model/awsQuery/main.smithy        | 5 +++++
 smithy-aws-protocol-tests/model/ec2Query/main.smithy        | 4 ++++
 .../model/restXml/document-lists.smithy                     | 4 ++--
 .../model/restXml/document-maps.smithy                      | 4 ++--
 .../model/restXml/document-structs.smithy                   | 2 +-
 smithy-aws-protocol-tests/model/restXml/main.smithy         | 6 ++++++
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/smithy-aws-protocol-tests/model/awsJson1_0/empty-input-output.smithy b/smithy-aws-protocol-tests/model/awsJson1_0/empty-input-output.smithy
index 4c62c0ae161..2e5eb3e7e0b 100644
--- a/smithy-aws-protocol-tests/model/awsJson1_0/empty-input-output.smithy
+++ b/smithy-aws-protocol-tests/model/awsJson1_0/empty-input-output.smithy
@@ -123,4 +123,3 @@ apply EmptyInputAndEmptyOutput @httpResponseTests([
 ])
 
 structure EmptyInputAndEmptyOutputInput {}
-structure EmptyInputAndEmptyOutputOutput {}
diff --git a/smithy-aws-protocol-tests/model/awsQuery/main.smithy b/smithy-aws-protocol-tests/model/awsQuery/main.smithy
index 422dddd63d8..7046a0742fc 100644
--- a/smithy-aws-protocol-tests/model/awsQuery/main.smithy
+++ b/smithy-aws-protocol-tests/model/awsQuery/main.smithy
@@ -27,14 +27,19 @@ service AwsQuery {
         QueryMaps,
         QueryIdempotencyTokenAutoFill,
 
+        // Output tests
+        XmlEmptyBlobs,
+
         // Output XML map tests
         XmlMaps,
         XmlMapsXmlName,
         FlattenedXmlMap,
         FlattenedXmlMapWithXmlName,
+        XmlEmptyMaps,
 
         // Output XML list tests
         XmlLists,
+        XmlEmptyLists,
 
         // Output XML structure tests
         SimpleScalarXmlProperties,
diff --git a/smithy-aws-protocol-tests/model/ec2Query/main.smithy b/smithy-aws-protocol-tests/model/ec2Query/main.smithy
index 9e9d10e8ac9..955026e9c85 100644
--- a/smithy-aws-protocol-tests/model/ec2Query/main.smithy
+++ b/smithy-aws-protocol-tests/model/ec2Query/main.smithy
@@ -51,8 +51,12 @@ service AwsEc2 {
         QueryLists,
         QueryIdempotencyTokenAutoFill,
 
+        // Output tests
+        XmlEmptyBlobs,
+
         // Output XML list tests
         XmlLists,
+        XmlEmptyLists,
 
         // Output XML structure tests
         SimpleScalarXmlProperties,
diff --git a/smithy-aws-protocol-tests/model/restXml/document-lists.smithy b/smithy-aws-protocol-tests/model/restXml/document-lists.smithy
index a91fb796e65..7743210874d 100644
--- a/smithy-aws-protocol-tests/model/restXml/document-lists.smithy
+++ b/smithy-aws-protocol-tests/model/restXml/document-lists.smithy
@@ -218,7 +218,7 @@ apply XmlLists @httpResponseTests([
 ])
 
 @idempotent
-@http(uri: "/XmlLists", method: "PUT")
+@http(uri: "/XmlEmptyLists", method: "PUT")
 @tags(["client-only"])
 operation XmlEmptyLists {
     input: XmlListsInputOutput,
@@ -231,7 +231,7 @@ apply XmlEmptyLists @httpRequestTests([
         documentation: "Serializes Empty XML lists",
         protocol: restXml,
         method: "PUT",
-        uri: "/XmlLists",
+        uri: "/XmlEmptyLists",
         body: """
               <XmlListsInputOutput>
                       <stringList></stringList>
diff --git a/smithy-aws-protocol-tests/model/restXml/document-maps.smithy b/smithy-aws-protocol-tests/model/restXml/document-maps.smithy
index 4833bb59828..d6c240f1e0e 100644
--- a/smithy-aws-protocol-tests/model/restXml/document-maps.smithy
+++ b/smithy-aws-protocol-tests/model/restXml/document-maps.smithy
@@ -100,7 +100,7 @@ apply XmlMaps @httpResponseTests([
     }
 ])
 
-@http(uri: "/XmlMaps", method: "POST")
+@http(uri: "/XmlEmptyMaps", method: "POST")
 @tags(["client-only"])
 operation XmlEmptyMaps {
     input: XmlMapsInputOutput,
@@ -113,7 +113,7 @@ apply XmlEmptyMaps @httpRequestTests([
         documentation: "Serializes Empty XML maps",
         protocol: restXml,
         method: "POST",
-        uri: "/XmlMaps",
+        uri: "/XmlEmptyMaps",
         body: """
               <XmlMapsInputOutput>
                   <myMap></myMap>
diff --git a/smithy-aws-protocol-tests/model/restXml/document-structs.smithy b/smithy-aws-protocol-tests/model/restXml/document-structs.smithy
index bf472277e66..28c23050ef4 100644
--- a/smithy-aws-protocol-tests/model/restXml/document-structs.smithy
+++ b/smithy-aws-protocol-tests/model/restXml/document-structs.smithy
@@ -350,7 +350,7 @@ apply XmlBlobs @httpResponseTests([
 ])
 
 /// Blobs are base64 encoded
-@http(uri: "/XmlBlobs", method: "POST")
+@http(uri: "/XmlEmptyBlobs", method: "POST")
 @tags(["client-only"])
 operation XmlEmptyBlobs {
     input: XmlBlobsInputOutput,
diff --git a/smithy-aws-protocol-tests/model/restXml/main.smithy b/smithy-aws-protocol-tests/model/restXml/main.smithy
index 02f2d2cb372..5a2baac42c3 100644
--- a/smithy-aws-protocol-tests/model/restXml/main.smithy
+++ b/smithy-aws-protocol-tests/model/restXml/main.smithy
@@ -17,6 +17,9 @@ service RestXml {
         NoInputAndNoOutput,
         NoInputAndOutput,
         EmptyInputAndEmptyOutput,
+        XmlEmptyLists,
+        XmlEmptyMaps,
+        XmlEmptyStrings,
 
         // @httpHeader tests
         InputAndOutputWithHeaders,
@@ -48,6 +51,9 @@ service RestXml {
         HttpPayloadWithXmlNamespace,
         HttpPayloadWithXmlNamespaceAndPrefix,
 
+        // Output tests
+        XmlEmptyBlobs,
+
         // Errors
         GreetingWithErrors,