Add stash support to close_to for YAML tests (#141459)

Author: thecoop

test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/CloseToAssertion.java

@@ -37,14 +37,14 @@ public static CloseToAssertion parse(XContentParser parser) throws IOException {
                 throw new IllegalArgumentException("expected a map with value and error but got a map with " + map.size() + " fields");
             }
             Object valObj = map.get("value");
-            if (valObj instanceof Number == false) {
-                throw new IllegalArgumentException("value is missing or not a number");
+            if (valObj == null) {
+                throw new IllegalArgumentException("value is missing");
             }
             Object errObj = map.get("error");
             if (errObj instanceof Number == false) {
                 throw new IllegalArgumentException("error is missing or not a number");
             }
-            return new CloseToAssertion(location, fieldValueTuple.v1(), ((Number) valObj).doubleValue(), ((Number) errObj).doubleValue());
+            return new CloseToAssertion(location, fieldValueTuple.v1(), valObj, ((Number) errObj).doubleValue());
         } else {
             throw new IllegalArgumentException(
                 "expected a map with value and error but got " + fieldValueTuple.v2().getClass().getSimpleName()
@@ -57,7 +57,7 @@ public static CloseToAssertion parse(XContentParser parser) throws IOException {
 
     private final double error;
 
-    public CloseToAssertion(XContentLocation location, String field, Double expectedValue, Double error) {
+    public CloseToAssertion(XContentLocation location, String field, Object expectedValue, Double error) {
         super(location, field, expectedValue);
         this.error = error;
     }
@@ -69,10 +69,14 @@ public final double getError() {
     @Override
     protected void doAssert(Object actualValue, Object expectedValue) {
         logger.trace("assert that [{}] is close to [{}] with error [{}] (field [{}])", actualValue, expectedValue, error, getField());
+        if ((expectedValue instanceof Number) == false) {
+            throw new AssertionError("Expected value should be a number, but was [" + expectedValue + "], which is not a number");
+        }
+
         if (actualValue instanceof Number actualValueNumber) {
-            assertThat(actualValueNumber.doubleValue(), closeTo((Double) expectedValue, error));
+            assertThat(actualValueNumber.doubleValue(), closeTo(((Number) expectedValue).doubleValue(), error));
         } else {
-            throw new AssertionError("excpected a value close to " + expectedValue + " but got " + actualValue + ", which is not a number");
+            throw new AssertionError("expected a value close to " + expectedValue + " but got " + actualValue + ", which is not a number");
         }
     }
 }

test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java

@@ -168,7 +168,7 @@ public void testCloseTo() throws Exception {
 
     public void testInvalidCloseTo() throws Exception {
         parser = createParser(YamlXContent.yamlXContent, "{ field: 42 }");
-        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> CloseToAssertion.parse(parser));
+        Throwable exception = expectThrows(IllegalArgumentException.class, () -> CloseToAssertion.parse(parser));
         assertThat(exception.getMessage(), equalTo("expected a map with value and error but got Integer"));
 
         parser = createParser(YamlXContent.yamlXContent, "{ field: {  } }");
@@ -181,7 +181,12 @@ public void testInvalidCloseTo() throws Exception {
 
         parser = createParser(YamlXContent.yamlXContent, "{ field: { foo: 13, bar: 15 } }");
         exception = expectThrows(IllegalArgumentException.class, () -> CloseToAssertion.parse(parser));
-        assertThat(exception.getMessage(), equalTo("value is missing or not a number"));
+        assertThat(exception.getMessage(), equalTo("value is missing"));
+
+        parser = createParser(YamlXContent.yamlXContent, "{ field: { value: \"foo\", error: 0.001 } }");
+        CloseToAssertion closeToAssertion = CloseToAssertion.parse(parser);
+        exception = expectThrows(AssertionError.class, () -> closeToAssertion.doAssert(42, closeToAssertion.getExpectedValue()));
+        assertThat(exception.getMessage(), equalTo("Expected value should be a number, but was [foo], which is not a number"));
     }
 
     public void testExists() throws IOException {