diff options
Diffstat (limited to 'tests/testbench')
8 files changed, 13 insertions, 13 deletions
diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index 43d4ad699e..2611546203 100644 --- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -112,10 +112,10 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { final Class<?> classToRun = getClassToRun(); if (UI.class.isAssignableFrom(classToRun)) { Application application = new Application(); - application.addRootProvider(new AbstractRootProvider() { + application.addUIProvider(new AbstractRootProvider() { @Override - public Class<? extends UI> getRootClass( + public Class<? extends UI> getUIClass( Application application, WrappedRequest request) throws UIRequiresMoreInformationException { return (Class<? extends UI>) classToRun; diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java index deff2bc486..b9b9c509c1 100644 --- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java +++ b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java @@ -15,17 +15,17 @@ public class RefreshStatePreserve extends AbstractTestApplication { getContent().addComponent( new Label("window.name: " + request.getBrowserDetails().getWindowName())); - getContent().addComponent(new Label("UI id: " + getRootId())); + getContent().addComponent(new Label("UI id: " + getUIId())); } } @Override public void init() { super.init(); - setRootPreserved(true); - addRootProvider(new AbstractRootProvider() { + setUiPreserved(true); + addUIProvider(new AbstractRootProvider() { @Override - public Class<? extends UI> getRootClass(Application application, + public Class<? extends UI> getUIClass(Application application, WrappedRequest request) throws UIRequiresMoreInformationException { return RefreshStateRoot.class; diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java index 96380b2185..fa5ab7d100 100644 --- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java @@ -77,7 +77,7 @@ public class ThreadLocalInstances extends AbstractTestApplication { } @Override - protected UI getRoot(WrappedRequest request) + protected UI getUI(WrappedRequest request) throws UIRequiresMoreInformationException { return mainWindow; } diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index 515734338b..480c186df7 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -12,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow; public class LoginFormWithMultipleWindows extends Application { @Override - protected UI getRoot(WrappedRequest request) { + protected UI getUI(WrappedRequest request) { return new LoginFormWindow(); } diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java index 3c7862d298..89b43d4bdf 100644 --- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java +++ b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java @@ -22,7 +22,7 @@ public class LazyInitRoots extends AbstractTestApplication { } @Override - public UI getRoot(WrappedRequest request) + public UI getUI(WrappedRequest request) throws UIRequiresMoreInformationException { if (request.getParameter("lazyCreate") != null) { // UI created on second request diff --git a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java b/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java index 13bef59fe9..238983d906 100644 --- a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java +++ b/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java @@ -23,9 +23,9 @@ public class RootsInMultipleTabs extends AbstractTestApplication { } public RootsInMultipleTabs() { - addRootProvider(new AbstractRootProvider() { + addUIProvider(new AbstractRootProvider() { @Override - public Class<? extends UI> getRootClass(Application application, + public Class<? extends UI> getUIClass(Application application, WrappedRequest request) throws UIRequiresMoreInformationException { return TabRoot.class; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index 4181c071f0..39b11177b6 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -36,7 +36,7 @@ public class CreatingPreserveState extends UI { TextField tf = new TextField("Window #" + (++windowCounter)); tf.setImmediate(true); getContent().addComponent(tf); - getApplication().setRootPreserved(true); + getApplication().setUiPreserved(true); } } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 6b25f4674d..b0a33c14cf 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -35,7 +35,7 @@ import com.vaadin.ui.UI; public class DifferentFeaturesForDifferentClients extends Application { @Override - protected UI getRoot(WrappedRequest request) + protected UI getUI(WrappedRequest request) throws UIRequiresMoreInformationException { BrowserDetails browserDetails = request.getBrowserDetails(); // This is a limitation of 7.0.0.alpha1 that there is no better way to |