Removed read-only from test as it has no effect on a MenuBar

svn changeset:14785/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/menubar/Menubars.html b/tests/src/com/vaadin/tests/components/menubar/Menubars.html
index be68b4b8e1de14f16555f9c2427dc423243092d9..93d77f9f36aabebbb82eb3995d2d72eaa6edc0a5 100644 (file)
--- a/tests/src/com/vaadin/tests/components/menubar/Menubars.html
+++ b/tests/src/com/vaadin/tests/components/menubar/Menubars.html
@@ -66,15 +66,10 @@
        <td>vaadin=runcomvaadintestscomponentsmenubarMenubars::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
        <td>7,3</td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentsmenubarMenubars::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
-       <td>39,6</td>
-</tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td>error-readonly</td>
+       <td>error</td>
 </tr>
 <tr>
        <td>mouseClick</td>
@@ -86,11 +81,6 @@
        <td>vaadin=runcomvaadintestscomponentsmenubarMenubars::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
        <td>11,4</td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentsmenubarMenubars::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
-       <td>10,6</td>
-</tr>
 <tr>
        <td>screenCapture</td>
        <td></td>

diff --git a/tests/src/com/vaadin/tests/components/menubar/Menubars.java b/tests/src/com/vaadin/tests/components/menubar/Menubars.java
index 590602ea031addfa69b3a08e32774c89597db1a6..ee66425d9499135d2816b3a3e9a300833a0e9555 100644 (file)
--- a/tests/src/com/vaadin/tests/components/menubar/Menubars.java
+++ b/tests/src/com/vaadin/tests/components/menubar/Menubars.java
@@ -81,6 +81,8 @@ public class Menubars extends ComponentTestCase<MenuBar> {
     protected List<Component> createActions() {\r
         ArrayList<Component> actions = new ArrayList<Component>();\r
 \r
+        // Required and read-only makes no sense for MenuBar\r
+\r
         CheckBox errorIndicators = new CheckBox("Error indicators",\r
                 new Button.ClickListener() {\r
                     public void buttonClick(ClickEvent event) {\r
@@ -99,25 +101,13 @@ public class Menubars extends ComponentTestCase<MenuBar> {
             }\r
         });\r
 \r
-        CheckBox readonly = new CheckBox("Readonly",\r
-                new Button.ClickListener() {\r
-                    public void buttonClick(ClickEvent event) {\r
-                        Button b = event.getButton();\r
-                        boolean enabled = (Boolean) b.getValue();\r
-                        setReadOnly(enabled);\r
-                    }\r
-                });\r
-\r
         errorIndicators.setValue(Boolean.FALSE);\r
-        readonly.setValue(Boolean.FALSE);\r
         enabled.setValue(Boolean.TRUE);\r
 \r
         errorIndicators.setImmediate(true);\r
-        readonly.setImmediate(true);\r
         enabled.setImmediate(true);\r
 \r
         actions.add(errorIndicators);\r
-        actions.add(readonly);\r
         actions.add(enabled);\r
 \r
         return actions;\r