Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public abstract class AbstractAggregationTestCase extends AbstractFunctionTestCa
* Use if possible, as this method may get updated with new checks in the future.
* </p>
*/
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
List<TestCaseSupplier> suppliers,
boolean entirelyNullPreservesType,
PositionalErrorMessageSupplier positionalErrorMessageSupplier
Expand All @@ -85,15 +85,14 @@ protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultCh
*
* @param entirelyNullPreservesType See {@link #anyNullIsNull(boolean, List)}
*/
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
// TODO remove after removing parameterSuppliersFromTypedDataWithDefaultChecks rename this to that.
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
List<TestCaseSupplier> suppliers,
boolean entirelyNullPreservesType
) {
return parameterSuppliersFromTypedData(anyNullIsNull(entirelyNullPreservesType, randomizeBytesRefsOffset(suppliers)));
}

protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(List<TestCaseSupplier> suppliers) {
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(List<TestCaseSupplier> suppliers) {
return parameterSuppliersFromTypedData(withNoRowsExpectingNull(randomizeBytesRefsOffset(suppliers)));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ public abstract class AbstractScalarFunctionTestCase extends AbstractFunctionTes
*
* @param entirelyNullPreservesType See {@link #anyNullIsNull(boolean, List)}
*/
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
// TODO remove after removing parameterSuppliersFromTypedDataWithDefaultChecks rename this to that.
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
boolean entirelyNullPreservesType,
List<TestCaseSupplier> suppliers
) {
Expand All @@ -82,7 +81,7 @@ protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultCh
* @param nullsExpectedType See {@link #anyNullIsNull(List, ExpectedType, ExpectedEvaluatorToString)}
* @param evaluatorToString See {@link #anyNullIsNull(List, ExpectedType, ExpectedEvaluatorToString)}
*/
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
ExpectedType nullsExpectedType,
ExpectedEvaluatorToString evaluatorToString,
List<TestCaseSupplier> suppliers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public static Iterable<Object[]> createParameters(PercentCodecTestType codecTest
}
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(false, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(false, suppliers);

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, true);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, true);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
suppliers.add(testCaseSupplier);
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static Iterable<Object[]> parameters() {
}
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
suppliers.add(testCaseSupplier);
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
suppliers.add(testCaseSupplier);
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
suppliers.add(testCaseSupplier);
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static Iterable<Object[]> parameters() {
}
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, false);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static Iterable<Object[]> parameters() {
MultiRowTestCaseSupplier.doubleCases(1, 1000, -Double.MAX_VALUE, Double.MAX_VALUE, true)
).flatMap(List::stream).map(MedianAbsoluteDeviationTests::makeSupplier).toList();

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, true);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, true);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, true);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, true);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, false);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static Iterable<Object[]> parameters() {
}
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, false);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
suppliers.add(testCaseSupplier);
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static Iterable<Object[]> parameters() {
.map(fieldCaseSupplier -> makeSupplier(fieldCaseSupplier, limitCaseSupplier))
.collect(Collectors.toCollection(() -> suppliers));
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static Iterable<Object[]> parameters() {
MultiRowTestCaseSupplier.doubleCases(1, 1000, -Double.MAX_VALUE, Double.MAX_VALUE, true)
).flatMap(List::stream).map(StdDevTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers));

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, true);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, true);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static Iterable<Object[]> parameters() {
MultiRowTestCaseSupplier.geohexCases(1, 100)
).flatMap(List::stream).map(ValuesTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers));

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, false);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static Iterable<Object[]> parameters() {
)
);
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static Iterable<Object[]> parameters() {
}));
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static Iterable<Object[]> parameters() {
emptyList()
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static Iterable<Object[]> parameters() {
}));
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static Iterable<Object[]> parameters() {
emptyList()
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static Iterable<Object[]> parameters() {
);
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static Iterable<Object[]> parameters() {
);
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public static Iterable<Object[]> parameters() {
: ("failed to parse date field [" + bytesRef.utf8ToString() + "] with format [strict_date_optional_time_nanos]"))
)
);
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static Iterable<Object[]> parameters() {
}));
}
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static String randomDateString(long from, long to) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static Iterable<Object[]> parameters() {
)
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static String evaluatorName(String inner, String next) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static Iterable<Object[]> parameters() {
);
}));

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static String evaluatorName(String inner, String next) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static Iterable<Object[]> parameters() {
List.of()
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static String evaluatorName(String inner, String next) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static Iterable<Object[]> parameters() {
);
}

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static Iterable<Object[]> parameters() {
List.of()
);
}
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static Iterable<Object[]> parameters() {
TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.KEYWORD, DataType.GEOHASH, ToGeohashTests::valueOf, List.of());
TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.TEXT, DataType.GEOHASH, ToGeohashTests::valueOf, List.of());

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static long valueOf(Object gridAddress) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static Iterable<Object[]> parameters() {
TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.KEYWORD, DataType.GEOHEX, ToGeohexTests::valueOf, List.of());
TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.TEXT, DataType.GEOHEX, ToGeohexTests::valueOf, List.of());

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static long valueOf(Object gridAddress) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static Iterable<Object[]> parameters() {
TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.KEYWORD, DataType.GEOTILE, ToGeotileTests::valueOf, List.of());
TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.TEXT, DataType.GEOTILE, ToGeotileTests::valueOf, List.of());

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static long valueOf(Object gridAddress) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public static Iterable<Object[]> parameters() {
List.of()
);

return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
}

private static String evaluatorName(String inner, String next) {
Expand Down
Loading