From 645eac58eb174b1e76be130ab5d88651f95bf50f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 13 Dec 2010 13:09:37 +0000
Subject: [PATCH] Tests for:  * NativeButton  * PasswordField  * Select  *
 Slider

 Lock for SplitPanel test

svn changeset:16473/svn branch:6.5
---
 .../AbstractComponentContainerTest.java       | 20 +++++
 .../components/AbstractComponentTest.java     | 18 +++++
 .../tests/components/button/Buttons2.java     | 18 ++---
 .../nativebutton/NativeButtonTest.java        | 12 +++
 .../passwordfield/PasswordFieldTest.java      | 20 +++++
 .../tests/components/select/SelectTest.java   | 12 +++
 .../tests/components/slider/SliderTest.java   | 74 +++++++++++++++++++
 .../splitpanel/AbstractSplitPanelTest.java    | 13 ++++
 .../components/textfield/TextFieldTest.java   |  6 +-
 9 files changed, 181 insertions(+), 12 deletions(-)
 create mode 100644 tests/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
 create mode 100644 tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
 create mode 100644 tests/src/com/vaadin/tests/components/select/SelectTest.java
 create mode 100644 tests/src/com/vaadin/tests/components/slider/SliderTest.java

diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentContainerTest.java b/tests/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
index ffebcc06d3..0c9c9c4ae2 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/tests/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
@@ -10,6 +10,7 @@ import com.vaadin.ui.ComponentContainer.ComponentAttachEvent;
 import com.vaadin.ui.ComponentContainer.ComponentAttachListener;
 import com.vaadin.ui.ComponentContainer.ComponentDetachEvent;
 import com.vaadin.ui.ComponentContainer.ComponentDetachListener;
+import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.PopupDateField;
@@ -18,6 +19,7 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalSplitPanel;
 
 public abstract class AbstractComponentContainerTest<T extends AbstractComponentContainer>
         extends AbstractComponentTest<T> implements ComponentAttachListener,
@@ -81,6 +83,22 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
         }
     };
 
+    private Command<T, ComponentSize> addVerticalSplitPanelCommand = new Command<T, ComponentSize>() {
+        public void execute(T c, ComponentSize size, Object data) {
+            VerticalSplitPanel vsp = new VerticalSplitPanel();
+            c.addComponent(vsp);
+            size.apply(vsp);
+        }
+    };
+
+    private Command<T, ComponentSize> addHorizontalSplitPanelCommand = new Command<T, ComponentSize>() {
+        public void execute(T c, ComponentSize size, Object data) {
+            HorizontalSplitPanel vsp = new HorizontalSplitPanel();
+            c.addComponent(vsp);
+            size.apply(vsp);
+        }
+    };
+
     private Command<T, ComponentSize> addTabSheetCommand = new Command<T, ComponentSize>() {
         public void execute(T c, ComponentSize size, Object data) {
             TabSheet ts = createTabSheet();
@@ -264,6 +282,8 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
         addCommands.put("Table", addTableCommand);
         addCommands.put("InlineDateField", addInlineDateFieldCommand);
         addCommands.put("PopupDateField", addPopupDateFieldCommand);
+        addCommands.put("VerticalSplitPanel", addVerticalSplitPanelCommand);
+        addCommands.put("HorizontalSplitPanel", addHorizontalSplitPanelCommand);
         // addCommands.put("AbsoluteLayout", addAbsoluteLayoutCommand);
         // addCommands.put("HorizontalLayout", addHorizontalLayoutCommand);
         // addCommands.put("VerticalLayout", addVerticalLayoutCommand);
diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java b/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
index eb1ddcbcb4..4de31c3c36 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
@@ -533,6 +533,24 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         return options;
     }
 
+    protected LinkedHashMap<String, Double> createDoubleOptions(double max) {
+        LinkedHashMap<String, Double> options = new LinkedHashMap<String, Double>();
+        for (double d = 0; d <= max && d < 10; d += 0.5) {
+            options.put(String.valueOf(d), d);
+        }
+        for (double d = 10; d <= max; d *= 10) {
+            options.put(String.valueOf(d), d);
+            if (2.5 * d <= max) {
+                options.put(String.valueOf(2 * d), 2 * d);
+            }
+            if (5 * d <= max) {
+                options.put(String.valueOf(5 * d), 5 * d);
+            }
+        }
+
+        return options;
+    }
+
     protected LinkedHashMap<String, Resource> createIconOptions(
             boolean cacheable) {
         LinkedHashMap<String, Resource> options = new LinkedHashMap<String, Resource>();
diff --git a/tests/src/com/vaadin/tests/components/button/Buttons2.java b/tests/src/com/vaadin/tests/components/button/Buttons2.java
index 3c2d1da30c..7df2de54c7 100644
--- a/tests/src/com/vaadin/tests/components/button/Buttons2.java
+++ b/tests/src/com/vaadin/tests/components/button/Buttons2.java
@@ -5,32 +5,32 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 
-public class Buttons2 extends AbstractFieldTest<Button> implements
+public class Buttons2<T extends Button> extends AbstractFieldTest<T> implements
         ClickListener {
 
-    private Command<Button, Boolean> switchModeCommand = new Command<Button, Boolean>() {
+    private Command<T, Boolean> switchModeCommand = new Command<T, Boolean>() {
 
         @SuppressWarnings("deprecation")
-        public void execute(Button c, Boolean value, Object data) {
+        public void execute(T c, Boolean value, Object data) {
             c.setSwitchMode(value);
         }
     };
 
-    private Command<Button, Boolean> clickListenerCommand = new Command<Button, Boolean>() {
+    private Command<T, Boolean> clickListenerCommand = new Command<T, Boolean>() {
 
-        public void execute(Button c, Boolean value, Object data) {
+        public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((ClickListener) Buttons2.this);
+                c.addListener((Button.ClickListener) Buttons2.this);
             } else {
-                c.removeListener((ClickListener) Buttons2.this);
+                c.removeListener((Button.ClickListener) Buttons2.this);
             }
 
         }
     };
 
     @Override
-    protected Class<Button> getTestClass() {
-        return Button.class;
+    protected Class<T> getTestClass() {
+        return (Class<T>) Button.class;
     }
 
     @Override
diff --git a/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java b/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
new file mode 100644
index 0000000000..d806790f4d
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
@@ -0,0 +1,12 @@
+package com.vaadin.tests.components.nativebutton;
+
+import com.vaadin.tests.components.button.Buttons2;
+import com.vaadin.ui.NativeButton;
+
+public class NativeButtonTest extends Buttons2<NativeButton> {
+
+    @Override
+    protected Class<NativeButton> getTestClass() {
+        return NativeButton.class;
+    }
+}
diff --git a/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
new file mode 100644
index 0000000000..86d035e925
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
@@ -0,0 +1,20 @@
+package com.vaadin.tests.components.passwordfield;
+
+import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.abstractfield.AbstractTextFieldTest;
+import com.vaadin.ui.PasswordField;
+
+public class PasswordFieldTest extends AbstractTextFieldTest<PasswordField>
+        implements TextChangeListener {
+
+    @Override
+    protected Class<PasswordField> getTestClass() {
+        return PasswordField.class;
+    }
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+    }
+
+}
diff --git a/tests/src/com/vaadin/tests/components/select/SelectTest.java b/tests/src/com/vaadin/tests/components/select/SelectTest.java
new file mode 100644
index 0000000000..3febdd0cec
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/select/SelectTest.java
@@ -0,0 +1,12 @@
+package com.vaadin.tests.components.select;
+
+import com.vaadin.ui.Select;
+
+public class SelectTest extends AbstractSelectTestCase<Select> {
+
+    @Override
+    protected Class<Select> getTestClass() {
+        return Select.class;
+    }
+
+}
diff --git a/tests/src/com/vaadin/tests/components/slider/SliderTest.java b/tests/src/com/vaadin/tests/components/slider/SliderTest.java
new file mode 100644
index 0000000000..9b6d964f44
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/slider/SliderTest.java
@@ -0,0 +1,74 @@
+package com.vaadin.tests.components.slider;
+
+import java.util.LinkedHashMap;
+
+import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.ui.Slider;
+
+public class SliderTest extends AbstractFieldTest<Slider> {
+
+    private Command<Slider, Double> minCommand = new Command<Slider, Double>() {
+        public void execute(Slider c, Double value, Object data) {
+            c.setMin(value);
+        }
+    };
+
+    private Command<Slider, Double> maxCommand = new Command<Slider, Double>() {
+        public void execute(Slider c, Double value, Object data) {
+            c.setMax(value);
+        }
+    };
+
+    private Command<Slider, Integer> orientationCommand = new Command<Slider, Integer>() {
+        public void execute(Slider c, Integer value, Object data) {
+            c.setOrientation(value);
+        }
+    };
+    private Command<Slider, Integer> resolutionCommand = new Command<Slider, Integer>() {
+        public void execute(Slider c, Integer value, Object data) {
+            c.setResolution(value);
+        }
+    };
+
+    @Override
+    protected Class<Slider> getTestClass() {
+        return Slider.class;
+    }
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+
+        createMinSelect(CATEGORY_FEATURES);
+        createMaxSelect(CATEGORY_FEATURES);
+        createResolutionSelect(CATEGORY_FEATURES);
+        createOrientationSelect(CATEGORY_FEATURES);
+    }
+
+    private void createResolutionSelect(String category) {
+        createSelectAction("Resolution", category, createIntegerOptions(10),
+                "1", resolutionCommand);
+
+    }
+
+    private void createOrientationSelect(String category) {
+        LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
+        options.put("Horizontal", Slider.ORIENTATION_HORIZONTAL);
+        options.put("Vertical", Slider.ORIENTATION_VERTICAL);
+        createSelectAction("Resolution", category, options, "Horizontal",
+                orientationCommand);
+
+    }
+
+    private void createMaxSelect(String category) {
+        createSelectAction("Max", category, createDoubleOptions(100), "0",
+                maxCommand);
+    }
+
+    private void createMinSelect(String category) {
+        createSelectAction("Min", category, createDoubleOptions(100), "0",
+                minCommand);
+
+    }
+
+}
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/tests/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
index 89f341b055..0b702db33a 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
+++ b/tests/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
@@ -25,12 +25,19 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel>
             value.apply(c);
         }
     };
+    private Command<T, Boolean> splitterLockCommand = new Command<T, Boolean>() {
+
+        public void execute(T c, Boolean value, Object data) {
+            c.setLocked(value);
+        }
+    };
 
     @Override
     protected void createActions() {
         super.createActions();
         createSetSplitPositionAction(CATEGORY_FEATURES);
         createSplitterClickListenerAction(CATEGORY_LISTENERS);
+        createSplitterLockAction(CATEGORY_FEATURES);
 
         // Default to 100% x 100% as SplitPanel does not work as undefined
         for (T c : getTestComponents()) {
@@ -38,6 +45,12 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel>
         }
     }
 
+    private void createSplitterLockAction(String categoryFeatures) {
+        createBooleanAction("Splitter locked", categoryFeatures, false,
+                splitterLockCommand);
+
+    }
+
     public static class SplitPosition {
 
         private boolean reverse = false;
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java b/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
index 3d238fa5a3..81b753d6e4 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
@@ -38,9 +38,9 @@ public class TextFieldTest extends AbstractTextFieldTest<TextField> implements
     @Override
     protected void createActions() {
         super.createActions();
-        createSecretAction(CATEGORY_STATE);
-        createWordwrapAction(CATEGORY_STATE);
-        createRowsAction(CATEGORY_STATE);
+        createSecretAction(CATEGORY_FEATURES);
+        createWordwrapAction(CATEGORY_FEATURES);
+        createRowsAction(CATEGORY_FEATURES);
     }
 
     private void createRowsAction(String category) {
-- 
2.39.5