Root -> UI in tests (#8908)

2 files changed, 9 insertions, 9 deletions

diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index aa4fa22d06..9b4d9492a2 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
+++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -16,12 +16,12 @@ import com.vaadin.terminal.DeploymentConfiguration;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
-public class CustomRootClassLoader extends TestCase {
+public class CustomUIClassLoader extends TestCase {
 
     /**
      * Stub root
      */
-    public static class MyRoot extends UI {
+    public static class MyUI extends UI {
         @Override
         protected void init(WrappedRequest request) {
             // Nothing to see here
@@ -57,7 +57,7 @@ public class CustomRootClassLoader extends TestCase {
                 createConfigurationMock(), null));
 
         UI uI = application.getUIForRequest(createRequestMock(null));
-        assertTrue(uI instanceof MyRoot);
+        assertTrue(uI instanceof MyUI);
     }
 
     private static DeploymentConfiguration createConfigurationMock() {
@@ -103,9 +103,9 @@ public class CustomRootClassLoader extends TestCase {
 
         UI uI = application
                 .getUIForRequest(createRequestMock(loggingClassLoader));
-        assertTrue(uI instanceof MyRoot);
+        assertTrue(uI instanceof MyUI);
         assertEquals(1, loggingClassLoader.requestedClasses.size());
-        assertEquals(MyRoot.class.getName(),
+        assertEquals(MyUI.class.getName(),
                 loggingClassLoader.requestedClasses.get(0));
 
     }
@@ -119,7 +119,7 @@ public class CustomRootClassLoader extends TestCase {
             @Override
             public String getProperty(String name) {
                 if (name.equals(UI_PARAMETER)) {
-                    return MyRoot.class.getName();
+                    return MyUI.class.getName();
                 } else {
                     return super.getProperty(name);
                 }
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 e2db224f08..2a0a733140 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
@@ -100,12 +100,12 @@ public class AttachDetachWindow {
         }
     }
 
-    private class TestRoot extends UI implements TestContainer {
+    private class TestUI extends UI implements TestContainer {
         boolean rootAttachCalled = false;
         boolean rootDetachCalled = false;
         private TestContent testContent = new TestContent();;
 
-        public TestRoot() {
+        public TestUI() {
             setContent(testContent);
         }
 
@@ -142,7 +142,7 @@ public class AttachDetachWindow {
         }
     }
 
-    TestRoot main = new TestRoot();
+    TestUI main = new TestUI();
     TestWindow sub = new TestWindow();
 
     @Test