From 41e23b7efd0c62d0f81fb925d6e2ca8037b29cbd Mon Sep 17 00:00:00 2001 From: Zoe Wang <33073555+zoewangg@users.noreply.github.com> Date: Tue, 21 Oct 2025 14:47:50 -0700 Subject: [PATCH] Move codegen test fixtures outside sra folder --- .../poet/builder/BaseClientBuilderClassTest.java | 2 +- .../codegen/poet/client/AsyncClientClassTest.java | 10 +++++----- .../codegen/poet/client/SyncClientClassTest.java | 6 +++--- .../test-bearer-auth-client-builder-class.java | 0 .../builder/{sra => }/test-client-builder-class.java | 0 .../test-client-builder-endpoints-auth-params.java | 0 .../test-client-builder-internal-defaults-class.java | 0 .../test-composed-sync-default-client-builder.java | 0 .../test-env-bearer-token-client-builder-class.java | 0 .../test-h2-service-client-builder-class.java | 0 ...iorKnowledgeForH2-service-client-builder-class.java | 0 .../test-multi-auth-sigv4a-client-builder-class.java | 0 .../test-no-auth-ops-client-builder-class.java | 0 .../test-no-auth-service-client-builder-class.java | 0 .../{sra => }/test-query-client-builder-class.java | 0 .../{sra => }/test-aws-json-async-client-class.java | 0 .../client/{sra => }/test-cbor-async-client-class.java | 0 .../client/{sra => }/test-json-async-client-class.java | 0 .../poet/client/{sra => }/test-json-client-class.java | 0 .../{sra => }/test-query-async-client-class.java | 0 .../poet/client/{sra => }/test-query-client-class.java | 0 .../client/{sra => }/test-xml-async-client-class.java | 0 .../poet/client/{sra => }/test-xml-client-class.java | 0 23 files changed, 9 insertions(+), 9 deletions(-) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-bearer-auth-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-client-builder-endpoints-auth-params.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-client-builder-internal-defaults-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-composed-sync-default-client-builder.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-env-bearer-token-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-h2-service-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-multi-auth-sigv4a-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-no-auth-ops-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-no-auth-service-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/{sra => }/test-query-client-builder-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-aws-json-async-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-cbor-async-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-json-async-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-json-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-query-async-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-query-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-xml-async-client-class.java (100%) rename codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/{sra => }/test-xml-client-class.java (100%) diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClassTest.java index aaf8473430e7..ac11be3c716d 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClassTest.java +++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClassTest.java @@ -101,6 +101,6 @@ void baseClientBuilderClassWithH2_usePriorKnowledgeForH2() { } private void validateBaseClientBuilderClassGeneration(IntermediateModel model, String expectedClassName) { - validateGeneration(BaseClientBuilderClass::new, model, "sra/" + expectedClassName); + validateGeneration(BaseClientBuilderClass::new, model, expectedClassName); } } diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java index ec762d1e326c..6e2082fc4175 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java +++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java @@ -40,25 +40,25 @@ public class AsyncClientClassTest { @Test public void asyncClientClassRestJson() { AsyncClientClass sraAsyncClientClass = createAsyncClientClass(restJsonServiceModels()); - assertThat(sraAsyncClientClass, generatesTo("sra/test-json-async-client-class.java")); + assertThat(sraAsyncClientClass, generatesTo("test-json-async-client-class.java")); } @Test public void asyncClientClassQuery() { AsyncClientClass sraAsyncClientClass = createAsyncClientClass(queryServiceModels()); - assertThat(sraAsyncClientClass, generatesTo("sra/test-query-async-client-class.java")); + assertThat(sraAsyncClientClass, generatesTo("test-query-async-client-class.java")); } @Test public void asyncClientClassAwsJson() { AsyncClientClass sraAsyncClientClass = createAsyncClientClass(awsJsonServiceModels()); - assertThat(sraAsyncClientClass, generatesTo("sra/test-aws-json-async-client-class.java")); + assertThat(sraAsyncClientClass, generatesTo("test-aws-json-async-client-class.java")); } @Test public void asyncClientClassCbor() { AsyncClientClass sraAsyncClientClass = createAsyncClientClass(cborServiceModels()); - assertThat(sraAsyncClientClass, generatesTo("sra/test-cbor-async-client-class.java")); + assertThat(sraAsyncClientClass, generatesTo("test-cbor-async-client-class.java")); } @Test @@ -70,7 +70,7 @@ public void asyncClientClassAwsQueryCompatibleJson() { @Test public void asyncClientClassXml() { AsyncClientClass sraAsyncClientClass = createAsyncClientClass(xmlServiceModels()); - assertThat(sraAsyncClientClass, generatesTo("sra/test-xml-async-client-class.java")); + assertThat(sraAsyncClientClass, generatesTo("test-xml-async-client-class.java")); } @Test diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/SyncClientClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/SyncClientClassTest.java index 7a84cf35a019..f66dbe014ea7 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/SyncClientClassTest.java +++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/SyncClientClassTest.java @@ -38,13 +38,13 @@ public class SyncClientClassTest { @Test public void syncClientClassRestJson() { SyncClientClass sraSyncClientClass = createSyncClientClass(restJsonServiceModels()); - assertThat(sraSyncClientClass, generatesTo("sra/test-json-client-class.java")); + assertThat(sraSyncClientClass, generatesTo("test-json-client-class.java")); } @Test public void syncClientClassQuery() { SyncClientClass sraSyncClientClass = createSyncClientClass(queryServiceModels()); - assertThat(sraSyncClientClass, generatesTo("sra/test-query-client-class.java")); + assertThat(sraSyncClientClass, generatesTo("test-query-client-class.java")); } @Test @@ -56,7 +56,7 @@ public void syncClientClassAwsQueryCompatibleJson() { @Test public void syncClientClassXml() { SyncClientClass syncClientClass = createSyncClientClass(xmlServiceModels()); - assertThat(syncClientClass, generatesTo("sra/test-xml-client-class.java")); + assertThat(syncClientClass, generatesTo("test-xml-client-class.java")); } @Test diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-bearer-auth-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-bearer-auth-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-endpoints-auth-params.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-endpoints-auth-params.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-endpoints-auth-params.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-endpoints-auth-params.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-internal-defaults-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-internal-defaults-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-internal-defaults-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-internal-defaults-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-composed-sync-default-client-builder.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-composed-sync-default-client-builder.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-composed-sync-default-client-builder.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-composed-sync-default-client-builder.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-env-bearer-token-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-env-bearer-token-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-env-bearer-token-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-env-bearer-token-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-h2-service-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-service-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-h2-service-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-service-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-multi-auth-sigv4a-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-multi-auth-sigv4a-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-multi-auth-sigv4a-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-multi-auth-sigv4a-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-no-auth-ops-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-no-auth-ops-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-no-auth-ops-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-no-auth-ops-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-no-auth-service-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-no-auth-service-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-no-auth-service-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-no-auth-service-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-query-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-query-client-builder-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-aws-json-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-aws-json-async-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-cbor-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-cbor-async-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-json-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-json-async-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-json-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-json-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-query-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-query-async-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-query-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-query-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-async-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-client-class.java similarity index 100% rename from codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-client-class.java rename to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-client-class.java