Add query compatible protocol tests. Fix broken protocol tests (#3898)

* Add cw protocol tests

* Updates to protocol test generator and generator

* Add latest c2j files, generated file updates, and generated protocol tests

* Add query compatible to netstandard sln and protocol tests csproj

* remove unnecessary comment

Author: peterrsongg

generator/.DevConfigs/07021066-0b62-4f0e-9367-1fc14a8f359c.json

@@ -0,0 +1,9 @@
+{
+  "core": {
+    "changeLogMessages": [
+      "Update to consume latest protocol tests (1.60.3). Add query compatible protocol tests."
+    ],
+    "type": "patch",
+    "updateMinimum": true
+  }
+}

generator/ProtocolTestsGenerator/settings.gradle.kts

@@ -12,7 +12,7 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("codegen") {
-            version("smithy", "1.46.0")
+            version("smithy", "1.60.3")
             library("protocol-tests", "software.amazon.smithy", "smithy-aws-protocol-tests").versionRef("smithy")
             library("codegen-core", "software.amazon.smithy", "smithy-codegen-core").versionRef("smithy")
             library("protocol-tests-traits", "software.amazon.smithy", "smithy-protocol-test-traits").versionRef("smithy")

generator/ProtocolTestsGenerator/smithy-dotnet-codegen/src/main/java/software/amazon/smithy/dotnet/codegen/HttpProtocolTestGenerator.java

@@ -110,7 +110,9 @@ private void generateErrorResponseTest(OperationShape operation, StructureShape
         writer.write("[TestCategory(\"ErrorTest\")]");
         writer.write("[TestCategory(\"$L\")]", serviceName);
         writer.openBlock("public void $LErrorResponse()\n{", "}", httpResponseTestCase.getId(), () -> {
-            generateErrorResponseTestBlock(operation, error, httpResponseTestCase);
+            if (!ProtocolTestCustomizations.TestsToSkip.contains(httpResponseTestCase.getId())){
+                generateErrorResponseTest(operation, error, httpResponseTestCase);
+            }
         });
         writer.write("\n");
     }
@@ -151,7 +153,7 @@ private void generateRequestTests(OperationShape operation) {
                 setMarshallerType(trait.getTestCasesFor(AppliesTo.CLIENT).getFirst().getProtocol().getName());
             }
             for (HttpRequestTestCase httpRequestTestCase : trait.getTestCasesFor(AppliesTo.CLIENT)) {
-                if (ProtocolTestCustomizations.TestsToSkip.contains(httpRequestTestCase.getId()))
+                if (ProtocolTestCustomizations.TestsToSkip.contains(httpRequestTestCase.getId()) || httpRequestTestCase.hasTag("defaults"))
                     continue;
                 generateRequestTest(operation, httpRequestTestCase);
             }
@@ -295,7 +297,7 @@ private void generateResponseTests(OperationShape operation) {
                 setMarshallerType(trait.getTestCasesFor(AppliesTo.CLIENT).getFirst().getProtocol().getName());
             }
             for (HttpResponseTestCase httpResponseTestCase : trait.getTestCasesFor(AppliesTo.CLIENT)) {
-                if (ProtocolTestCustomizations.TestsToSkip.contains(httpResponseTestCase.getId()))
+                if (ProtocolTestCustomizations.TestsToSkip.contains(httpResponseTestCase.getId())  || httpResponseTestCase.hasTag("defaults"))
                     continue;
                 generateResponseTest(operation, httpResponseTestCase);
             }

generator/ProtocolTestsGenerator/smithy-dotnet-codegen/src/main/java/software/amazon/smithy/dotnet/codegen/customizations/ProtocolTestCustomizations.java

@@ -12,7 +12,9 @@ private ProtocolTestCustomizations() {
     //These contain collections with nullable values
     public static final List<String> RestJsonNullMapValueOperations = Arrays.asList(
             "JsonMapsRequest",
-            "JsonMapsResponse"
+            "JsonMapsResponse",
+            "SparseJsonMapsRequest",
+            "SparseJsonMapsResponse"
     );
     public static final List<String> RestJsonNullMapValueStructures = Arrays.asList(
             "SparseBooleanMap",
@@ -88,7 +90,12 @@ private ProtocolTestCustomizations() {
             "XmlUnionsWithStructMember",
             "XmlUnionsWithStringMember",
             "XmlUnionsWithBooleanMember",
-            "XmlUnionsWithUnionMember"
+            "XmlUnionsWithUnionMember",
+            // this test is skipped because in the C2J Ruby added a hook which adds the "code" json key which can NEVER exist in a
+            // non-query protocol. this causes our code generation to check on this code instead of what is modeled and our protocol
+            // test passes. As this can never happen in a real service, we can skip this to avoid unnecessary customizations in the generator
+            // for a scenario that will never happen.
+            "QueryCompatibleAwsJson10CustomCodeError"
 
     );
     public static final List<String> VNextTests = Arrays.asList(
@@ -122,6 +129,11 @@ private ProtocolTestCustomizations() {
             "QueryNoInputAndNoOutput",
             "QueryNoInputAndOutput",
             "RestJsonToleratesRegexCharsInSegments",
-            "RestXmlXmlMapWithXmlNamespace"
+            "RestXmlXmlMapWithXmlNamespace",
+            "NestedXmlMapWithXmlNameSerializes",
+            "NestedXmlMapWithXmlNameDeserializes",
+            "RestJsonNullAndEmptyHeaders",
+            "NullAndEmptyHeaders",
+            "RestJsonHttpPayloadWithStructureAndEmptyResponseBody"
     );
 }

generator/ProtocolTestsGenerator/smithy-dotnet-protocol-test/smithy-build.json

@@ -127,6 +127,24 @@
           "packageVersion": "0.0.1"
         }
       }
+    },
+    "QueryCompatibleJSONRPC10": {
+      "transforms": [
+        {
+          "name": "includeServices",
+          "args": {
+            "services": [
+              "aws.protocoltests.json10#QueryCompatibleJsonRpc10"
+            ]
+          }
+        }
+      ],
+      "plugins": {
+        "dotnet-protocol-test-codegen": {
+          "service": "aws.protocoltests.json10#QueryCompatibleJsonRpc10",
+          "packageVersion": "0.0.1"
+        }
+      }
     }
   }
 }