Really enable exception response tests

smithy-lang · Feb 18, 2025 · 6e1f346 · 6e1f346
1 parent 3676bcb
commit 6e1f346
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 17 deletions.
diff --git a/...c/it/java/software/amazon/smithy/java/client/aws/jsonprotocols/AwsJson1ProtocolTests.java b/...c/it/java/software/amazon/smithy/java/client/aws/jsonprotocols/AwsJson1ProtocolTests.java
@@ -50,7 +50,13 @@ public void requestTest(DataStream expected, DataStream actual) {
     @ProtocolTestFilter(
             skipTests = {
                     "AwsJson10ClientPopulatesDefaultsValuesWhenMissingInResponse",
-                    "AwsJson10ClientIgnoresDefaultValuesIfMemberValuesArePresentInResponse"
+                    "AwsJson10ClientIgnoresDefaultValuesIfMemberValuesArePresentInResponse",
+                    //The below fail because we haven't implemented code based exception handling
+                    "AwsJson10FooErrorUsingCode",
+                    "AwsJson10FooErrorUsingCodeAndNamespace",
+                    "AwsJson10FooErrorUsingCodeUriAndNamespace",
+                    "AwsJson10FooErrorWithDunderTypeUriAndNamespace"
+
             },
             skipOperations = "aws.protocoltests.json10#OperationWithRequiredMembersWithDefaults")
     public void responseTest(Runnable test) {

diff --git a/...n/src/it/java/software/amazon/smithy/java/client/aws/restjson/RestJson1ProtocolTests.java b/...n/src/it/java/software/amazon/smithy/java/client/aws/restjson/RestJson1ProtocolTests.java
@@ -66,7 +66,11 @@ public void requestTest(DataStream expected, DataStream actual) {
     @HttpClientResponseTests
     @ProtocolTestFilter(
             skipTests = {
-                    "RestJsonInputAndOutputWithQuotedStringHeaders"
+                    "RestJsonInputAndOutputWithQuotedStringHeaders",
+                    "RestJsonFooErrorUsingCode",
+                    "RestJsonFooErrorUsingCodeAndNamespace",
+                    "RestJsonFooErrorUsingCodeUriAndNamespace",
+                    "RestJsonFooErrorWithDunderTypeUriAndNamespace"
             })
     public void responseTest(Runnable test) {
         test.run();

diff --git a/...txml/src/it/java/software/amazon/smithy/java/aws/client/restxml/RestXmlProtocolTests.java b/...txml/src/it/java/software/amazon/smithy/java/aws/client/restxml/RestXmlProtocolTests.java
@@ -57,6 +57,10 @@ public void requestTest(DataStream expected, DataStream actual) {
     }
 
     @HttpClientResponseTests
+    @ProtocolTestFilter(skipTests = {
+            "InvalidGreetingError",
+            "ComplexError"
+    })
     public void responseTest(Runnable test) {
         test.run();
     }

diff --git a/...java/software/amazon/smithy/java/server/protocols/restjson/AwsRestJson1ProtocolTests.java b/...java/software/amazon/smithy/java/server/protocols/restjson/AwsRestJson1ProtocolTests.java
@@ -73,7 +73,10 @@ public void requestTest(Runnable test) {
                     "RestJsonStreamingTraitsWithMediaTypeWithBlob",
                     "RestJsonDeserializesDenseSetMapAndSkipsNull",
                     "RestJsonServerPopulatesDefaultsInResponseWhenMissingInParams",
+                    // These can be fixed after https://github.com/smithy-lang/smithy-java/blob/main/http-binding/src/main/java/software/amazon/smithy/java/http/binding/HttpBindingSerializer.java#L109
                     "RestJsonInvalidGreetingError",
+                    "RestJsonComplexErrorWithNoMessage",
+                    "RestJsonEmptyComplexErrorWithNoMessage",
                     //TODO this breaks because of Validation and errorCorrection doesn't handle that.
                     "RestJsonServerPopulatesNestedDefaultValuesWhenMissingInInResponseParams"
 

diff --git a/...cv2-cbor/src/it/java/software/amazon/smithy/java/client/rpcv2/RpcV2CborProtocolTests.java b/...cv2-cbor/src/it/java/software/amazon/smithy/java/client/rpcv2/RpcV2CborProtocolTests.java
@@ -35,7 +35,10 @@ public void requestTest(DataStream expected, DataStream actual) {
     @HttpClientResponseTests
     @ProtocolTestFilter(
             skipTests = {
-                    "RpcV2CborClientPopulatesDefaultsValuesWhenMissingInResponse"
+                    "RpcV2CborClientPopulatesDefaultsValuesWhenMissingInResponse",
+                    "RpcV2CborInvalidGreetingError",
+                    "RpcV2CborEmptyComplexError",
+                    "RpcV2CborComplexError"
             })
     public void responseTest(Runnable test) {
         test.run();

diff --git a/...rc/main/java/software/amazon/smithy/java/protocoltests/harness/ProtocolTestExtension.java b/...rc/main/java/software/amazon/smithy/java/protocoltests/harness/ProtocolTestExtension.java
@@ -314,21 +314,20 @@ private static List<HttpTestOperation> getTestOperations(
                 });
                 for (var errorId : operation.getErrors()) {
                     var error = serviceModel.getShape(errorId);
-                    if (error.map(Shape::isStructureShape).orElse(false)) {
-                        continue;
-                    }
-                    var errorShape = error.get().asStructureShape().get();
-                    errorShape.getTrait(HttpResponseTestsTrait.class).ifPresent(httpResponseTestsTrait -> {
-                        for (var testCase : httpResponseTestsTrait.getTestCases()) {
-                            if (testTypeFiler.test(testCase)) {
-                                responseTestsCases.add(
-                                        new HttpResponseProtocolTestCase(
-                                                testCase,
-                                                true,
-                                                getApiExceptionBuilder(symbolProvider, errorShape)));
+                    if (error.isPresent() && error.get().isStructureShape()) {
+                        var errorShape = error.get().asStructureShape().get();
+                        errorShape.getTrait(HttpResponseTestsTrait.class).ifPresent(httpResponseTestsTrait -> {
+                            for (var testCase : httpResponseTestsTrait.getTestCases()) {
+                                if (testTypeFiler.test(testCase)) {
+                                    responseTestsCases.add(
+                                            new HttpResponseProtocolTestCase(
+                                                    testCase,
+                                                    true,
+                                                    getApiExceptionBuilder(symbolProvider, errorShape)));
+                                }
                             }
-                        }
-                    });
+                        });
+                    }
                 }
                 operation.getTrait(HttpMalformedRequestTestsTrait.class)
                         .map(HttpMalformedRequestTestsTrait::getTestCases)