Added generics to ComponentTestCase

svn changeset:13342/svn branch:6.3

diff --git a/tests/src/com/vaadin/tests/components/ComponentTestCase.java b/tests/src/com/vaadin/tests/components/ComponentTestCase.java
index 3c6d6cbcb3d827921ed793d2bb261953e11f36f1..9eedb53118aacdc2eece532ad5e026807da35ca5 100644 (file)
--- a/tests/src/com/vaadin/tests/components/ComponentTestCase.java
+++ b/tests/src/com/vaadin/tests/components/ComponentTestCase.java
@@ -10,9 +10,10 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Layout.SpacingHandler;
 
-public abstract class ComponentTestCase extends TestBase {
+public abstract class ComponentTestCase<T extends AbstractComponent> extends
+        TestBase {
 
-    private List<AbstractComponent> testComponents = new ArrayList<AbstractComponent>();
+    private List<T> testComponents = new ArrayList<T>();
 
     @Override
     protected void setup() {
@@ -45,17 +46,17 @@ public abstract class ComponentTestCase extends TestBase {
         return actionLayout;
     }
 
-    protected void addTestComponent(AbstractComponent c) {
+    protected void addTestComponent(T c) {
         testComponents.add(c);
         addComponent(c);
     }
 
-    protected List<AbstractComponent> getTestComponents() {
+    protected List<T> getTestComponents() {
         return testComponents;
     }
 
     protected void setErrorIndicators(boolean on) {
-        for (AbstractComponent c : getTestComponents()) {
+        for (T c : getTestComponents()) {
             if (c == null) {
                 continue;
             }
@@ -72,7 +73,7 @@ public abstract class ComponentTestCase extends TestBase {
 
     protected void setRequired(boolean on) {
 
-        for (AbstractComponent c : getTestComponents()) {
+        for (T c : getTestComponents()) {
             if (c == null) {
                 continue;
             }
@@ -86,7 +87,7 @@ public abstract class ComponentTestCase extends TestBase {
     }
 
     protected void setEnabled(boolean on) {
-        for (AbstractComponent c : getTestComponents()) {
+        for (T c : getTestComponents()) {
             if (c == null) {
                 continue;
             }
@@ -97,7 +98,7 @@ public abstract class ComponentTestCase extends TestBase {
     }
 
     protected void setReadOnly(boolean on) {
-        for (AbstractComponent c : getTestComponents()) {
+        for (T c : getTestComponents()) {
             if (c == null) {
                 continue;
             }

diff --git a/tests/src/com/vaadin/tests/components/button/Buttons.java b/tests/src/com/vaadin/tests/components/button/Buttons.java
index b27d3f8ae9c8deff2c0629d8207aea228b949818..0540a0dcde3bc32a94dc6b1883463ef1b670a659 100644 (file)
--- a/tests/src/com/vaadin/tests/components/button/Buttons.java
+++ b/tests/src/com/vaadin/tests/components/button/Buttons.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.Button.ClickEvent;
 
-public class Buttons extends ComponentTestCase {
+public class Buttons extends ComponentTestCase<Button> {
 
     Button button[] = new Button[20];
 

diff --git a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
index fe18875a47321aa1c7fc2ac81017752db70fa739..f55a252f1083011805554fb5bd438ebd6c3a506a 100644 (file)
--- a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
@@ -6,11 +6,12 @@ import java.util.List;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.Button.ClickEvent;
 
-public class Comboboxes extends ComponentTestCase {
+public class Comboboxes extends ComponentTestCase<ComboBox> {
 
     private static final Object CAPTION = "caption";
     Select label[] = new Select[20];
@@ -19,7 +20,7 @@ public class Comboboxes extends ComponentTestCase {
     protected void setup() {
         super.setup();
 
-        Select s;
+        ComboBox s;
 
         s = createSelect(null);
         s.setWidth(null);
@@ -89,14 +90,14 @@ public class Comboboxes extends ComponentTestCase {
 
     }
 
-    private Select createSelect(String caption) {
-        Select s = new Select();
+    private ComboBox createSelect(String caption) {
+        ComboBox cb = new ComboBox();
+        cb.setImmediate(true);
+        cb.addContainerProperty(CAPTION, String.class, "");
+        cb.setItemCaptionPropertyId(CAPTION);
+        cb.setCaption(caption);
 
-        s.addContainerProperty(CAPTION, String.class, "");
-        s.setItemCaptionPropertyId(CAPTION);
-        s.setCaption(caption);
-
-        return s;
+        return cb;
     }
 
     @Override

diff --git a/tests/src/com/vaadin/tests/components/label/LabelModes.java b/tests/src/com/vaadin/tests/components/label/LabelModes.java
index 16568c5da5ed52cf7ac5c626542d9f8782bffc3a..d7d426ec88927e56bbd4523d070c81a285923f3e 100644 (file)
--- a/tests/src/com/vaadin/tests/components/label/LabelModes.java
+++ b/tests/src/com/vaadin/tests/components/label/LabelModes.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Button.ClickEvent;
 
-public class LabelModes extends ComponentTestCase {
+public class LabelModes extends ComponentTestCase<Label> {
 
     Label label[] = new Label[20];
 

diff --git a/tests/src/com/vaadin/tests/components/label/Labels.java b/tests/src/com/vaadin/tests/components/label/Labels.java
index 39c2aa887505d7f8cfc56cb5346478d09a2f923d..64c61ba13c96fc1a655d19c10ad83983cd0e1ba0 100644 (file)
--- a/tests/src/com/vaadin/tests/components/label/Labels.java
+++ b/tests/src/com/vaadin/tests/components/label/Labels.java
@@ -8,11 +8,10 @@ import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Button.ClickEvent;
 
-public class Labels extends ComponentTestCase {
+public class Labels extends ComponentTestCase<Label> {
 
     Label label[] = new Label[20];
 
@@ -56,17 +55,6 @@ public class Labels extends ComponentTestCase {
 
     }
 
-    private Component createActionLayout() {
-        HorizontalLayout actionLayout = new HorizontalLayout();
-        actionLayout.setSpacing(true);
-        actionLayout.setMargin(true);
-        for (Component c : createActions()) {
-            actionLayout.addComponent(c);
-        }
-        addComponent(actionLayout);
-        return actionLayout;
-    }
-
     private Label createLabel(String text, String caption) {
         Label l = new Label(text);
         l.setCaption(caption);

diff --git a/tests/src/com/vaadin/tests/components/menubar/Menubars.java b/tests/src/com/vaadin/tests/components/menubar/Menubars.java
index 15c353b98a1667586227ed867153faabe0bf5916..04422251349f8cec4fc83053fef84076d48718ad 100644 (file)
--- a/tests/src/com/vaadin/tests/components/menubar/Menubars.java
+++ b/tests/src/com/vaadin/tests/components/menubar/Menubars.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.Button.ClickEvent;\r
 import com.vaadin.ui.MenuBar.MenuItem;\r
 \r
-public class Menubars extends ComponentTestCase {\r
+public class Menubars extends ComponentTestCase<MenuBar> {\r
 \r
     MenuBar menubar[] = new MenuBar[20];\r
 \r

diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFields.java b/tests/src/com/vaadin/tests/components/textfield/TextFields.java
index 9be2c73c41b296e6b2854aef0dfe4844d25609c2..a908dccc1db06309e49c07def8fd0d17145c2b45 100644 (file)
--- a/tests/src/com/vaadin/tests/components/textfield/TextFields.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextFields.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Button.ClickEvent;
 
-public class TextFields extends ComponentTestCase {
+public class TextFields extends ComponentTestCase<TextField> {
 
     @Override
     protected void setup() {

diff --git a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index f4652aec18560801289f03e29d8cb4b4a8dab477..e3645b777c1c3842e49b551066c59f2b62b91922 100644 (file)
--- a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
@@ -11,8 +11,8 @@ import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Upload;\r
 import com.vaadin.ui.Upload.Receiver;\r
 \r
-public class TestImmediateUploadInFormLayout extends ComponentTestCase implements\r
-        Receiver {\r
+public class TestImmediateUploadInFormLayout extends\r
+        ComponentTestCase<FormLayout> implements Receiver {\r
 \r
     @Override\r
     protected String getDescription() {\r

diff --git a/tests/src/com/vaadin/tests/components/upload/TestUpload.java b/tests/src/com/vaadin/tests/components/upload/TestUpload.java
index 5b1590196ba9da3bb725e435f77246bb1bc9391c..b87300462e86570e6a75ed2fa104d2927825fcb6 100644 (file)
--- a/tests/src/com/vaadin/tests/components/upload/TestUpload.java
+++ b/tests/src/com/vaadin/tests/components/upload/TestUpload.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.List;\r
 \r
 import com.vaadin.tests.components.ComponentTestCase;\r
-import com.vaadin.ui.Button;\r
 import com.vaadin.ui.CheckBox;\r
 import com.vaadin.ui.Component;\r
 import com.vaadin.ui.Upload;\r
@@ -15,7 +14,7 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Upload.FinishedEvent;\r
 import com.vaadin.ui.Upload.Receiver;\r
 \r
-public class TestUpload extends ComponentTestCase implements Receiver {\r
+public class TestUpload extends ComponentTestCase<Upload> implements Receiver {\r
 \r
     @Override\r
     protected String getDescription() {\r
@@ -47,8 +46,6 @@ public class TestUpload extends ComponentTestCase implements Receiver {
         u.setWidth("300px");\r
         addTestComponent(u);\r
 \r
-        addTestComponent(new Button("blah"));\r
-\r
     }\r
 \r
     @Override\r
@@ -58,7 +55,7 @@ public class TestUpload extends ComponentTestCase implements Receiver {
         CheckBox enabled = new CheckBox("Enabled", new ClickListener() {\r
 \r
             public void buttonClick(ClickEvent event) {\r
-                for (Component c : getTestComponents()) {\r
+                for (Upload c : getTestComponents()) {\r
                     c.setEnabled(event.getButton().booleanValue());\r
                 }\r
 \r

diff --git a/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
index 1e3abe146df7704b39225ca8066c135da15eecea..c49823e97b9ca491c7ad4906feb38f6ffd641532 100644 (file)
--- a/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
+++ b/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
@@ -16,8 +16,8 @@ import com.vaadin.ui.Upload.FinishedEvent;
 import com.vaadin.ui.Upload.Receiver;\r
 import com.vaadin.ui.Upload.StartedEvent;\r
 \r
-public class TestUploadAndDisableOnSuccess extends ComponentTestCase implements\r
-        Receiver {\r
+public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload>\r
+        implements Receiver {\r
     @Override\r
     protected String getDescription() {\r
         return "If upload is detached and attached during upload, the client side componenent never receives information that the upload has finished. Second update will not be successful.";\r
@@ -78,7 +78,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase implements
         List<Component> actions = new ArrayList<Component>();\r
         Button enabled = new Button("Toggle Enabled", new ClickListener() {\r
             public void buttonClick(ClickEvent event) {\r
-                for (Component c : getTestComponents()) {\r
+                for (Upload c : getTestComponents()) {\r
                     c.setEnabled(!c.isEnabled());\r
                 }\r
             }\r