Misc test case fixes (invalid size definitions, invalid usage of AlignmentHandler...

svn changeset:6082/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
index 1092c4bac86c699c28b930ccda32df1ad5f93274..496016f4ec89d7c9807d2910b6557375a23b7691 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
@@ -54,7 +54,7 @@ public class Ticket1966 extends Application {
         Button b;\r
 \r
         b = new Button("Wide button");\r
-        b.setWidth("500");\r
+        b.setWidth("500px");\r
         gl.addComponent(b);\r
 \r
         addButtons(gl);\r
@@ -87,7 +87,7 @@ public class Ticket1966 extends Application {
         Button b;\r
 \r
         b = new Button("Wide button");\r
-        b.setWidth("500");\r
+        b.setWidth("500px");\r
         ol.addComponent(b);\r
 \r
         addButtons(ol);\r
@@ -107,19 +107,19 @@ public class Ticket1966 extends Application {
 \r
     }\r
 \r
-    private void addButtons(AlignmentHandler ol) {\r
+    private void addButtons(Layout ol) {\r
         ol.addComponent(getButton(ol, LEFT, TOP));\r
         ol.addComponent(getButton(ol, CENTER, VCENTER));\r
         ol.addComponent(getButton(ol, RIGHT, BOTTOM));\r
 \r
     }\r
 \r
-    private Button getButton(AlignmentHandler l, int hAlign, int vAlign) {\r
+    private Button getButton(Layout l, int hAlign, int vAlign) {\r
         Button b = new Button("Narrow Button - "\r
                 + names.get(new Integer(hAlign)) + " - "\r
                 + names.get(new Integer(vAlign)));\r
-        b.setWidth("100");\r
-        l.setComponentAlignment(b, hAlign, vAlign);\r
+        b.setWidth("100px");\r
+        ((AlignmentHandler) l).setComponentAlignment(b, hAlign, vAlign);\r
 \r
         return b;\r
 \r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
index b4ec296a3f22da32356ebf0a786101ed7e999817..5e8f3b1e91a7b74f6a2c94ea1d60b14b4c8383be 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
@@ -166,18 +166,18 @@ public class Ticket1966_2 extends Application {
 \r
     }\r
 \r
-    private void addButtons(AlignmentHandler ol) {\r
+    private void addButtons(Layout ol) {\r
         ol.addComponent(getButton(ol, LEFT, TOP));\r
         ol.addComponent(getButton(ol, CENTER, VCENTER));\r
         ol.addComponent(getButton(ol, RIGHT, BOTTOM));\r
 \r
     }\r
 \r
-    private Button getButton(AlignmentHandler l, int hAlign, int vAlign) {\r
+    private Button getButton(Layout l, int hAlign, int vAlign) {\r
         Button b = new Button(names.get(new Integer(hAlign)) + " - "\r
                 + names.get(new Integer(vAlign)));\r
         // b.setWidth("100");\r
-        l.setComponentAlignment(b, hAlign, vAlign);\r
+        ((AlignmentHandler) l).setComponentAlignment(b, hAlign, vAlign);\r
 \r
         return b;\r
 \r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
index e46e6a5f1ce47155987f68246270459787b240e7..d9f2df08b14d396e4acb269292b6670f4bb66f40 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
@@ -23,19 +23,19 @@ public class Ticket1966_3 extends Application {
     private void createUI(GridLayout layout) {\r
         OrderedLayout ol = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL);\r
         Panel p = new Panel(ol);\r
-        p.setWidth("300");\r
-        p.setHeight("300");\r
+        p.setWidth("300px");\r
+        p.setHeight("300px");\r
         p.getLayout().setSizeFull();\r
 \r
         TextField tf = new TextField("Long caption, longer than 100 pixels");\r
-        tf.setWidth("100");\r
+        tf.setWidth("100px");\r
 \r
         ol.addComponent(tf);\r
         ol.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_RIGHT,\r
                 OrderedLayout.ALIGNMENT_TOP);\r
 \r
         tf = new TextField("Short caption");\r
-        tf.setWidth("100");\r
+        tf.setWidth("100px");\r
 \r
         tf.setComponentError(new UserError("error message"));\r
         ol.addComponent(tf);\r
@@ -45,7 +45,7 @@ public class Ticket1966_3 extends Application {
         tf = new TextField("Short caption");\r
         tf.setComponentError(new UserError("error message"));\r
         tf.setIcon(new ThemeResource("icons/16/calendar.png"));\r
-        tf.setWidth("100");\r
+        tf.setWidth("100px");\r
 \r
         tf.setComponentError(new UserError("error message"));\r
         ol.addComponent(tf);\r
@@ -54,7 +54,7 @@ public class Ticket1966_3 extends Application {
 \r
         tf = new TextField();\r
         tf.setValue("No caption");\r
-        tf.setWidth("100");\r
+        tf.setWidth("100px");\r
 \r
         ol.addComponent(tf);\r
         ol.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_RIGHT,\r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
index 4897ccb6b861ffa651d9283611df20aa8dadbc20..aacdfad8aaa1b994c353024a70fb3b4a028cafa0 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
@@ -24,6 +24,8 @@ public class Ticket2021 extends Application {
             + "Nulla nisi. Sed blandit, ante vitae sagittis volutpat, arcu mauris vehicula risus, vitae posuere felis lectus sit amet purus. Donec nec magna et leo eleifend scelerisque. Suspendisse condimentum pharetra ligula. Curabitur lorem. Pellentesque a augue sit amet enim fermentum placerat. Phasellus ante risus, molestie at, iaculis at, pellentesque non, tellus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus non urna eget risus tempus imperdiet. Integer est diam, sagittis sit amet, posuere sit amet, bibendum sed, lacus. Aenean adipiscing cursus ipsum. Quisque at elit. Vestibulum vitae nunc. Praesent placerat metus viverra lorem. Cras nec elit congue nisi faucibus feugiat. Nam eget mi. Vestibulum condimentum. Nunc nisl ante, cursus in, dictum ac, lobortis rutrum, mi. Nulla eu nisi. In ultricies vehicula magna."\r
             + "Nunc eros dui, elementum at, ullamcorper eget, varius at, velit. Ut dictum. Cras ullamcorper ante vel tortor. Quisque viverra mauris vulputate quam. Nulla dui. Suspendisse non eros at ipsum faucibus hendrerit. Morbi dignissim pharetra tortor. Etiam malesuada. Mauris lacinia elementum erat. Duis mollis placerat metus. Nunc risus felis, cursus ac, cursus vel, convallis vel, metus. Ut vehicula nibh et nulla. Vivamus id pede. Quisque egestas arcu a ligula. Maecenas vehicula. Quisque sed ligula quis tellus tempus rutrum. Curabitur vel augue sed orci egestas pharetra. Duis pharetra.";\r
 \r
+    private OrderedLayout orderedLayout;\r
+\r
     public void init() {\r
         Window w = new Window(getClass().getSimpleName());\r
         w.setLayout(new GridLayout(2, 2));\r
@@ -31,8 +33,8 @@ public class Ticket2021 extends Application {
 \r
         Panel p = new Panel();\r
         p.setCaption("ExpandLayout");\r
-        p.setWidth(500);\r
-        p.setHeight(500);\r
+        p.setWidth("500px");\r
+        p.setHeight("500px");\r
         p.setLayout(new ExpandLayout());\r
         p.getLayout().setSizeFull();\r
 \r
@@ -52,8 +54,8 @@ public class Ticket2021 extends Application {
 \r
         Panel p2 = new Panel();\r
         p2.setCaption("OrderedLayout");\r
-        p2.setWidth(500);\r
-        p2.setHeight(500);\r
+        p2.setWidth("500px");\r
+        p2.setHeight("500px");\r
         p2.setLayout(new OrderedLayout());\r
         p2.getLayout().setSizeFull();\r
 \r
@@ -93,14 +95,14 @@ public class Ticket2021 extends Application {
         // p3.getLayout().addComponent(tf3);\r
         gl.addComponent(tf3);\r
 \r
-        // p = new Panel();\r
-        // p.setCaption("OrderedLayout");\r
-        // p.setWidth(500);\r
-        // p.setHeight(500);\r
-        // p.getLayout().setSizeFull();\r
+        // Panel pp = new Panel();\r
+        // pp.setCaption("OrderedLayout");\r
+        // pp.setWidth("500px");\r
+        // pp.setHeight("500px");\r
+        // pp.getLayout().setSizeFull();\r
         // orderedLayout = new OrderedLayout();\r
-        // p.getLayout().addComponent(orderedLayout);\r
-        // w.getLayout().addComponent(p);\r
+        // pp.getLayout().addComponent(orderedLayout);\r
+        // w.getLayout().addComponent(pp);\r
         // createUI(orderedLayout);\r
     }\r
 \r
@@ -111,15 +113,17 @@ public class Ticket2021 extends Application {
                 new ClickListener() {\r
 \r
                     public void buttonClick(ClickEvent event) {\r
-                        System.out.println("Enable caption");\r
-                        AbstractComponent l = tf1;\r
-                        // Layout l = (Layout) event.getButton().getData();\r
-                        if (l.getCaption() == null) {\r
-                            l.setCaption("Expand layout caption");\r
-                        } else {\r
-                            l.setCaption(null);\r
+                        System.out.println("Enable/disable caption");\r
+                        for (AbstractComponent l : new AbstractComponent[] {\r
+                                tf1, tf2, tf3 }) {\r
+                            // AbstractComponent l = tf2;\r
+                            // Layout l = (Layout) event.getButton().getData();\r
+                            if (l.getCaption() == null) {\r
+                                l.setCaption("Expand layout caption");\r
+                            } else {\r
+                                l.setCaption(null);\r
+                            }\r
                         }\r
-\r
                     }\r
 \r
                 });\r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061.java b/src/com/itmill/toolkit/tests/tickets/Ticket2061.java
index fb4eec35de07e04ff7dfe438a7929e1064d0f16f..4f364e875fc11a5af7e45b4010e6cb1980462b4e 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2061.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2061.java
@@ -19,7 +19,7 @@ public class Ticket2061 extends Application {
 
     @Override
     public void init() {
-        mainWindow = new Window("It Mill");
+        mainWindow = new Window("Ticket 2061");
         mainWindow.setSizeFull();
         mainWindow.getLayout().setSizeFull();
         setMainWindow(mainWindow);

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java b/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java
index 09d8b6ab512c9884ff8b132382bf03628e816642..4e5240f77307e777ed561a1b2d90eb866b809052 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java
@@ -63,7 +63,7 @@ public class Ticket2061b extends Application implements
         tf.setHeight("2500px");
         tf.setWidth("2500px");
 
-        Tabs tab = new Tabs(new Component[] { p, a, tf });
+        TabsAcc tab = new TabsAcc(new Component[] { p, a, tf });
         tab.addListener(this);
 
         mainLayout.addComponent(sp);
@@ -165,6 +165,19 @@ public class Ticket2061b extends Application implements
 
     }
 
+    public class TabsAcc extends Accordion {
+
+        public TabsAcc(Component[] components) {
+            this.setWidth("100%");
+            this.setHeight("100%");
+            for (int i = 0; i < components.length; i++) {
+                this.addTab(components[i], components[i].getDebugId(), null);
+            }
+
+        }
+
+    }
+
     public class MyAccordion extends Accordion {
 
         public MyAccordion(Component[] components, String id) {

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
index bf0b834939a894b8f34db268d5b48e2f714db4ce..d0d471b190990128011682b89e73535642205fbf 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
@@ -17,7 +17,9 @@ public class Ticket2095 extends Application {
 \r
         Embedded em = new Embedded();\r
         em.setType(Embedded.TYPE_BROWSER);\r
-        em.setSource(new ExternalResource("/statictestfiles/ticket2095.html"));\r
+        em\r
+                .setSource(new ExternalResource(\r
+                        "../statictestfiles/ticket2095.html"));\r
         em.setDebugId("MYIFRAME");\r
 \r
         em.setSizeFull();\r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
index 0d90373944ac41e22c70a9c54c725b67188e28c5..b3f42d775fee1c6ec650a858d047ddc94d88f3a9 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
@@ -178,6 +178,7 @@ public class Ticket2204 extends Application {
             sp.setWidth("300px");
             sp.setHeight("300px");
             sp.addComponent(new Label("Label"));
+            textArea.setSizeFull();
         }
         if (c == Panel.class) {
             Layout layout = ((Panel) cc).getLayout();

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2232.java b/src/com/itmill/toolkit/tests/tickets/Ticket2232.java
index cbc6efe64f5fb29c26b83dcf60be6163ed0dff10..bf27ad3a6678c295f2905426b71298e10984b93b 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2232.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2232.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.Layout;\r
 import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.Window;\r
+import com.itmill.toolkit.ui.Layout.SpacingHandler;\r
 \r
 public class Ticket2232 extends Application {\r
 \r
@@ -20,7 +21,7 @@ public class Ticket2232 extends Application {
                         new Label(\r
                                 "Defining spacing must be possible also with pure CSS"));\r
 \r
-        Layout.SpacingHandler gl;\r
+        Layout gl;\r
         gl = new OrderedLayout();\r
         gl.setWidth("100%");\r
         gl.setHeight("200px");\r
@@ -36,13 +37,13 @@ public class Ticket2232 extends Application {
         gl = new OrderedLayout();\r
         gl.setWidth("100%");\r
         gl.setHeight("200px");\r
-        gl.setSpacing(true);\r
+        ((SpacingHandler) gl).setSpacing(true);\r
         fillAndAdd(gl);\r
 \r
         gl = new GridLayout();\r
         gl.setWidth("100%");\r
         gl.setHeight("200px");\r
-        gl.setSpacing(true);\r
+        ((SpacingHandler) gl).setSpacing(true);\r
         fillAndAdd(gl);\r
 \r
         gl = new OrderedLayout();\r
@@ -57,7 +58,7 @@ public class Ticket2232 extends Application {
 \r
     }\r
 \r
-    private void fillAndAdd(Layout.SpacingHandler gl) {\r
+    private void fillAndAdd(Layout gl) {\r
         for (int i = 0; i < 4; i++) {\r
             Button b = new Button("B");\r
             b.setSizeFull();\r
@@ -65,7 +66,7 @@ public class Ticket2232 extends Application {
         }\r
         String caption = gl.getClass().getSimpleName();\r
         caption += " style: " + gl.getStyleName() + ", spacingFromServer:"\r
-                + gl.isSpacingEnabled();\r
+                + ((SpacingHandler) gl).isSpacingEnabled();\r
         gl.setCaption(caption);\r
         getMainWindow().addComponent(gl);\r
     }\r