More comprehensive test case for #2029

svn changeset:5429/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
index 30a458c4c235977ef1e5a0c4ecd20cc30e103083..bd4f4bb4070dee8eddcdfd544f1021809999b72b 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
@@ -3,7 +3,11 @@ package com.itmill.toolkit.tests.tickets;
 import java.util.Random;\r
 \r
 import com.itmill.toolkit.Application;\r
+import com.itmill.toolkit.data.Property.ValueChangeEvent;\r
+import com.itmill.toolkit.data.Property.ValueChangeListener;\r
 import com.itmill.toolkit.terminal.UserError;\r
+import com.itmill.toolkit.ui.Component;\r
+import com.itmill.toolkit.ui.GridLayout;\r
 import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.Panel;\r
 import com.itmill.toolkit.ui.TextField;\r
@@ -11,25 +15,75 @@ import com.itmill.toolkit.ui.Window;
 \r
 public class Ticket2029 extends Application {\r
 \r
+    int COMPONENTS;\r
+    int DIM1, DIM2;\r
     Random r = new Random();\r
 \r
     public void init() {\r
+        COMPONENTS = 5;\r
+        DIM1 = 504;\r
+        DIM2 = 100;\r
+\r
         Window w = new Window(getClass().getSimpleName());\r
         setMainWindow(w);\r
         // setTheme("tests-tickets");\r
-        Panel p = new Panel("1000x150");\r
-        p.setWidth("1000px");\r
-        p.setHeight("150px");\r
+        Panel p = createPanel();\r
+        w.getLayout().addComponent(p);\r
+        // w.getLayout().addComponent(createGLPanel());\r
+        w.getLayout().addComponent(createPanelV());\r
+    }\r
+\r
+    private Panel createPanel() {\r
+        Panel p = new Panel(DIM1 + "x" + DIM2 + " OrderedLayout");\r
+        p.setWidth(DIM1 + "px");\r
+        p.setHeight(DIM2 + "px");\r
 \r
         OrderedLayout layout = new OrderedLayout(\r
                 OrderedLayout.ORIENTATION_HORIZONTAL);\r
         p.setLayout(layout);\r
         p.getLayout().setSizeFull();\r
 \r
-        w.getLayout().addComponent(p);\r
+        for (int i = 0; i < COMPONENTS; i++) {\r
+            TextField tf = new TextField();\r
+            if (r.nextBoolean()) {\r
+                tf.setCaption("Caption");\r
+            }\r
+            if (r.nextBoolean()) {\r
+                tf.setRequired(true);\r
+            }\r
+            if (r.nextBoolean()) {\r
+                tf.setComponentError(new UserError("Error"));\r
+            }\r
+            tf.setWidth("100%");\r
+            layout.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_LEFT,\r
+                    OrderedLayout.ALIGNMENT_BOTTOM);\r
+            p.addComponent(tf);\r
+\r
+        }\r
+\r
+        return p;\r
+    }\r
+\r
+    private Panel createGLPanel() {\r
+        Panel p = new Panel("" + DIM1 + "x" + DIM2 + " GridLayout");\r
+        p.setWidth("" + DIM1 + "px");\r
+        p.setHeight("" + DIM2 + "px");\r
+\r
+        GridLayout layout = new GridLayout(COMPONENTS, 1);\r
+        p.setLayout(layout);\r
+        p.getLayout().setSizeFull();\r
 \r
-        for (int i = 0; i < 10; i++) {\r
+        for (int i = 0; i < COMPONENTS; i++) {\r
             TextField tf = new TextField();\r
+            tf.setImmediate(true);\r
+            tf.addListener(new ValueChangeListener() {\r
+\r
+                public void valueChange(ValueChangeEvent event) {\r
+                    Component c = ((Component) event.getProperty());\r
+                    c.setCaption("askfdj");\r
+\r
+                }\r
+            });\r
             if (r.nextBoolean()) {\r
                 tf.setCaption("Caption");\r
             }\r
@@ -40,10 +94,46 @@ public class Ticket2029 extends Application {
                 tf.setComponentError(new UserError("Error"));\r
             }\r
             tf.setWidth("100%");\r
+            layout.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_LEFT,\r
+                    OrderedLayout.ALIGNMENT_VERTICAL_CENTER);\r
+            p.addComponent(tf);\r
+\r
+        }\r
+\r
+        return p;\r
+    }\r
+\r
+    private Panel createPanelV() {\r
+        Panel p = new Panel("" + DIM1 + "x" + DIM2 + " OrderedLayout");\r
+        p.setWidth("" + DIM2 + "px");\r
+        p.setHeight("" + DIM1 + "px");\r
+\r
+        OrderedLayout layout = new OrderedLayout(\r
+                OrderedLayout.ORIENTATION_VERTICAL);\r
+        p.setLayout(layout);\r
+        p.getLayout().setSizeFull();\r
+\r
+        for (int i = 0; i < COMPONENTS; i++) {\r
+            TextField tf = new TextField();\r
+            if (r.nextBoolean()) {\r
+                tf.setCaption("Caption");\r
+            }\r
+            if (r.nextBoolean()) {\r
+                tf.setRequired(true);\r
+            }\r
+            if (r.nextBoolean()) {\r
+                tf.setComponentError(new UserError("Error"));\r
+            }\r
+\r
+            tf.setRows(2);\r
+            tf.setSizeFull();\r
+\r
             layout.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_LEFT,\r
                     OrderedLayout.ALIGNMENT_BOTTOM);\r
             p.addComponent(tf);\r
 \r
         }\r
+\r
+        return p;\r
     }\r
 }\r