WIP - adding more new test features

Author: alextwoods

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/XmlNamespace.java

@@ -17,16 +17,17 @@
 
 public class XmlNamespace {
 
-    public XmlNamespace() {}
+    private String prefix;
+    private String uri;
+
+    public XmlNamespace() {
+
+    }
 
     public XmlNamespace(String uri) {
         this.uri = uri;
     }
 
-    private String prefix;
-
-    private String uri;
-
     public String getPrefix() {
         return prefix;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java

@@ -302,6 +302,11 @@ public String getEnumValueName(String enumValue) {
         // Special cases
         result = result.replace("textORcsv", "TEXT_OR_CSV");
 
+        // leading digits, add a prefix
+        if (result.matches("^\\d.*")) {
+            result = "VALUE_" + result;
+        }
+
         // Split into words
         result = String.join("_", splitOnWordBoundaries(result));
 

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/CompositeMarshallingAssertion.java

@@ -18,6 +18,7 @@
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import java.util.ArrayList;
 import java.util.List;
+import software.amazon.awssdk.http.SdkHttpRequest;
 
 /**
  * Composite for MarshallingAssertion objects.

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HeadersAssertion.java

@@ -80,7 +80,7 @@ private void assertDoesNotContainHeaders(HttpHeaders actual) {
     }
 
     private void assertMustContainHeaders(HttpHeaders actual) {
-        doesNotContain.forEach(headerName -> {
+        mustContain.forEach(headerName -> {
             assertTrue(String.format("Header '%s' was expected to be present", headerName),
                         actual.getHeader(headerName).isPresent());
         });

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/MarshallingAssertion.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.protocol.asserts.marshalling;
 
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import software.amazon.awssdk.http.SdkHttpRequest;
 
 /**
  * Assertion on the marshalled request.

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryBodyAssertion.java

@@ -24,6 +24,7 @@
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class QueryBodyAssertion extends MarshallingAssertion  {
     private final String queryEquals;
@@ -49,8 +50,28 @@ protected void doAssert(LoggedRequest actual) throws Exception {
 
     private void doAssert(Map<String, List<String>> expectedParams, Map<String, List<String>> actualParams) {
         assertThat(actualParams.keySet(), equalTo(expectedParams.keySet()));
-        expectedParams.forEach((key, value) -> assertThat(
-            actualParams.get(key), containsInAnyOrder(value.toArray())
-        ));
+        expectedParams.forEach((key, value) -> assertParamsEqual(actualParams.get(key), value));
     }
+
+    private void assertParamsEqual(List<String> actual, List<String> expected) {
+        if (expected.stream().allMatch(QueryBodyAssertion::isNumeric)) {
+            assertThat(
+                actual.stream().map(Double::parseDouble).collect(Collectors.toList()),
+                containsInAnyOrder(expected.stream().map(Double::parseDouble).toArray()));
+        } else {
+            assertThat(actual, containsInAnyOrder(expected.toArray()));
+        }
+    }
+
+    public static boolean isNumeric(String str) {
+        if (str == null || str.isEmpty()) return false;
+        try {
+            Double.parseDouble(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+
 }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/ResolvedHostAssertion.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.protocol.asserts.marshalling;
+
+import static org.junit.Assert.assertEquals;
+
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+
+/**
+ * Asserts the resolved host of a marshalled request.
+ */
+public class ResolvedHostAssertion extends MarshallingAssertion {
+    private final String expectedHost;
+
+    public ResolvedHostAssertion(String host) {
+        this.expectedHost = host;
+    }
+
+    @Override
+    protected void doAssert(LoggedRequest actual) throws Exception {
+        // TODO:
+        // assertEquals(removeTrailingSlash(expectedUri), removeTrailingSlash(getActualPath(actual)));
+    }
+
+}

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/SerializedAs.java

@@ -37,6 +37,10 @@ public void setUri(String uri) {
         addAssertion(new UriAssertion(uri));
     }
 
+    public void setResolvedHost(String resolvedHost) {
+        addAssertion(new ResolvedHostAssertion(resolvedHost));
+    }
+
     @JsonDeserialize(using = SdkHttpMethodDeserializer.class)
     public void setMethod(SdkHttpMethod method) {
         addAssertion(new HttpMethodAssertion(method));

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Given.java

@@ -24,6 +24,8 @@ public class Given {
 
     private GivenResponse response;
 
+    private String host;
+
     public JsonNode getInput() {
         return input;
     }
@@ -39,4 +41,12 @@ public GivenResponse getResponse() {
     public void setResponse(GivenResponse response) {
         this.response = response;
     }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
 }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ShapeModelReflector.java

@@ -250,7 +250,15 @@ private Object getSimpleMemberValue(JsonNode currentNode, MemberModel memberMode
             case "Double":
                 return currentNode.asDouble();
             case "Instant":
-                return Instant.ofEpochMilli(currentNode.asLong());
+                if (currentNode.isFloatingPointNumber()) {
+                    double fractionalEpoch = currentNode.asDouble();
+                    long seconds = (long) fractionalEpoch;
+                    long nanos = (long) ((fractionalEpoch - seconds) * 1_000_000_000L);
+                    //truncate to ms
+                    return Instant.ofEpochSecond(seconds, (nanos / 1_000_000) * 1_000_000);
+                } else {
+                    return Instant.ofEpochSecond(currentNode.asLong());
+                }
             case "SdkBytes":
                 return SdkBytes.fromUtf8String(currentNode.asText());
             case "Float":