From d5eae88389f24587f95ec10afc84d0e87217887e Mon Sep 17 00:00:00 2001
From: George Fu <kuhe@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:30:20 +0000
Subject: [PATCH] chore: skip server sdk tests for some cases

---
 clients/client-s3/src/protocols/Aws_restXml.ts        |  4 +---
 .../aws/typescript/codegen/AwsProtocolUtils.java      | 11 +++++++++++
 .../test/functional/restjson1.spec.ts                 | 10 +++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/clients/client-s3/src/protocols/Aws_restXml.ts b/clients/client-s3/src/protocols/Aws_restXml.ts
index 1d164e7cfa0e..31a28098aff7 100644
--- a/clients/client-s3/src/protocols/Aws_restXml.ts
+++ b/clients/client-s3/src/protocols/Aws_restXml.ts
@@ -5295,9 +5295,7 @@ export const de_SelectObjectContentCommand = async (
     $metadata: deserializeMetadata(output),
   });
   const data: any = output.body;
-  if (Object.keys(data ?? {}).length) {
-    contents.Payload = __expectUnion(de_SelectObjectContentEventStream(data, context));
-  }
+  contents.Payload = de_SelectObjectContentEventStream(data, context);
   return contents;
 };
 
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 12a86e8c6501..9d62b08e20fa 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
@@ -46,6 +46,7 @@
 import software.amazon.smithy.typescript.codegen.integration.ProtocolGenerator.GenerationContext;
 import software.amazon.smithy.typescript.codegen.util.StringStore;
 import software.amazon.smithy.utils.IoUtils;
+import software.amazon.smithy.utils.SetUtils;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
 /**
@@ -319,6 +320,16 @@ private static boolean filterProtocolTests(
             return true;
         }
 
+        // not implemented in server sdk.
+        if (SetUtils.of(
+            "SDKAppendedGzipAfterProvidedEncoding_restJson1",
+            "SDKAppliedContentEncoding_restJson1",
+            "RestJsonHttpPayloadWithUnsetUnion",
+            "RestJsonMustSupportParametersInContentType"
+        ).contains(testCase.getId()) && settings.generateServerSdk()) {
+            return true;
+        }
+
         return false;
     }
 
diff --git a/private/aws-restjson-server/test/functional/restjson1.spec.ts b/private/aws-restjson-server/test/functional/restjson1.spec.ts
index de9474d470c6..3ccb223d290f 100644
--- a/private/aws-restjson-server/test/functional/restjson1.spec.ts
+++ b/private/aws-restjson-server/test/functional/restjson1.spec.ts
@@ -972,7 +972,7 @@ it("RestJsonConstantQueryString:ServerRequest", async () => {
 /**
  * A server should ignore parameters added to the content type
  */
-it("RestJsonMustSupportParametersInContentType:ServerRequest", async () => {
+it.skip("RestJsonMustSupportParametersInContentType:ServerRequest", async () => {
   const testFunction = jest.fn();
   testFunction.mockReturnValue(Promise.resolve({}));
   const testService: Partial<RestJsonService<{}>> = {
@@ -3089,7 +3089,7 @@ it("RestJsonHttpPayloadWithUnion:ServerRequest", async () => {
 /**
  * No payload is sent if the union has no value.
  */
-it("RestJsonHttpPayloadWithUnsetUnion:ServerRequest", async () => {
+it.skip("RestJsonHttpPayloadWithUnsetUnion:ServerRequest", async () => {
   const testFunction = jest.fn();
   testFunction.mockReturnValue(Promise.resolve({}));
   const testService: Partial<RestJsonService<{}>> = {
@@ -3181,7 +3181,7 @@ it("RestJsonHttpPayloadWithUnion:ServerResponse", async () => {
 /**
  * No payload is sent if the union has no value.
  */
-it("RestJsonHttpPayloadWithUnsetUnion:ServerResponse", async () => {
+it.skip("RestJsonHttpPayloadWithUnsetUnion:ServerResponse", async () => {
   class TestService implements Partial<RestJsonService<{}>> {
     HttpPayloadWithUnion(input: any, ctx: {}): Promise<HttpPayloadWithUnionServerOutput> {
       const response = {} as any;
@@ -28798,7 +28798,7 @@ it("PostUnionWithJsonNameResponse3:ServerResponse", async () => {
 /**
  * Compression algorithm encoding is appended to the Content-Encoding header.
  */
-it("SDKAppliedContentEncoding_restJson1:ServerRequest", async () => {
+it.skip("SDKAppliedContentEncoding_restJson1:ServerRequest", async () => {
   const testFunction = jest.fn();
   testFunction.mockReturnValue(Promise.resolve({}));
   const testService: Partial<RestJsonService<{}>> = {
@@ -28844,7 +28844,7 @@ it("SDKAppliedContentEncoding_restJson1:ServerRequest", async () => {
  * request compression encoding from the HTTP binding.
  *
  */
-it("SDKAppendedGzipAfterProvidedEncoding_restJson1:ServerRequest", async () => {
+it.skip("SDKAppendedGzipAfterProvidedEncoding_restJson1:ServerRequest", async () => {
   const testFunction = jest.fn();
   testFunction.mockReturnValue(Promise.resolve({}));
   const testService: Partial<RestJsonService<{}>> = {