Skip to content

Commit 8e2cb29

Browse files
committed
move expression parse exception check to evaluation exceptions
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
1 parent bc0b866 commit 8e2cb29

1 file changed

Lines changed: 4 additions & 16 deletions

File tree

data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_MultiTypeIT.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,6 @@ void testMapExpressionEvaluatorWithMultipleThreads(final String expression, fina
111111
}
112112
}
113113

114-
@ParameterizedTest
115-
@MethodSource("exceptionExpressionSyntaxArguments")
116-
void testExpressionSyntaxEvaluatorCausesException(final String expression, final Event event) {
117-
final GenericExpressionEvaluator evaluator = applicationContext.getBean(GenericExpressionEvaluator.class);
118-
assertThrows(ExpressionParsingException.class, () -> evaluator.evaluate(expression, event));
119-
}
120-
121114
@ParameterizedTest
122115
@MethodSource("exceptionExpressionArguments")
123116
void testExpressionEvaluatorCausesException(final String expression, final Event event) {
@@ -165,20 +158,15 @@ private static Stream<Arguments> validMapExpressionArguments() {
165158
);
166159
}
167160

168-
private static Stream<Arguments> exceptionExpressionSyntaxArguments() {
169-
return Stream.of(
170-
Arguments.of("join()", event("{\"list\":[\"string\", 1, true]}")),
171-
Arguments.of("contains()", event("{\"list\":[\"string\", 1, true]}")),
172-
Arguments.of("startsWith()", event("{\"list\":[\"string\", 1, true]}"))
173-
);
174-
}
175-
176161
private static Stream<Arguments> exceptionExpressionArguments() {
177162
return Stream.of(
178163
// Can't mix Numbers and Strings when using operators
179164
Arguments.of("/status + /message", event("{\"status\": 200, \"message\":\"msg\"}")),
180165
// Wrong number of arguments
181-
Arguments.of("join(/list, \" \", \"third_arg\")", event("{\"list\":[\"string\", 1, true]}"))
166+
Arguments.of("join(/list, \" \", \"third_arg\")", event("{\"list\":[\"string\", 1, true]}")),
167+
Arguments.of("join()", event("{\"list\":[\"string\", 1, true]}")),
168+
Arguments.of("contains()", event("{\"list\":[\"string\", 1, true]}")),
169+
Arguments.of("startsWith()", event("{\"list\":[\"string\", 1, true]}"))
182170
);
183171
}
184172

0 commit comments

Comments
 (0)