From 139d9cce0cf824ae55aac9a77132d4b1ba84004b Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 16 Nov 2026 13:58:35 -0300 Subject: [PATCH] test: detect client function calls on Vaadin 25.4 Close #48 --- .../simpletimer/SimpleTimerClientCallsTest.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimerClientCallsTest.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimerClientCallsTest.java index 473f9bc..4ea3662 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimerClientCallsTest.java +++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimerClientCallsTest.java @@ -91,9 +91,18 @@ private List flush() { } private static long count(List calls, String function) { - return calls.stream() - .filter(call -> call.getInvocation().getExpression().contains(function)) - .count(); + return calls.stream().filter(call -> calls(call, function)).count(); + } + + /** + * Whether the call invokes the named client function. Up to Vaadin 25.3, {@code callJsFunction} + * sends an expression that names the function ({@code return $0._sync($1,...)}). Since 25.4 it + * sends one shared expression for all functions, with the function name as the first parameter. + */ + private static boolean calls(PendingJavaScriptInvocation call, String function) { + List parameters = call.getInvocation().getParameters(); + return call.getInvocation().getExpression().contains(function) + || (!parameters.isEmpty() && function.equals(parameters.get(0))); } @Test