Added test-cases for all existing layouts (except customlayout)

svn changeset:4985/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
index 44da0a4148b7d930badf09597ec299cc26d007d1..8a68f716297f43f1b291c5647d47d0dd5e4fd1e4 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
@@ -6,8 +6,14 @@ import com.itmill.toolkit.terminal.Sizeable;
 import com.itmill.toolkit.terminal.SystemError;\r
 import com.itmill.toolkit.terminal.ThemeResource;\r
 import com.itmill.toolkit.ui.Button;\r
+import com.itmill.toolkit.ui.Component;\r
+import com.itmill.toolkit.ui.ComponentContainer;\r
+import com.itmill.toolkit.ui.ExpandLayout;\r
 import com.itmill.toolkit.ui.Form;\r
+import com.itmill.toolkit.ui.GridLayout;\r
+import com.itmill.toolkit.ui.Label;\r
 import com.itmill.toolkit.ui.OrderedLayout;\r
+import com.itmill.toolkit.ui.Panel;\r
 import com.itmill.toolkit.ui.TextField;\r
 import com.itmill.toolkit.ui.Window;\r
 \r
@@ -19,8 +25,93 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
 \r
         OrderedLayout lo = new OrderedLayout();\r
         setMainWindow(new Window("#1710", lo));\r
+        lo.setMargin(true);\r
         lo.setSpacing(true);\r
 \r
+        // OrderedLayout\r
+        OrderedLayout orderedVertical = new OrderedLayout();\r
+        lo.addComponent(new Panel("OrderedLayout Vertical", orderedVertical));\r
+        orderedVertical.setSpacing(true);\r
+        addFields(orderedVertical);\r
+        OrderedLayout orderedHorizontal = new OrderedLayout(\r
+                OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        lo\r
+                .addComponent(new Panel("OrderedLayout Horizontal",\r
+                        orderedHorizontal));\r
+        orderedHorizontal.setSpacing(true);\r
+        addFields(orderedHorizontal);\r
+\r
+        // GridLayout\r
+        GridLayout grid = new GridLayout(1, 1);\r
+        lo.addComponent(new Panel("Gridlayout with 1 column", grid));\r
+        grid.setSpacing(true);\r
+        addFields(grid);\r
+\r
+        // GridLayout\r
+        GridLayout grid2 = new GridLayout(2, 1);\r
+        lo.addComponent(new Panel("Gridlayout with 2 columns", grid2));\r
+        grid2.setSpacing(true);\r
+        addFields(grid2);\r
+\r
+        // ExpandLayout\r
+        ExpandLayout el = new ExpandLayout();\r
+        Panel elp = new Panel("ExpandLayout width first component expanded", el);\r
+        el.setHeight(700);\r
+        addFields(el);\r
+        Component firstComponent = (Component) el.getComponentIterator().next();\r
+        firstComponent.setSizeFull();\r
+        el.expand(firstComponent);\r
+        lo.addComponent(elp);\r
+        ExpandLayout elh = new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL);\r
+        Panel elhp = new Panel(\r
+                "ExpandLayout width first component expanded; horizontal", elh);\r
+        elhp.setScrollable(true);\r
+        elh.setWidth(2000);\r
+        elh.setHeight(100);\r
+        addFields(elh);\r
+        Component firstComponentElh = (Component) elh.getComponentIterator()\r
+                .next();\r
+        firstComponentElh.setSizeFull();\r
+        elh.expand(firstComponentElh);\r
+        lo.addComponent(elhp);\r
+\r
+        // CustomLayout\r
+        Panel clp = new Panel("CustomLayout");\r
+        lo.addComponent(clp);\r
+        clp.addComponent(new Label("<<< Add customlayout testcase here >>>"));\r
+\r
+        // Form\r
+        Panel formPanel = new Panel("Form");\r
+        formPanel.addComponent(getFormPanelExample());\r
+        lo.addComponent(formPanel);\r
+\r
+    }\r
+\r
+    private Form getFormPanelExample() {\r
+        Form f = new Form();\r
+        f.setCaption("Test form");\r
+        Button fb1 = new Button("Test button");\r
+        fb1.setComponentError(new SystemError("Test error"));\r
+        f.addField("fb1", fb1);\r
+        Button fb2 = new Button("Test button");\r
+        fb2.setComponentError(new SystemError("Test error"));\r
+        fb2.setSwitchMode(true);\r
+        f.addField("fb2", fb2);\r
+        TextField ft1 = new TextField("With caption");\r
+        ft1.setComponentError(new SystemError("Error"));\r
+        f.addField("ft1", ft1);\r
+        TextField ft2 = new TextField();\r
+        ft2.setComponentError(new SystemError("Error"));\r
+        ft2.setValue("Without caption");\r
+        f.addField("ft2", ft2);\r
+        TextField ft3 = new TextField("With caption and required");\r
+        ft3.setComponentError(new SystemError("Error"));\r
+        ft3.setRequired(true);\r
+        f.addField("ft3", ft3);\r
+        return f;\r
+    }\r
+\r
+    private void addFields(ComponentContainer lo) {\r
         Button button = new Button("Test button");\r
         button.setComponentError(new SystemError("Test error"));\r
         lo.addComponent(button);\r
@@ -71,28 +162,5 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
         t7.setRequired(true);\r
         t7.setIcon(new ThemeResource("icons/16/ok.png"));\r
         lo.addComponent(t7);\r
-\r
-        Form f = new Form();\r
-        f.setCaption("Test form");\r
-        Button fb1 = new Button("Test button");\r
-        fb1.setComponentError(new SystemError("Test error"));\r
-        f.addField("fb1", fb1);\r
-        Button fb2 = new Button("Test button");\r
-        fb2.setComponentError(new SystemError("Test error"));\r
-        fb2.setSwitchMode(true);\r
-        f.addField("fb2", fb2);\r
-        TextField ft1 = new TextField("With caption");\r
-        ft1.setComponentError(new SystemError("Error"));\r
-        f.addField("ft1", ft1);\r
-        TextField ft2 = new TextField();\r
-        ft2.setComponentError(new SystemError("Error"));\r
-        ft2.setValue("Without caption");\r
-        f.addField("ft2", ft2);\r
-        TextField ft3 = new TextField("With caption and required");\r
-        ft3.setComponentError(new SystemError("Error"));\r
-        ft3.setRequired(true);\r
-        f.addField("ft3", ft3);\r
-        lo.addComponent(f);\r
-\r
     }\r
 }\r