Update output test cases

Author: davidh44

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

@@ -32,11 +32,10 @@ public class Then {
 
     @JsonCreator
     public Then(@JsonProperty("serializedAs") SerializedAs serializedAs,
-                @JsonProperty("deserializedAs") JsonNode deserializedAs,
-                @JsonProperty("errorDeserializedAs") JsonNode errorDeserializedAs) {
+                @JsonProperty("deserializedAs") JsonNode deserializedAs) {
         this.serializedAs = serializedAs;
         this.deserializedAs = new UnmarshalledResultAssertion(deserializedAs);
-        this.errorDeserializedAs = new UnmarshalledErrorAssertion(errorDeserializedAs);
+        this.errorDeserializedAs = new UnmarshalledErrorAssertion(deserializedAs);
     }
 
     /**

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

@@ -13,14 +13,12 @@
     },
     "when": {
       "action": "unmarshall",
-      "operation": "QueryCompatibleOperation"
+      "operation": "QueryCompatibleOperation",
+      "error": "NoCustomCodeError"
     },
     "then": {
-      "errorDeserializedAs": {
-        "errorCode": "NoCustomCodeError",
-        "error": {
-          "message": "Hi"
-        }
+      "deserializedAs": {
+        "message": "Hi"
       }
     }
   },
@@ -39,15 +37,13 @@
     },
     "when": {
       "action": "unmarshall",
-      "operation": "QueryCompatibleOperation"
+      "operation": "QueryCompatibleOperation",
+      "error": "Customized"
     },
     "then": {
-      "errorDeserializedAs": {
-        "errorCode": "Customized",
-        "error": {
-          "message": "Hi"
-        }
+      "deserializedAs": {
+        "message": "Hi"
       }
     }
   }
-]
+]

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

@@ -14,14 +14,12 @@
     },
     "when": {
       "action": "unmarshall",
-      "operation": "QueryCompatibleOperation"
+      "operation": "QueryCompatibleOperation",
+      "error": "NoCustomCodeError"
     },
     "then": {
-      "errorDeserializedAs": {
-        "errorCode": "NoCustomCodeError",
-        "error": {
-          "message": "Hi"
-        }
+      "deserializedAs": {
+        "message": "Hi"
       }
     }
   },
@@ -41,15 +39,13 @@
     },
     "when": {
       "action": "unmarshall",
-      "operation": "QueryCompatibleOperation"
+      "operation": "QueryCompatibleOperation",
+      "error": "Customized"
     },
     "then": {
-      "errorDeserializedAs": {
-        "errorCode": "Customized",
-        "error": {
-          "message": "Hi"
-        }
+      "deserializedAs": {
+        "message": "Hi"
       }
     }
   }
-]
+]