enhancing test case

svn changeset:7378/svn branch:6.0

diff --git a/src/com/itmill/toolkit/tests/layouts/TestAbsoluteLayout.java b/src/com/itmill/toolkit/tests/layouts/TestAbsoluteLayout.java
index 0550652c93fe067da35df3a6acadee87f4768240..cf78880dac799501a892e90013f7e64342b4dff1 100644 (file)
--- a/src/com/itmill/toolkit/tests/layouts/TestAbsoluteLayout.java
+++ b/src/com/itmill/toolkit/tests/layouts/TestAbsoluteLayout.java
@@ -3,7 +3,6 @@ package com.itmill.toolkit.tests.layouts;
 import java.util.Arrays;\r
 import java.util.Iterator;\r
 \r
-import com.itmill.toolkit.data.Container;\r
 import com.itmill.toolkit.data.Item;\r
 import com.itmill.toolkit.data.Property;\r
 import com.itmill.toolkit.data.Property.ValueChangeEvent;\r
@@ -20,6 +19,7 @@ import com.itmill.toolkit.ui.Field;
 import com.itmill.toolkit.ui.FieldFactory;\r
 import com.itmill.toolkit.ui.Form;\r
 import com.itmill.toolkit.ui.Label;\r
+import com.itmill.toolkit.ui.Layout;\r
 import com.itmill.toolkit.ui.NativeSelect;\r
 import com.itmill.toolkit.ui.TextField;\r
 import com.itmill.toolkit.ui.Window;\r
@@ -28,12 +28,6 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 public class TestAbsoluteLayout extends TestBase {\r
 \r
     private static class MFieldFactory extends BaseFieldFactory {\r
-        @Override\r
-        public Field createField(Container container, Object itemId,\r
-                Object propertyId, Component uiContext) {\r
-            // TODO Auto-generated method stub\r
-            return super.createField(container, itemId, propertyId, uiContext);\r
-        }\r
 \r
         @Override\r
         public Field createField(Item item, Object propertyId,\r
@@ -44,7 +38,20 @@ public class TestAbsoluteLayout extends TestBase {
                 f.setHeight("8em");\r
                 f.setCaption("CSS string");\r
                 return f;\r
+            } else if (((String) propertyId).contains("Units")) {\r
+                NativeSelect s = new NativeSelect() {\r
+                };\r
+                s.addContainerProperty("caption", String.class, "");\r
+                s.setItemCaptionPropertyId("caption");\r
+                s.setNullSelectionAllowed(false);\r
+                for (int i = 0; i < Layout.UNIT_SYMBOLS.length; i++) {\r
+                    Item unitItem = s.addItem(i);\r
+                    unitItem.getItemProperty("caption").setValue(\r
+                            Layout.UNIT_SYMBOLS[i]);\r
+                }\r
+                return s;\r
             }\r
+\r
             return super.createField(item, propertyId, uiContext);\r
         }\r
 \r
@@ -202,6 +209,12 @@ public class TestAbsoluteLayout extends TestBase {
                             "heightUnits", "caption", "styleName" }));\r
 \r
             beanItem = new BeanItem(l.getPosition(value));\r
+            String c = "Component properties for "\r
+                    + value.getClass().getSimpleName();\r
+            if (value instanceof Label) {\r
+                c += "(" + ((Label) value).getValue() + ")";\r
+            }\r
+            componentEditor.setCaption(c);\r
 \r
             positionEditor.setItemDataSource(beanItem);\r
 \r