From 7cdbd11035c8278f7dc522993bd5cca7d2c7b815 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Wed, 28 Sep 2022 15:59:04 -0700
Subject: [PATCH] test(aws-protocoltests-json-10): remove
 Json10WithQueryCompatibleGreetingError (#3997)

---
 .../typescript/codegen/AwsProtocolUtils.java  |  5 +--
 .../test/functional/awsjson1_0.spec.ts        | 44 -------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
index eba8dc405309..610c543027fa 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
+++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
@@ -317,9 +317,8 @@ private static boolean filterProtocolTests(
             HttpMessageTestCase testCase,
             TypeScriptSettings settings
     ) {
-        // TODO: Consume AWSQueryError trait as a follow-up in JS-2681.
-        if (testCase.getId().equals("QueryCustomizedError")
-            || testCase.getId().equals("Json10WithQueryCompatibleGreetingError")) {
+        // TODO: Consume AWSQueryError trait as a follow-up.
+        if (testCase.getId().equals("QueryCustomizedError")) {
             return true;
         }
 
diff --git a/private/aws-protocoltests-json-10/test/functional/awsjson1_0.spec.ts b/private/aws-protocoltests-json-10/test/functional/awsjson1_0.spec.ts
index 7197c5902ea3..419b61455741 100644
--- a/private/aws-protocoltests-json-10/test/functional/awsjson1_0.spec.ts
+++ b/private/aws-protocoltests-json-10/test/functional/awsjson1_0.spec.ts
@@ -276,50 +276,6 @@ it("AwsJson10EndpointTraitWithHostLabel:Request", async () => {
   }
 });
 
-/**
- * @awsQueryCompatible trait is applied to service
- */
-it.skip("Json10WithQueryCompatibleGreetingError:Error:GreetingWithErrors", async () => {
-  const client = new JSONRPC10Client({
-    ...clientParams,
-    requestHandler: new ResponseDeserializationTestHandler(
-      false,
-      402,
-      {
-        "x-amzn-query-error": "CustomGreetingErrorCode;Sender",
-        "content-type": "application/x-amz-json-1.0",
-      },
-      `{"__type": "InvalidGreetingError","Message": "Hi"}`
-    ),
-  });
-
-  const params: any = {};
-  const command = new GreetingWithErrorsCommand(params);
-
-  try {
-    await client.send(command);
-  } catch (err) {
-    if (err.name !== "InvalidGreeting") {
-      console.log(err);
-      fail(`Expected a InvalidGreeting to be thrown, got ${err.name} instead`);
-      return;
-    }
-    const r: any = err;
-    expect(r["$metadata"].httpStatusCode).toBe(402);
-    const paramsToValidate: any = [
-      {
-        message: "Hi",
-      },
-    ][0];
-    Object.keys(paramsToValidate).forEach((param) => {
-      expect(r[param]).toBeDefined();
-      expect(equivalentContents(r[param], paramsToValidate[param])).toBe(true);
-    });
-    return;
-  }
-  fail("Expected an exception to be thrown from response");
-});
-
 /**
  * Parses simple JSON errors
  */