diff --git a/vaadin-testbench-unit-junit5/src/test/java/com/example/base/signals/SignalsView.java b/vaadin-testbench-unit-junit5/src/test/java/com/example/base/signals/SignalsView.java index d6fa4fa83..1a323f585 100644 --- a/vaadin-testbench-unit-junit5/src/test/java/com/example/base/signals/SignalsView.java +++ b/vaadin-testbench-unit-junit5/src/test/java/com/example/base/signals/SignalsView.java @@ -10,7 +10,6 @@ import java.util.concurrent.CompletableFuture; -import com.vaadin.flow.component.ComponentEffect; import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.html.NativeButton; import com.vaadin.flow.component.html.Span; @@ -39,13 +38,13 @@ public SignalsView() { incrementButton = new NativeButton("Increment", ev -> numberSignal.incrementBy(1.0)); counter = new Span("Counter: -"); - ComponentEffect.bind(counter, computedSignal, Span::setText); + counter.bindText(computedSignal); asyncNumberSignal = new SharedNumberSignal(); Signal asyncComputedSignal = asyncNumberSignal .mapIntValue(counter -> "Counter: " + counter); asyncCounter = new Span("Counter: -"); - ComponentEffect.bind(asyncCounter, asyncComputedSignal, Span::setText); + asyncCounter.bindText(asyncComputedSignal); asyncWithDelayNumberSignal = new SharedNumberSignal(); asyncWithDelayCounter = new Span("Counter: -"); @@ -58,7 +57,7 @@ public SignalsView() { java.util.concurrent.TimeUnit.MILLISECONDS)); }); - ComponentEffect.effect(asyncWithDelayCounter, () -> { + Signal.effect(asyncWithDelayCounter, () -> { try { Thread.sleep(1000); } catch (InterruptedException e) { diff --git a/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/SignalsTest.java b/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/SignalsTest.java index 2f1eb434c..4683fddcb 100644 --- a/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/SignalsTest.java +++ b/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/SignalsTest.java @@ -16,9 +16,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import com.vaadin.flow.component.ComponentEffect; -import com.vaadin.flow.component.UI; - @ViewPackages(packages = "com.example.base.signals") @Timeout(10) public class SignalsTest extends UIUnitTest { @@ -48,22 +45,6 @@ void detachedComponent_triggerSignal_effectEvaluatedOnAttach() { Assertions.assertEquals("Counter: 1", view.counter.getText()); } - @Test - void detachedComponent_triggerEffect_effectEvaluatedAsynchronously() { - var view = navigate(SignalsView.class); - var counterTester = test(view.asyncCounter); - Assertions.assertEquals("Counter: 0", counterTester.getText()); - UI ui = UI.getCurrent(); - UI.setCurrent(null); - - ComponentEffect.effect(ui, - () -> view.asyncCounter.setText("Counter: async")); - runPendingSignalsTasks(); - - UI.setCurrent(ui); - Assertions.assertEquals("Counter: async", view.asyncCounter.getText()); - } - @Test void attachedComponent_triggerSignalFromNonUIThread_effectEvaluatedAsynchronously() { var view = navigate(SignalsView.class);