Skip to content

Commit 8007380

Browse files
authored
ESQL: Rename refactored test method (#136745)
- Find&Replace `parameterSuppliersFromTypedDataWithDefaultChecksNoErrors` with `parameterSuppliersFromTypedDataWithDefaultChecks` - Remove two `// TODO` reminding this
1 parent e644e00 commit 8007380

File tree

135 files changed

+138
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+138
-140
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public abstract class AbstractAggregationTestCase extends AbstractFunctionTestCa
6363
* Use if possible, as this method may get updated with new checks in the future.
6464
* </p>
6565
*/
66-
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
66+
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
6767
List<TestCaseSupplier> suppliers,
6868
boolean entirelyNullPreservesType,
6969
PositionalErrorMessageSupplier positionalErrorMessageSupplier
@@ -85,15 +85,14 @@ protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultCh
8585
*
8686
* @param entirelyNullPreservesType See {@link #anyNullIsNull(boolean, List)}
8787
*/
88-
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
89-
// TODO remove after removing parameterSuppliersFromTypedDataWithDefaultChecks rename this to that.
88+
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
9089
List<TestCaseSupplier> suppliers,
9190
boolean entirelyNullPreservesType
9291
) {
9392
return parameterSuppliersFromTypedData(anyNullIsNull(entirelyNullPreservesType, randomizeBytesRefsOffset(suppliers)));
9493
}
9594

96-
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(List<TestCaseSupplier> suppliers) {
95+
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(List<TestCaseSupplier> suppliers) {
9796
return parameterSuppliersFromTypedData(withNoRowsExpectingNull(randomizeBytesRefsOffset(suppliers)));
9897
}
9998

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ public abstract class AbstractScalarFunctionTestCase extends AbstractFunctionTes
6464
*
6565
* @param entirelyNullPreservesType See {@link #anyNullIsNull(boolean, List)}
6666
*/
67-
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
68-
// TODO remove after removing parameterSuppliersFromTypedDataWithDefaultChecks rename this to that.
67+
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
6968
boolean entirelyNullPreservesType,
7069
List<TestCaseSupplier> suppliers
7170
) {
@@ -82,7 +81,7 @@ protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultCh
8281
* @param nullsExpectedType See {@link #anyNullIsNull(List, ExpectedType, ExpectedEvaluatorToString)}
8382
* @param evaluatorToString See {@link #anyNullIsNull(List, ExpectedType, ExpectedEvaluatorToString)}
8483
*/
85-
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(
84+
protected static Iterable<Object[]> parameterSuppliersFromTypedDataWithDefaultChecks(
8685
ExpectedType nullsExpectedType,
8786
ExpectedEvaluatorToString evaluatorToString,
8887
List<TestCaseSupplier> suppliers

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public static Iterable<Object[]> createParameters(PercentCodecTestType codecTest
150150
}
151151
}
152152

153-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(false, suppliers);
153+
return parameterSuppliersFromTypedDataWithDefaultChecks(false, suppliers);
154154

155155
}
156156

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static Iterable<Object[]> parameters() {
5555
)
5656
);
5757

58-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, true);
58+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers, true);
5959
}
6060

6161
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
4949
suppliers.add(testCaseSupplier);
5050
}
5151
}
52-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
52+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
5353
}
5454

5555
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static Iterable<Object[]> parameters() {
5252
}
5353
}
5454
}
55-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
55+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
5656
}
5757

5858
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
4949
suppliers.add(testCaseSupplier);
5050
}
5151
}
52-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
52+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
5353
}
5454

5555
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
4949
suppliers.add(testCaseSupplier);
5050
}
5151
}
52-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
52+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
5353
}
5454

5555
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static Iterable<Object[]> parameters() {
4949
suppliers.add(testCaseSupplier);
5050
}
5151
}
52-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
52+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
5353
}
5454

5555
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static Iterable<Object[]> parameters() {
5252
}
5353
}
5454
}
55-
return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers);
55+
return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
5656
}
5757

5858
@Override

0 commit comments

Comments
 (0)