1 files changed, 23 insertions, 14 deletions
diff --git a/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index a4e8d184f4..355499117c 100644
--- a/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
@@ -21,6 +21,7 @@ import java.util.Vector;
 
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Panel;
@@ -47,30 +48,32 @@ public class TestSelectAndDatefieldInDeepLayouts extends CustomComponent {
         root.addComponent(getSelect());
         root.addComponent(getDateField());
 
-        final Panel p1 = getPanel();
+        final VerticalLayout p1Layout = createPanelLayout();
+        final Panel p1 = getPanel(p1Layout);
+        p1.setContent(p1Layout);
         root.addComponent(p1);
 
-        p1.addComponent(getSelect());
-        p1.addComponent(getDateField());
-        p1.addComponent(getSelect());
-        p1.addComponent(getDateField());
+        p1Layout.addComponent(getSelect());
+        p1Layout.addComponent(getDateField());
+        p1Layout.addComponent(getSelect());
+        p1Layout.addComponent(getDateField());
 
         final AbstractOrderedLayout l1 = getOrderedLayout();
-        p1.addComponent(l1);
+        p1Layout.addComponent(l1);
 
         l1.addComponent(getSelect());
         l1.addComponent(getDateField());
         l1.addComponent(getSelect());
         l1.addComponent(getDateField());
 
-        final Panel p2 = getPanel();
+        final VerticalLayout p2Layout = createPanelLayout();
+        final Panel p2 = getPanel(p2Layout);
         l1.addComponent(p2);
 
-        p2.addComponent(getSelect());
-        p2.addComponent(getDateField());
-        p2.addComponent(getSelect());
-        p2.addComponent(getDateField());
-
+        p2Layout.addComponent(getSelect());
+        p2Layout.addComponent(getDateField());
+        p2Layout.addComponent(getSelect());
+        p2Layout.addComponent(getDateField());
     }
 
     VerticalLayout getOrderedLayout() {
@@ -79,8 +82,14 @@ public class TestSelectAndDatefieldInDeepLayouts extends CustomComponent {
         return l;
     }
 
-    Panel getPanel() {
-        final Panel panel = new Panel();
+    private VerticalLayout createPanelLayout() {
+        VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(true);
+        return layout;
+    }
+
+    Panel getPanel(ComponentContainer content) {
+        final Panel panel = new Panel(content);
         panel.setCaption(getCaption("panel"));
         return panel;
     }