Also click the button to ensure no extra layout click events are sent

svn changeset:18091/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html
index 57092595f35c8fb31839c16f745bfd16e6a9f1b3..4a41374e41a7f94c20c4f73289ec8453e0eb475d 100644 (file)
--- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html
+++ b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html
@@ -51,6 +51,27 @@
        <td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>\r
        <td>4. Click using left on Sub window</td>\r
 </tr>\r
+<!--Clicking on the button should not produce a window click event-->\r
+<tr>\r
+       <td>click</td>\r
+       <td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>\r
+       <td></td>\r
+</tr>\r
+<tr>\r
+       <td>assertText</td>\r
+       <td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_0</td>\r
+       <td>5. Click on button</td>\r
+</tr>\r
+<tr>\r
+       <td>assertText</td>\r
+       <td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_2</td>\r
+       <td>3. Click using left on Sub window layout</td>\r
+</tr>\r
+<tr>\r
+       <td>assertText</td>\r
+       <td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_1</td>\r
+       <td>4. Click using left on Sub window</td>\r
+</tr>\r
 </tbody></table>\r
 </body>\r
 </html>\r

diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
index 4748111fd678f06848f05275af559dc878435948..041ccaaf30922993a5b2e1a8583f7f1d7b24dbfe 100644 (file)
--- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
+++ b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
@@ -56,7 +56,15 @@ public class WindowClickEvents extends TestBase {
 
         Label l = new Label("This window is centered");
         l.setSizeUndefined();
-        Button b = new Button("Clicking here should not produce an event");
+        Button b = new Button(
+                "Clicking here should not produce a layout click event");
+        b.addListener(new Button.ClickListener() {
+
+            public void buttonClick(com.vaadin.ui.Button.ClickEvent event) {
+                log.log("Click on button");
+            }
+
+        });
         centered.addComponent(l);
         centered.addComponent(b);