Update protocol tests gen to use overrided ValidateBody function so object compairsons are scoped to AwsProtocolTestHelpers

Author: sbaluja

tests/testing-resources/include/aws/testing/AwsProtocolTestHelpers.h

@@ -110,7 +110,21 @@ class AwsProtocolTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     AWS_ASSERT_SUCCESS(setNextResponse);
   }
 
-  void ValidateRequestSent(const ExpectedRequest& expected = ExpectedRequest(), const bool ignoreBody = false) const {
+  static void ValidateBody(const ExpectedRequest& expected, const Aws::ProtocolMock::Model::Request& receivedRequest) {
+    const auto expectedBodyBuf = Aws::Utils::HashingUtils::Base64Decode(expected.body);
+    const auto receivedBodyBuf = Aws::Utils::HashingUtils::Base64Decode(receivedRequest.GetBody());
+    const auto expectedBodyStr = Aws::String(reinterpret_cast<char*>(expectedBodyBuf.GetUnderlyingData()), expectedBodyBuf.GetLength());
+    const auto receivedBodyStr = Aws::String(reinterpret_cast<char*>(receivedBodyBuf.GetUnderlyingData()), receivedBodyBuf.GetLength());
+    EXPECT_STREQ(expectedBodyStr.c_str(), receivedBodyStr.c_str());
+  }
+
+  void ValidateRequestSent(const std::function<void (const ExpectedRequest& expected, const Aws::ProtocolMock::Model::Request& receivedRequest)>& bodyCompare = ValidateBody) const {
+    ValidateRequestSent(ExpectedRequest(), bodyCompare);
+  }
+
+  void ValidateRequestSent(const ExpectedRequest& expected = ExpectedRequest(),
+                          const std::function<void (const ExpectedRequest& expected, const Aws::ProtocolMock::Model::Request& receivedRequest)>& bodyCompare = ValidateBody) const {
+
     auto requestsReceivedOutcome = mockClient.GetRequestsReceived();
     AWS_ASSERT_SUCCESS(requestsReceivedOutcome);
     ASSERT_EQ(1u, requestsReceivedOutcome.GetResult().GetRequests().size());
@@ -119,13 +133,7 @@ class AwsProtocolTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     if (!expected.method.empty()) {
       EXPECT_STREQ(expected.method.c_str(), receivedRequest.GetMethod().c_str());
     }
-    if (!expected.body.empty() && !ignoreBody) {
-      const auto expectedBodyBuf = Aws::Utils::HashingUtils::Base64Decode(expected.body);
-      const auto receivedBodyBuf = Aws::Utils::HashingUtils::Base64Decode(receivedRequest.GetBody());
-      const auto expectedBodyStr = Aws::String(reinterpret_cast<char*>(expectedBodyBuf.GetUnderlyingData()), expectedBodyBuf.GetLength());
-      const auto receivedBodyStr = Aws::String(reinterpret_cast<char*>(receivedBodyBuf.GetUnderlyingData()), receivedBodyBuf.GetLength());
-      EXPECT_STREQ(expectedBodyStr.c_str(), receivedBodyStr.c_str());
-    }
+    bodyCompare(expected, receivedRequest);
     if (!expected.uri.empty()) {
       EXPECT_STREQ(expected.uri.c_str(), receivedRequest.GetUri().c_str());
     }

tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Metadata.java

@@ -17,12 +17,12 @@
 @Data
 public class Metadata {
     private static List<String> supportedProtocols = ImmutableList.of(
-            "smithy-rpc-v2-cbor",
             "json",
             "rest-json",
             "rest-xml",
             "query",
-            "ec2"
+            "ec2",
+            "smithy-rpc-v2-cbor"
     );
 
     private String apiVersion;

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/ProtocolTestsTestSuiteSrc.vm

@@ -83,13 +83,9 @@ AWS_PROTOCOL_TEST($testSuite.name, $case.id) {
 #end
 };
 #end
-#if($serviceModel.metadata.protocol == "smithy-rpc-v2-cbor")
-  ValidateRequestSent(expectedRq, true);
-#else
+#if($serviceModel.metadata.protocol != "smithy-rpc-v2-cbor")
   ValidateRequestSent(expectedRq);
 #end
-#else
-  ValidateRequestSent();
 #end
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateOutcome.vm")
 }

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/protocoltests/result/ValidateOutcome.vm

@@ -6,19 +6,28 @@
 #set($responseShape = $serviceModel.operations.get("${case.given.name}").result.shape)
 #if(!$expectedResult.isEmpty())
   const ${responseShape.name}& result = outcome.GetResult();
+  ValidateRequestSent([&result](const ExpectedRequest&, const Aws::ProtocolMock::Model::Request&) ->  void {
+#else
+  ValidateRequestSent([](const ExpectedRequest&, const Aws::ProtocolMock::Model::Request&) ->  void {
 #end
   /* expectedResult = R"( ${expectedResult} )" */
 #elseif($serviceModel.metadata.protocol == "smithy-rpc-v2-cbor")
 #set($expectedResult = $case.input.get().params)
 #set($responseShape = $serviceModel.operations.get("${case.given.name}").result.shape)
-#if(!$expectedResult.isEmpty() && $responseShape)
+#if(!$expectedResult.isEmpty())
   const ${responseShape.name}& result = outcome.GetResult();
+  ValidateRequestSent(expectedRq, [&result](const ExpectedRequest&, const Aws::ProtocolMock::Model::Request&) ->  void {
+#else
+  ValidateRequestSent(expectedRq, [](const ExpectedRequest&, const Aws::ProtocolMock::Model::Request&) ->  void {
 #end
   /* expectedResult = R"( ${expectedResult} )" */
 #end
 #foreach($param in $expectedResult.fields())
 #ValidateParamsMacro("  ", "result", $responseShape, $param)
 #end
+#if($serviceModel.metadata.protocol == "smithy-rpc-v2-cbor" || ($case.output && $case.output.get().successResult))
+  });
+#end
 #end
 #if($case.output && $case.output.get().errorResult)
   ASSERT_FALSE(outcome.IsSuccess());