Refactored JSR286 portlet test.

Change-Id: I1830ebca5e23890636ade0bab2eca2cefe6ee1ac

1 files changed, 10 insertions, 9 deletions

diff --git a/uitest/src/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/com/vaadin/tests/integration/JSR286Portlet.java
index dab19498ab..37f8e21c50 100644
--- a/uitest/src/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/com/vaadin/tests/integration/JSR286Portlet.java
@@ -72,15 +72,6 @@ public class JSR286Portlet extends UI {
         userInfo.setContentMode(ContentMode.PREFORMATTED);
         main.addComponent(userInfo);
 
-        userAgent.setCaption("User Agent");
-        main.addComponent(userAgent);
-
-        screenWidth.setCaption("Screen width");
-        main.addComponent(screenWidth);
-
-        screenHeight.setCaption("Screen height");
-        main.addComponent(screenHeight);
-
         tf.setEnabled(false);
         tf.setImmediate(true);
         main.addComponent(tf);
@@ -100,6 +91,16 @@ public class JSR286Portlet extends UI {
         main.addComponent(upload);
 
         possiblyChangedModeOrState();
+
+        userAgent.setCaption("User Agent");
+        main.addComponent(userAgent);
+
+        screenWidth.setCaption("Screen width");
+        main.addComponent(screenWidth);
+
+        screenHeight.setCaption("Screen height");
+        main.addComponent(screenHeight);
+
         getSession().addPortletListener(new DemoPortletListener());
     }