Update tests

Author: davidh44

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestCase.java

@@ -31,6 +31,7 @@ public String getId() {
     public void setId(String id) {
         this.id = id;
     }
+
     public String getDescription() {
         return description;
     }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Then.java

@@ -29,13 +29,16 @@ public class Then {
     private final MarshallingAssertion serializedAs;
     private final UnmarshallingAssertion deserializedAs;
     private final UnmarshallingAssertion errorDeserializedAs;
+    private final String errorCode;
 
     @JsonCreator
     public Then(@JsonProperty("serializedAs") SerializedAs serializedAs,
-                @JsonProperty("deserializedAs") JsonNode deserializedAs) {
+                @JsonProperty("deserializedAs") JsonNode deserializedAs,
+                @JsonProperty("errorCode") String errorCode) {
         this.serializedAs = serializedAs;
         this.deserializedAs = new UnmarshalledResultAssertion(deserializedAs);
         this.errorDeserializedAs = new UnmarshalledErrorAssertion(deserializedAs);
+        this.errorCode = errorCode;
     }
 
     /**
@@ -59,4 +62,12 @@ public UnmarshallingAssertion getUnmarshallingAssertion() {
     public UnmarshallingAssertion getErrorUnmarshallingAssertion() {
         return errorDeserializedAs;
     }
+
+    /**
+     *
+     * @return The errorCode String to use for error unmarshalling tests
+     */
+    public String getErrorCode() {
+        return errorCode;
+    }
 }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/UnmarshallingTestRunner.java

@@ -25,13 +25,17 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Base64;
+import org.junit.Assert;
+import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.Metadata;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
 import software.amazon.awssdk.http.AbortableInputStream;
 import software.amazon.awssdk.protocol.asserts.unmarshalling.UnmarshallingTestContext;
 import software.amazon.awssdk.protocol.model.GivenResponse;
 import software.amazon.awssdk.protocol.model.TestCase;
+import software.amazon.awssdk.protocol.model.Then;
 import software.amazon.awssdk.protocol.reflect.ClientReflector;
 import software.amazon.awssdk.protocol.reflect.ShapeModelReflector;
 import software.amazon.awssdk.utils.IoUtils;
@@ -90,9 +94,30 @@ private void runErrorUnmarshallTest(TestCase testCase) throws Exception {
             throw new IllegalStateException("Test case expected client to throw error");
         } catch (InvocationTargetException t) {
             String errorName = testCase.getWhen().getErrorName();
-            testCase.getThen().getErrorUnmarshallingAssertion().assertMatches(
-                createErrorContext(operationName, errorName), t.getCause());
+            Throwable cause = t.getCause();
+            Then then = testCase.getThen();
+
+            then.getErrorUnmarshallingAssertion().assertMatches(
+                createErrorContext(operationName, errorName), cause);
+
+            validateErrorCodeIfPresent(then, cause);
+        }
+    }
+
+    private void validateErrorCodeIfPresent(Then then, Throwable cause) {
+        String expectedErrorCode = then.getErrorCode();
+        if (expectedErrorCode != null) {
+            String actualErrorCode = extractErrorCode(cause);
+            Assert.assertEquals(expectedErrorCode, actualErrorCode);
+        }
+    }
+
+    private String extractErrorCode(Throwable cause) {
+        if (!(cause instanceof AwsServiceException)) {
+            return null;
         }
+        AwsErrorDetails awsErrorDetails = ((AwsServiceException) cause).awsErrorDetails();
+        return awsErrorDetails.errorCode();
     }
 
     private UnmarshallingTestContext createErrorContext(String operationName, String errorName) {

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/json-querycompatible-output.json

@@ -43,7 +43,8 @@
     "then": {
       "deserializedAs": {
         "message": "Hi"
-      }
+      },
+      "errorCode": "Customized"
     }
   }
 ]

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/smithy-rpcv2-querycompatible-output.json

@@ -45,7 +45,8 @@
     "then": {
       "deserializedAs": {
         "message": "Hi"
-      }
+      },
+      "errorCode": "Customized"
     }
   }
 ]

test/protocol-tests/src/main/resources/codegen-resources/json-querycompatible/service-2.json

@@ -6,16 +6,16 @@
             "aws.auth#sigv4"
         ],
         "awsQueryCompatible": {},
-        "endpointPrefix": "query-compatible-jsonrpc10",
+        "endpointPrefix": "querycompatiblejsonrpc10",
         "jsonVersion": "1.0",
         "protocol": "json",
         "protocols": [
             "json"
         ],
-        "serviceFullName": "Query Compatible Json 1.0 Protocol Service",
+        "serviceFullName": "QueryCompatibleJsonRpc10",
         "serviceId": "Query Compatible JSON RPC 10",
         "signatureVersion": "v4",
-        "signingName": "query-compatible-jsonrpc10",
+        "signingName": "QueryCompatibleJsonRpc10",
         "targetPrefix": "QueryCompatibleJsonRpc10",
         "uid": "query-compatible-json-rpc-10-2020-07-14"
     },

test/protocol-tests/src/main/resources/codegen-resources/rpcv2-nonquerycompatible/service-2.json

@@ -29,4 +29,3 @@
     },
     "shapes": {}
 }
-

test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/JsonQueryCompatibleProtocolTest.java

@@ -41,7 +41,7 @@ public static List<TestCase> data() throws IOException {
 
     @BeforeClass
     public static void setupFixture() {
-        testRunner = new ProtocolTestRunner("/models/query-compatible-jsonrpc10-2020-07-14-intermediate.json");
+        testRunner = new ProtocolTestRunner("/models/querycompatiblejsonrpc10-2020-07-14-intermediate.json");
     }
 
     @Test