From 647b6f137d0b72f4131c4b4a3b627b06a626a0ee Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:07:46 -0300 Subject: [PATCH 1/5] test: upgrade testbench-rpc to 1.4.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f438cf..a22ecdc 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ com.flowingcode.vaadin.test testbench-rpc - 1.0.0 + 1.4.0-SNAPSHOT test From e1226d4dee75b9ead051b5c93d015fd82bcd3a26 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:09:23 -0300 Subject: [PATCH 2/5] test: make tests compatible with Vaadin 25 --- pom.xml | 6 ++++ .../integration/IntegrationView.java | 6 ++-- .../integration/ViewInitializerImpl.java | 33 +++++++++++++++++++ ...adin.flow.server.VaadinServiceInitListener | 1 + 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java create mode 100644 src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener diff --git a/pom.xml b/pom.xml index a22ecdc..0b5db3d 100644 --- a/pom.xml +++ b/pom.xml @@ -130,6 +130,12 @@ json-migration-helper 0.9.0 + + org.ow2.asm + asm + 9.8 + test + org.slf4j slf4j-simple diff --git a/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java index 24451fd..a700417 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java @@ -20,17 +20,17 @@ package com.flowingcode.vaadin.addons.chipfield.integration; import com.flowingcode.vaadin.addons.chipfield.ChipField; +import com.flowingcode.vaadin.jsonmigration.InstrumentedRoute; import com.flowingcode.vaadin.testbench.rpc.JsonArrayList; import com.vaadin.flow.component.ClientCallable; import com.vaadin.flow.component.html.Div; -import com.vaadin.flow.router.Route; import elemental.json.Json; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; import java.util.Optional; -@Route("it") +@InstrumentedRoute("it") public class IntegrationView extends Div implements IntegrationViewCallables { public ChipField field; @@ -166,7 +166,7 @@ public void addItemCreatedListener() { @Override @ClientCallable public JsonArrayList getLastValueChange() { - return JsonArrayList.fromStringArray(lastValueChange); + return JsonArrayList.fromStrings(lastValueChange); } @Override diff --git a/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java new file mode 100644 index 0000000..7342e17 --- /dev/null +++ b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java @@ -0,0 +1,33 @@ +/*- + * #%L + * RPC for Vaadin TestBench + * %% + * Copyright (C) 2021 - 2025 Flowing Code + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ +package com.flowingcode.vaadin.addons.chipfield.integration; + +import com.flowingcode.vaadin.jsonmigration.InstrumentationViewInitializer; +import com.vaadin.flow.server.ServiceInitEvent; + +@SuppressWarnings("serial") +public class ViewInitializerImpl extends InstrumentationViewInitializer { + + @Override + public void serviceInit(ServiceInitEvent event) { + registerInstrumentedRoute(IntegrationView.class); + } + +} diff --git a/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener b/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener new file mode 100644 index 0000000..b974866 --- /dev/null +++ b/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener @@ -0,0 +1 @@ +com.flowingcode.vaadin.addons.chipfield.integration.ViewInitializerImpl From c977eefae2011d749cf5dc401b5499ad7a539532 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:10:43 -0300 Subject: [PATCH 3/5] ci: remove repositories from v25 profile --- pom.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pom.xml b/pom.xml index 0b5db3d..61c30bf 100644 --- a/pom.xml +++ b/pom.xml @@ -515,28 +515,6 @@ 25.0.0-beta2 11.0.26 - - - vaadin-prerelease - https://maven.vaadin.com/vaadin-prereleases - - - FlowingCode Snapshots - https://maven.flowingcode.com/snapshots - - true - - - false - - - - - - vaadin-prerelease - https://maven.vaadin.com/vaadin-prereleases - - com.flowingcode.vaadin.addons.demo From 1bb21dc54828ad7cc0fb8bb8b8825fc51e8623c6 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:12:04 -0300 Subject: [PATCH 4/5] ci: add vaadin-dev dependency to v25 profile --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 61c30bf..ac68990 100644 --- a/pom.xml +++ b/pom.xml @@ -522,6 +522,11 @@ 5.0.0 test + + com.vaadin + vaadin-dev + true + From 0e264e0032a29242d7d2d98942fcaaa583c02408 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:12:15 -0300 Subject: [PATCH 5/5] ci: upgrade to vaadin 25.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac68990..bcbea42 100644 --- a/pom.xml +++ b/pom.xml @@ -512,7 +512,7 @@ 21 21 - 25.0.0-beta2 + 25.0.0 11.0.26