Panel and Window based on AbstractSingleComponentContainer (#2924)

Change-Id: I9eb1f40a02dcad0f756ad2518d86ef1c52aa69c2

1 files changed, 7 insertions, 3 deletions

diff --git a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
index bac83f9504..a5f7b83c32 100644
--- a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
@@ -81,9 +81,11 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         test(main);
         populateLayout(main);
 
-        final Panel panel = new Panel("Panel");
+        VerticalLayout panelLayout = new VerticalLayout();
+        panelLayout.setMargin(true);
+        final Panel panel = new Panel("Panel", panelLayout);
         test(panel);
-        populateLayout((Layout) panel.getContent());
+        populateLayout(panelLayout);
 
         final TabSheet tabsheet = new TabSheet();
         test(tabsheet);
@@ -124,7 +126,9 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         final Embedded emb = new Embedded("Embedded " + count++);
         test(layout, emb);
 
-        final Panel panel = new Panel("Panel " + count++);
+        VerticalLayout panelLayout = new VerticalLayout();
+        panelLayout.setMargin(true);
+        final Panel panel = new Panel("Panel " + count++, panelLayout);
         test(layout, panel);
 
         final Label label = new Label("Label " + count++);