Update codegen tests and explicitly use useSraAuth=false/true (#4536)

So these tests work in both the feature branch and the testing branch where we default useSraAuth=true.

Author: gosar

codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClassTest.java

@@ -75,6 +75,7 @@ public void syncComposedDefaultClientBuilderClass() {
  }
 
  private void validateBaseClientBuilderClassGeneration(IntermediateModel model, String expectedClassName) {
+ model.getCustomizationConfig().setUseSraAuth(false);
  validateGeneration(BaseClientBuilderClass::new, model, expectedClassName);
 
  model.getCustomizationConfig().setUseSraAuth(true);

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java

@@ -32,7 +32,7 @@
 public class AsyncClientClassTest {
  @Test
  public void asyncClientClassRestJson() {
- AsyncClientClass asyncClientClass = createAsyncClientClass(restJsonServiceModels());
+ AsyncClientClass asyncClientClass = createAsyncClientClass(restJsonServiceModels(), false);
  assertThat(asyncClientClass, generatesTo("test-json-async-client-class.java"));
 
  AsyncClientClass sraAsyncClientClass = createAsyncClientClass(restJsonServiceModels(), true);
@@ -41,7 +41,7 @@ public void asyncClientClassRestJson() {
 
  @Test
  public void asyncClientClassQuery() {
- AsyncClientClass asyncClientClass = createAsyncClientClass(queryServiceModels());
+ AsyncClientClass asyncClientClass = createAsyncClientClass(queryServiceModels(), false);
  assertThat(asyncClientClass, generatesTo("test-query-async-client-class.java"));
 
  AsyncClientClass sraAsyncClientClass = createAsyncClientClass(queryServiceModels(), true);
@@ -50,7 +50,7 @@ public void asyncClientClassQuery() {
 
  @Test
  public void asyncClientClassAwsJson() {
- AsyncClientClass asyncClientClass = createAsyncClientClass(awsJsonServiceModels());
+ AsyncClientClass asyncClientClass = createAsyncClientClass(awsJsonServiceModels(), false);
  assertThat(asyncClientClass, generatesTo("test-aws-json-async-client-class.java"));
 
  AsyncClientClass sraAsyncClientClass = createAsyncClientClass(awsJsonServiceModels(), true);
@@ -65,7 +65,7 @@ public void asyncClientClassAwsQueryCompatibleJson() {
 
  @Test
  public void asyncClientClassXml() {
- AsyncClientClass asyncClientClass = createAsyncClientClass(xmlServiceModels());
+ AsyncClientClass asyncClientClass = createAsyncClientClass(xmlServiceModels(), false);
  assertThat(asyncClientClass, generatesTo("test-xml-async-client-class.java"));
 
  AsyncClientClass sraAsyncClientClass = createAsyncClientClass(xmlServiceModels(), true);

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/SyncClientClassTest.java

@@ -32,7 +32,7 @@
 public class SyncClientClassTest {
  @Test
  public void syncClientClassRestJson() {
- SyncClientClass syncClientClass = createSyncClientClass(restJsonServiceModels());
+ SyncClientClass syncClientClass = createSyncClientClass(restJsonServiceModels(), false);
  assertThat(syncClientClass, generatesTo("test-json-client-class.java"));
 
  SyncClientClass sraSyncClientClass = createSyncClientClass(restJsonServiceModels(), true);
@@ -41,7 +41,7 @@ public void syncClientClassRestJson() {
 
  @Test
  public void syncClientClassQuery() {
- SyncClientClass syncClientClass = createSyncClientClass(queryServiceModels());
+ SyncClientClass syncClientClass = createSyncClientClass(queryServiceModels(), false);
  assertThat(syncClientClass, generatesTo("test-query-client-class.java"));
 
  SyncClientClass sraSyncClientClass = createSyncClientClass(queryServiceModels(), true);
@@ -56,7 +56,7 @@ public void syncClientClassAwsQueryCompatibleJson() {
 
  @Test
  public void syncClientClassXml() {
- SyncClientClass syncClientClass = createSyncClientClass(xmlServiceModels());
+ SyncClientClass syncClientClass = createSyncClientClass(xmlServiceModels(), false);
  assertThat(syncClientClass, generatesTo("test-xml-client-class.java"));
 
  SyncClientClass sraSyncClientClass = createSyncClientClass(xmlServiceModels(), true);