summaryrefslogtreecommitdiffstats
path: root/tests/server-side/com
diff options
context:
space:
mode:
Diffstat (limited to 'tests/server-side/com')
-rw-r--r--tests/server-side/com/vaadin/tests/VaadinClasses.java4
-rw-r--r--tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java8
-rw-r--r--tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java8
-rw-r--r--tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java18
-rw-r--r--tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java8
-rw-r--r--tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java4
-rw-r--r--tests/server-side/com/vaadin/tests/server/components/TestWindow.java2
7 files changed, 26 insertions, 26 deletions
diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/tests/server-side/com/vaadin/tests/VaadinClasses.java
index 2f937bf58d..5d9e38398c 100644
--- a/tests/server-side/com/vaadin/tests/VaadinClasses.java
+++ b/tests/server-side/com/vaadin/tests/VaadinClasses.java
@@ -24,7 +24,7 @@ import com.vaadin.ui.Field;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.LoginForm;
import com.vaadin.ui.PopupView;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;
import com.vaadin.ui.themes.BaseTheme;
@@ -107,7 +107,7 @@ public class VaadinClasses {
classes.remove(DragAndDropWrapper.class);
classes.remove(CustomComponent.class);
classes.remove(LoginForm.class);
- classes.remove(Root.class);
+ classes.remove(UI.class);
return classes;
}
diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
index ca1bb45330..4e26ffaf45 100644
--- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
@@ -8,7 +8,7 @@ import com.vaadin.Application;
import com.vaadin.terminal.StreamVariable;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.terminal.gwt.server.CommunicationManager;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
import com.vaadin.ui.Upload;
public class TestStreamVariableMapping extends TestCase {
@@ -22,7 +22,7 @@ public class TestStreamVariableMapping extends TestCase {
@Override
protected void setUp() throws Exception {
final Application application = new Application();
- final Root root = new Root() {
+ final UI uI = new UI() {
@Override
protected void init(WrappedRequest request) {
// TODO Auto-generated method stub
@@ -36,8 +36,8 @@ public class TestStreamVariableMapping extends TestCase {
};
owner = new Upload() {
@Override
- public Root getRoot() {
- return root;
+ public UI getRoot() {
+ return uI;
}
};
streamVariable = EasyMock.createMock(StreamVariable.class);
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index f66f523770..dd1675c75d 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -10,7 +10,7 @@ import com.vaadin.data.util.AbstractProperty;
import com.vaadin.data.util.converter.Converter.ConversionException;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.ui.AbstractField;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
public class RemoveListenersOnDetach {
@@ -18,7 +18,7 @@ public class RemoveListenersOnDetach {
int numReadOnlyChanges = 0;
AbstractField field = new AbstractField() {
- private Root root = new Root() {
+ private UI uI = new UI() {
@Override
protected void init(WrappedRequest request) {
@@ -49,8 +49,8 @@ public class RemoveListenersOnDetach {
}
@Override
- public com.vaadin.ui.Root getRoot() {
- return root;
+ public com.vaadin.ui.UI getRoot() {
+ return uI;
};
@Override
diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
index 74770f8652..9fe486f85e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
+++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
@@ -14,14 +14,14 @@ import com.vaadin.RootRequiresMoreInformationException;
import com.vaadin.terminal.DefaultRootProvider;
import com.vaadin.terminal.DeploymentConfiguration;
import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
public class CustomRootClassLoader extends TestCase {
/**
* Stub root
*/
- public static class MyRoot extends Root {
+ public static class MyRoot extends UI {
@Override
protected void init(WrappedRequest request) {
// Nothing to see here
@@ -45,7 +45,7 @@ public class CustomRootClassLoader extends TestCase {
}
/**
- * Tests that a Root class can be loaded even if no classloader has been
+ * Tests that a UI class can be loaded even if no classloader has been
* provided.
*
* @throws Exception
@@ -56,8 +56,8 @@ public class CustomRootClassLoader extends TestCase {
application.start(new ApplicationStartEvent(null,
createConfigurationMock(), null));
- Root root = application.getRootForRequest(createRequestMock(null));
- assertTrue(root instanceof MyRoot);
+ UI uI = application.getRootForRequest(createRequestMock(null));
+ assertTrue(uI instanceof MyRoot);
}
private static DeploymentConfiguration createConfigurationMock() {
@@ -89,7 +89,7 @@ public class CustomRootClassLoader extends TestCase {
/**
* Tests that the ClassLoader passed in the ApplicationStartEvent is used to
- * load Root classes.
+ * load UI classes.
*
* @throws Exception
* if thrown
@@ -101,9 +101,9 @@ public class CustomRootClassLoader extends TestCase {
application.start(new ApplicationStartEvent(null,
createConfigurationMock(), null));
- Root root = application
+ UI uI = application
.getRootForRequest(createRequestMock(loggingClassLoader));
- assertTrue(root instanceof MyRoot);
+ assertTrue(uI instanceof MyRoot);
assertEquals(1, loggingClassLoader.requestedClasses.size());
assertEquals(MyRoot.class.getName(),
loggingClassLoader.requestedClasses.get(0));
@@ -126,7 +126,7 @@ public class CustomRootClassLoader extends TestCase {
}
@Override
- public Root getRootForRequest(WrappedRequest request)
+ public UI getRootForRequest(WrappedRequest request)
throws RootRequiresMoreInformationException {
// Always create a new root for testing (can't directly use
// getRoot as it's protected)
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
index f8901803c3..88bc28bbc8 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
@@ -7,8 +7,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.vaadin.Application;
-import com.vaadin.ui.Root;
-import com.vaadin.ui.Root.LegacyWindow;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Window;
public class AddRemoveSubWindow {
@@ -27,7 +27,7 @@ public class AddRemoveSubWindow {
TestApp app = new TestApp();
app.init();
Window subWindow = new Window("Sub window");
- Root mainWindow = app.getMainWindow();
+ UI mainWindow = app.getMainWindow();
mainWindow.addWindow(subWindow);
// Added to main window so the parent of the sub window should be the
@@ -61,7 +61,7 @@ public class AddRemoveSubWindow {
TestApp app = new TestApp();
app.init();
Window subWindow = new Window("Sub window");
- Root mainWindow = app.getMainWindow();
+ UI mainWindow = app.getMainWindow();
mainWindow.addWindow(subWindow);
// Added to main window so the parent of the sub window should be the
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
index e1435ea2ab..e2db224f08 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
@@ -8,7 +8,7 @@ import org.junit.Test;
import com.vaadin.Application;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
@@ -100,7 +100,7 @@ public class AttachDetachWindow {
}
}
- private class TestRoot extends Root implements TestContainer {
+ private class TestRoot extends UI implements TestContainer {
boolean rootAttachCalled = false;
boolean rootDetachCalled = false;
private TestContent testContent = new TestContent();;
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
index 7713f69f68..12d3a3c8f5 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
@@ -7,7 +7,7 @@ import junit.framework.TestCase;
import org.easymock.EasyMock;
-import com.vaadin.ui.Root.LegacyWindow;
+import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Window;
import com.vaadin.ui.Window.CloseEvent;
import com.vaadin.ui.Window.CloseListener;