Test case for #2652

svn changeset:6919/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel.java b/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel.java
new file mode 100644 (file)
index 0000000..4dfb151
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel.java
@@ -0,0 +1,51 @@
+package com.itmill.toolkit.tests.layouts;
+
+import com.itmill.toolkit.tests.components.TestBase;
+import com.itmill.toolkit.ui.GridLayout;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Panel;
+
+public class GridLayoutInsidePanel extends TestBase {
+
+    @Override
+    protected String getDescription() {
+        return "The first Panel contains a VerticalLayout, which contains a GridLayout, which contains a Label. The second panel directly contains a GridLayout, which contains a Label. Both should be rendered in the same way.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 2652;
+    }
+
+    @Override
+    protected void setup() {
+        {
+            GridLayout gl = new GridLayout(1, 1);
+            gl.setSizeUndefined();
+            gl.addComponent(new Label(
+                    "A label which defines the size of the GL"));
+
+            Panel p = new Panel("Panel 1");
+            p.getLayout().setMargin(false);
+            p.setSizeUndefined();
+            p.getLayout().setSizeUndefined();
+
+            p.addComponent(gl);
+            addComponent(p);
+        }
+        {
+            GridLayout gl = new GridLayout(1, 1);
+            gl.setSizeUndefined();
+            gl.addComponent(new Label(
+                    "A label which defines the size of the GL"));
+
+            Panel p = new Panel("Panel 2", gl);
+            p.getLayout().setMargin(false);
+            p.setSizeUndefined();
+            p.getLayout().setSizeUndefined();
+
+            addComponent(p);
+        }
+    }
+
+}