Fixed widths in old test cases

svn changeset:5374/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
index c93f8992d099fb9823aa08163610511ad6218539..00a46753c81eae7a31f602ecaa9e07b88af66a3a 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
@@ -101,23 +101,23 @@ public class Ticket1878 extends Application {
         GridLayout l1 = new GridLayout(1, 3);\r
         createLayout(l1,\r
                 new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL),\r
-                "1000", "150", "100%", null, true);\r
+                "1000px", "150px", "100%", null, true);\r
         createLayout(l1,\r
                 new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL),\r
-                "1000", "150", "50", null, false);\r
+                "1000px", "150px", "50px", null, false);\r
         GridLayout l2 = new GridLayout(6, 1);\r
         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL),\r
-                "200", "500", true);\r
+                "200px", "500px", true);\r
         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL),\r
-                "200", "500", "100%", null, true);\r
+                "200px", "500px", "100%", null, true);\r
         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL),\r
-                "150", "500", true);\r
+                "150px", "500px", true);\r
         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL),\r
-                "150", "500", "100%", null, true);\r
+                "150px", "500px", "100%", null, true);\r
         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL),\r
-                "100", "500", true);\r
+                "100px", "500px", true);\r
         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL),\r
-                "100", "500", "100%", null, true);\r
+                "100px", "500px", "100%", null, true);\r
         layout.addComponent(l1);\r
         layout.addComponent(l2);\r
 \r
@@ -128,16 +128,20 @@ public class Ticket1878 extends Application {
         GridLayout layout = new GridLayout(1, 5);\r
 \r
         GridLayout l1 = new GridLayout(1, 3);\r
-        createLayout(l1, new GridLayout(8, 1), "1000", "150", "100%", null,\r
+        createLayout(l1, new GridLayout(8, 1), "1000px", "150px", "100%", null,\r
                 true);\r
-        createLayout(l1, new GridLayout(8, 1), "1000", "150", "50", null, false);\r
+        createLayout(l1, new GridLayout(8, 1), "1000px", "150px", "50px", null,\r
+                false);\r
         GridLayout l2 = new GridLayout(6, 1);\r
-        createLayout(l2, new GridLayout(1, 8), "200", "500", true);\r
-        createLayout(l2, new GridLayout(1, 8), "200", "500", "100%", null, true);\r
-        createLayout(l2, new GridLayout(1, 8), "150", "500", true);\r
-        createLayout(l2, new GridLayout(1, 8), "150", "500", "100%", null, true);\r
-        createLayout(l2, new GridLayout(1, 8), "100", "500", true);\r
-        createLayout(l2, new GridLayout(1, 8), "100", "500", "100%", null, true);\r
+        createLayout(l2, new GridLayout(1, 8), "200px", "500px", true);\r
+        createLayout(l2, new GridLayout(1, 8), "200px", "500px", "100%", null,\r
+                true);\r
+        createLayout(l2, new GridLayout(1, 8), "150px", "500px", true);\r
+        createLayout(l2, new GridLayout(1, 8), "150px", "500px", "100%", null,\r
+                true);\r
+        createLayout(l2, new GridLayout(1, 8), "100px", "500px", true);\r
+        createLayout(l2, new GridLayout(1, 8), "100px", "500px", "100%", null,\r
+                true);\r
         layout.addComponent(l1);\r
         layout.addComponent(l2);\r
 \r
@@ -149,23 +153,23 @@ public class Ticket1878 extends Application {
 \r
         GridLayout l1 = new GridLayout(1, 3);\r
         createLayout(l1, new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL),\r
-                "1000", "150", "100", null, true);\r
+                "1000px", "150px", "100px", null, true);\r
         createLayout(l1, new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL),\r
-                "1000", "150", "50", null, false);\r
+                "1000px", "150px", "50px", null, false);\r
 \r
         GridLayout l2 = new GridLayout(6, 1);\r
         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-                "200", "500", true);\r
+                "200px", "500px", true);\r
         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-                "200", "500", "100%", null, true);\r
+                "200px", "500px", "100%", null, true);\r
         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-                "150", "500", true);\r
+                "150px", "500px", true);\r
         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-                "150", "500", "100%", null, true);\r
+                "150px", "500px", "100%", null, true);\r
         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-                "100", "500", true);\r
+                "100px", "500px", true);\r
         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-                "100", "500", "100%", null, true);\r
+                "100px", "500px", "100%", null, true);\r
         layout.addComponent(l1);\r
         layout.addComponent(l2);\r
 \r
@@ -218,7 +222,7 @@ public class Ticket1878 extends Application {
 \r
         Random r = new Random();\r
         GridLayout l1 = new GridLayout(1, 3);\r
-        form = createForm(l1, "200", "500");\r
+        form = createForm(l1, "200px", "500px");\r
         BeanItem item = new BeanItem(new FormObject());\r
         form.setItemDataSource(item);\r
         for (Iterator i = item.getItemPropertyIds().iterator(); i.hasNext();) {\r
@@ -237,21 +241,21 @@ public class Ticket1878 extends Application {
         }\r
         // createLayout(l1, new\r
         // ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL),\r
-        // "1000", "150", "50", null, false);\r
+        // "1000px", "150px", "50px", null, false);\r
 \r
         // GridLayout l2 = new GridLayout(6, 1);\r
         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-        // "200", "500", true);\r
+        // "200px", "500px", true);\r
         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-        // "200", "500", "100%", null, true);\r
+        // "200px", "500px", "100%", null, true);\r
         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-        // "150", "500", true);\r
+        // "150px", "500px", true);\r
         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-        // "150", "500", "100%", null, true);\r
+        // "150px", "500px", "100%", null, true);\r
         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-        // "100", "500", true);\r
+        // "100px", "500px", true);\r
         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),\r
-        // "100", "500", "100%", null, true);\r
+        // "100px", "500px", "100%", null, true);\r
         layout.addComponent(l1);\r
         // layout.addComponent(l2);\r
 \r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
index 7ce7a4222454d597344a8b9a4fc4d95425db30a4..30a458c4c235977ef1e5a0c4ecd20cc30e103083 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
@@ -18,8 +18,8 @@ public class Ticket2029 extends Application {
         setMainWindow(w);\r
         // setTheme("tests-tickets");\r
         Panel p = new Panel("1000x150");\r
-        p.setWidth("1000");\r
-        p.setHeight("150");\r
+        p.setWidth("1000px");\r
+        p.setHeight("150px");\r
 \r
         OrderedLayout layout = new OrderedLayout(\r
                 OrderedLayout.ORIENTATION_HORIZONTAL);\r