Button and CheckBox test

svn changeset:15589/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/button/Buttons2.java b/tests/src/com/vaadin/tests/components/button/Buttons2.java
new file mode 100644 (file)
index 0000000..ecb5d34
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/button/Buttons2.java
@@ -0,0 +1,56 @@
+package com.vaadin.tests.components.button;\r
+\r
+import com.vaadin.tests.components.abstractfield.AbstractFieldTestCase;\r
+import com.vaadin.ui.Button;\r
+import com.vaadin.ui.Button.ClickEvent;\r
+import com.vaadin.ui.Button.ClickListener;\r
+\r
+public class Buttons2 extends AbstractFieldTestCase<Button> implements\r
+        ClickListener {\r
+\r
+    private Command<Button, Boolean> switchModeCommand = new Command<Button, Boolean>() {\r
+\r
+        public void execute(Button c, Boolean value, Object data) {\r
+            c.setSwitchMode(value);\r
+        }\r
+    };\r
+\r
+    private Command<Button, Boolean> clickListenerCommand = new Command<Button, Boolean>() {\r
+\r
+        public void execute(Button c, Boolean value, Object data) {\r
+            if (value) {\r
+                c.addListener((ClickListener) Buttons2.this);\r
+            } else {\r
+                c.removeListener((ClickListener) Buttons2.this);\r
+            }\r
+\r
+        }\r
+    };\r
+\r
+    @Override\r
+    protected Class<Button> getTestClass() {\r
+        return Button.class;\r
+    }\r
+\r
+    @Override\r
+    protected void createActions() {\r
+        super.createActions();\r
+\r
+        createFocusListener(CATEGORY_LISTENERS);\r
+        createBlurListener(CATEGORY_LISTENERS);\r
+\r
+        createBooleanAction("Switch mode", CATEGORY_FEATURES, false,\r
+                switchModeCommand);\r
+        addClickListener(CATEGORY_LISTENERS);\r
+    }\r
+\r
+    private void addClickListener(String category) {\r
+        createBooleanAction("Click listener", category, false,\r
+                clickListenerCommand);\r
+\r
+    }\r
+\r
+    public void buttonClick(ClickEvent event) {\r
+        log(event.getClass().getSimpleName());\r
+    }\r
+}\r

diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
new file mode 100644 (file)
index 0000000..38307b5
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
@@ -0,0 +1,57 @@
+package com.vaadin.tests.components.checkbox;\r
+\r
+import com.vaadin.tests.components.abstractfield.AbstractFieldTestCase;\r
+import com.vaadin.ui.Button.ClickEvent;\r
+import com.vaadin.ui.Button.ClickListener;\r
+import com.vaadin.ui.CheckBox;\r
+\r
+public class CheckBoxes2 extends AbstractFieldTestCase<CheckBox> implements\r
+        ClickListener {\r
+\r
+    // cannot extend Buttons2 because of Switch mode problems\r
+\r
+    @Override\r
+    protected Class<CheckBox> getTestClass() {\r
+        return CheckBox.class;\r
+    }\r
+\r
+    private Command<CheckBox, Boolean> switchModeCommand = new Command<CheckBox, Boolean>() {\r
+\r
+        public void execute(CheckBox c, Boolean value, Object data) {\r
+            c.setSwitchMode(value);\r
+        }\r
+    };\r
+\r
+    private Command<CheckBox, Boolean> clickListenerCommand = new Command<CheckBox, Boolean>() {\r
+\r
+        public void execute(CheckBox c, Boolean value, Object data) {\r
+            if (value) {\r
+                c.addListener((ClickListener) CheckBoxes2.this);\r
+            } else {\r
+                c.removeListener((ClickListener) CheckBoxes2.this);\r
+            }\r
+\r
+        }\r
+    };\r
+\r
+    @Override\r
+    protected void createActions() {\r
+        super.createActions();\r
+\r
+        createFocusListener(CATEGORY_LISTENERS);\r
+        createBlurListener(CATEGORY_LISTENERS);\r
+        createBooleanAction("Switch mode", CATEGORY_FEATURES, true,\r
+                switchModeCommand);\r
+        addClickListener(CATEGORY_LISTENERS);\r
+    }\r
+\r
+    private void addClickListener(String category) {\r
+        createBooleanAction("Click listener", category, false,\r
+                clickListenerCommand);\r
+\r
+    }\r
+\r
+    public void buttonClick(ClickEvent event) {\r
+        log(event.getClass().getSimpleName());\r
+    }\r
+}\r