Fixing doctests result matchers

Author: pabloem

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/IncreaseTests.java

@@ -25,7 +25,6 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 
-import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 
@@ -127,17 +126,17 @@ private static TestCaseSupplier makeSupplier(TestCaseSupplier.TypedDataSupplier
                 matcher = Matchers.nullValue();
             } else {
                 double increase = 0.0;
-                for (int i = 1; i < nonNullDataRows.size(); i++) {
-                    double previous = ((Number) nonNullDataRows.get(i - 1)).doubleValue();
-                    double current = ((Number) nonNullDataRows.get(i)).doubleValue();
+                for (int i = nonNullDataRows.size() - 1; i > 0; i--) {
+                    double previous = ((Number) nonNullDataRows.get(i)).doubleValue();
+                    double current = ((Number) nonNullDataRows.get(i - 1)).doubleValue();
                     if (current >= previous) {
                         increase += current - previous;
                     } else {
                         // Counter reset
                         increase += current;
                     }
                 }
-                matcher = closeTo(increase, 0.1 * increase);
+                matcher = Matchers.allOf(Matchers.greaterThanOrEqualTo(increase * 0.9), Matchers.lessThanOrEqualTo(increase * 3));
             }
 
             return new TestCaseSupplier.TestCase(

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/IrateTests.java

@@ -122,30 +122,22 @@ private static TestCaseSupplier makeSupplier(TestCaseSupplier.TypedDataSupplier
             );
 
             List<Object> nonNullDataRows = dataRows.stream().filter(Objects::nonNull).toList();
-            Object maxValue = null;
-            Object minValue = null;
-
-            for (int i = dataRows.size() - 1; i >= 0; i--) {
-                if (dataRows.get(i) != null) {
-                    if (maxValue == null) {
-                        maxValue = dataRows.get(i);
-                    } else if (((Comparable) dataRows.get(i)).compareTo(maxValue) > 0) {
-                        maxValue = dataRows.get(i);
-                    }
-                    if (minValue == null) {
-                        minValue = dataRows.get(i);
-                    } else if (((Comparable) dataRows.get(i)).compareTo(minValue) < 0) {
-                        minValue = dataRows.get(i);
-                    }
-                }
-            }
-
-            final Matcher<?> matcher;
+            Matcher<?> matcher;
             if (nonNullDataRows.size() < 2) {
                 matcher = Matchers.nullValue();
             } else {
-                var maxDiff = ((Number) maxValue).doubleValue() - ((Number) minValue).doubleValue();
-                matcher = Matchers.allOf(Matchers.greaterThanOrEqualTo(-maxDiff), Matchers.lessThanOrEqualTo(maxDiff));
+                var lastValue = ((Number) nonNullDataRows.getFirst()).doubleValue();
+                var secondLastValue = ((Number) nonNullDataRows.get(1)).doubleValue();
+                var increase = lastValue >= secondLastValue ? lastValue - secondLastValue : lastValue;
+                var largestTimestamp = timestamps.get(0);
+                var secondLargestTimestamp = timestamps.get(1);
+                var smallestTimestamp = timestamps.getLast();
+                matcher = Matchers.allOf(
+                    Matchers.greaterThanOrEqualTo(increase / (largestTimestamp - smallestTimestamp) * 1000 * 0.9),
+                    Matchers.lessThanOrEqualTo(
+                        increase / (largestTimestamp - secondLargestTimestamp) * (largestTimestamp - smallestTimestamp) * 1000
+                    )
+                );
             }
 
             return new TestCaseSupplier.TestCase(