Cleanups from PR + expand tests

Author: alextwoods

codegen/src/test/java/software/amazon/awssdk/codegen/poet/rules/EndpointRulesClientTestSpecTest.java

@@ -38,7 +38,7 @@ public void endpointProviderTestClassWithStringArray() {
     @Test
     public void endpointProviderTestClassWithUnknownProperties() {
         ClassSpec endpointProviderSpec = new EndpointProviderTestSpec(ClientTestModels.queryServiceModelsWithUnknownEndpointProperties());
-        assertThat(endpointProviderSpec, generatesTo("endpoint-rules-unknownproperty-test-class.java"));
+        assertThat(endpointProviderSpec, generatesTo("endpoint-rules-unknown-property-test-class.java"));
     }
 
     @Test

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-rules-unknownproperty-test-class.java renamed to codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-rules-unknown-property-test-class.java

@@ -25,6 +25,7 @@
 
 import java.net.URI;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -59,16 +60,47 @@ public class EndpointMetricValuesTest {
     void setup() {
         capturingInterceptor = new CapturingInterceptor();
         mockEndpointProvider = mock(RestJsonEndpointProvidersEndpointProvider.class);
+    }
+
+    @Test
+    void endpointMetricValuesAreAddedToUserAgent() {
+        List<String> metricValues = Arrays.asList("O", "K");
         when(mockEndpointProvider.resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class)))
             .thenReturn(CompletableFuture.completedFuture(
                 Endpoint.builder()
                         .url(URI.create("https://my-service.com"))
-                        .putAttribute(AwsEndpointAttribute.METRIC_VALUES, Arrays.asList("O", "K"))
+                        .putAttribute(AwsEndpointAttribute.METRIC_VALUES, metricValues)
                         .build()));
+
+        RestJsonEndpointProvidersClient client =
+            RestJsonEndpointProvidersClient.builder()
+                                           .endpointProvider(mockEndpointProvider)
+                                           .region(Region.US_WEST_2)
+                                           .credentialsProvider(CREDENTIALS_PROVIDER)
+                                           .overrideConfiguration(c -> c.addExecutionInterceptor(capturingInterceptor))
+                                           .build();
+
+        assertThatThrownBy(() -> client.operationWithNoInputOrOutput(r -> {
+        })).hasMessageContaining("short-circuit");
+
+        String userAgent = assertAndGetUserAgentString();
+        Matcher businessMetricMatcher = Pattern.compile("m/([^\\s]+)").matcher(userAgent);
+        assertTrue(businessMetricMatcher.find());
+        assertNotNull(businessMetricMatcher.group(1));
+        Set<String> metrics = new HashSet<>(Arrays.asList((businessMetricMatcher.group(1).split(","))));
+        assertTrue(metrics.containsAll(metricValues));
     }
 
     @Test
-    void endpointMetricValuesAreAddedToUserAgent() {
+    void endpointMetricValuesDoesNotFailOnEmptyList() {
+        List<String> metricValues = Collections.emptyList();
+        when(mockEndpointProvider.resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class)))
+            .thenReturn(CompletableFuture.completedFuture(
+                Endpoint.builder()
+                        .url(URI.create("https://my-service.com"))
+                        .putAttribute(AwsEndpointAttribute.METRIC_VALUES, metricValues)
+                        .build()));
+
         RestJsonEndpointProvidersClient client =
             RestJsonEndpointProvidersClient.builder()
                                            .endpointProvider(mockEndpointProvider)
@@ -84,8 +116,6 @@ void endpointMetricValuesAreAddedToUserAgent() {
         Matcher businessMetricMatcher = Pattern.compile("m/([^\\s]+)").matcher(userAgent);
         assertTrue(businessMetricMatcher.find());
         assertNotNull(businessMetricMatcher.group(1));
-        Set<String> metrics = new HashSet<>(Arrays.asList((businessMetricMatcher.group(1).split(","))));
-        assertTrue(metrics.containsAll(Arrays.asList("O", "K")));
     }
 
     private String assertAndGetUserAgentString() {