Support Button styles (reindeer)

svn changeset:16595/svn branch:6.5

2 files changed, 17 insertions, 0 deletions

diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java b/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
index 4de31c3c36..f58abf44f1 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
@@ -187,11 +187,17 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
                 "background-lightblue");

         options.put("1px red border (border-red-1px)", "border-red-1px");

         options.put("2px blue border (border-blue-2px)", "border-blue-2px");

+        createComponentStyleNames(options);

         createSelectAction("Style name", category, options, "-",

                 styleNameCommand);

 

     }

 

+    protected void createComponentStyleNames(

+            LinkedHashMap<String, String> options) {

+

+    }

+

     private void createErrorMessageSelect(String category) {

         LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();

         options.put("-", null);

diff --git a/tests/src/com/vaadin/tests/components/button/Buttons2.java b/tests/src/com/vaadin/tests/components/button/Buttons2.java
index 7df2de54c7..491e19919c 100644
--- a/tests/src/com/vaadin/tests/components/button/Buttons2.java
+++ b/tests/src/com/vaadin/tests/components/button/Buttons2.java
@@ -1,9 +1,12 @@
 package com.vaadin.tests.components.button;

 

+import java.util.LinkedHashMap;

+

 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;

 import com.vaadin.ui.Button;

 import com.vaadin.ui.Button.ClickEvent;

 import com.vaadin.ui.Button.ClickListener;

+import com.vaadin.ui.themes.Reindeer;

 

 public class Buttons2<T extends Button> extends AbstractFieldTest<T> implements

         ClickListener {

@@ -42,6 +45,14 @@ public class Buttons2<T extends Button> extends AbstractFieldTest<T> implements
         addClickListener(CATEGORY_LISTENERS);

     }

 

+    @Override

+    protected void createComponentStyleNames(

+            LinkedHashMap<String, String> options) {

+        options.put("Reindeer default", Reindeer.BUTTON_DEFAULT);

+        options.put("Reindeer small", Reindeer.BUTTON_SMALL);

+        options.put("Reindeer link", Reindeer.BUTTON_LINK);

+    }

+

     private void addClickListener(String category) {

         createBooleanAction("Click listener", category, false,

                 clickListenerCommand);