#7963 Additional fixes

Removed special case from widget set that used to support VButton
changing into VCheckBox

Corrected tests

4 files changed, 12 insertions, 13 deletions

diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
index 63536baf68..2a5b50f4bb 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
@@ -5,16 +5,17 @@ import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;

 import com.vaadin.data.Property.ValueChangeListener;

 import com.vaadin.tests.server.component.AbstractListenerMethodsTest;

-import com.vaadin.ui.Button;

+import com.vaadin.ui.CheckBox;

 

 public class TestAbstractFieldListeners extends AbstractListenerMethodsTest {

     public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception {

-        testListenerAddGetRemove(Button.class, ReadOnlyStatusChangeEvent.class,

+        testListenerAddGetRemove(CheckBox.class,

+                ReadOnlyStatusChangeEvent.class,

                 ReadOnlyStatusChangeListener.class);

     }

 

     public void testValueChangeListenerAddGetRemove() throws Exception {

-        testListenerAddGetRemove(Button.class, ValueChangeEvent.class,

+        testListenerAddGetRemove(CheckBox.class, ValueChangeEvent.class,

                 ValueChangeListener.class);

     }

 }

diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html b/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
index 850d553b5b..d39f72ef1f 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
@@ -16,7 +16,7 @@
 	<td>/run/com.vaadin.tests.components.button.Buttons2?restartApplication</td>
 	<td></td>
 </tr>
-<!--value change listener-->
+<!--click listener-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_Smenu#item0</td>
@@ -29,7 +29,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>35,8</td>
 </tr>
 <!--disable on click-->
@@ -45,7 +45,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>22,4</td>
 </tr>
 <tr>
@@ -133,7 +133,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>36,3</td>
 </tr>
 <tr>
@@ -151,7 +151,6 @@
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
index 75eab71892..5f80004c7c 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
+++ b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
@@ -16,7 +16,7 @@
 	<td>/run/com.vaadin.tests.components.nativebutton.NativeButtonTest?restartApplication</td>
 	<td></td>
 </tr>
-<!--value change listener-->
+<!--  click listener-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::PID_Smenu#item0</td>
@@ -29,7 +29,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>35,8</td>
 </tr>
 <!--disable on click-->
@@ -45,7 +45,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>22,4</td>
 </tr>
 <tr>
@@ -133,7 +133,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>vaadin=runcomvaadintestscomponentsnativebuttonNativeButtonTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>36,3</td>
 </tr>
 <tr>
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
index 32e810ac7c..d1c4268c40 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
@@ -55,7 +55,6 @@ public class Ticket2151 extends Application {
             ok = true;
         } catch (Exception e1) {
             e1.printStackTrace();
-            return;
         }
 
         if (ok) {