#8097 Root does not send resize events

3 files changed, 23 insertions, 22 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
index d382491ae1..f56769cde4 100644
--- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
@@ -8,6 +8,8 @@ import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Root;
+import com.vaadin.ui.Root.BrowserWindowResizeEvent;
+import com.vaadin.ui.Root.BrowserWindowResizeListener;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
@@ -23,13 +25,13 @@ public class LazyWindowResize extends AbstractTestCase {
     protected ResizeListener resizeListener = new ResizeListener() {
 
         public void windowResized(ResizeEvent e) {
-            throw new RuntimeException("Out of order...");
-            // if (e.getWindow() == mainWindow) {
-            // log.log("Main window resized");
-            // } else {
-            // log.log("Sub window resized");
-            // }
+            log.log("Sub window resized");
+        }
+    };
 
+    protected BrowserWindowResizeListener browserWindowResizeListener = new BrowserWindowResizeListener() {
+        public void browserWindowResized(BrowserWindowResizeEvent event) {
+            log.log("Main window resized");
         }
     };
     private CheckBox immediateCheckBox;;;
@@ -71,10 +73,10 @@ public class LazyWindowResize extends AbstractTestCase {
             public void valueChange(ValueChangeEvent event) {
                 if (resizeListenerCheckBox.getValue()) {
                     subWindow.addListener(resizeListener);
-                    mainWindow.addListener(resizeListener);
+                    mainWindow.addListener(browserWindowResizeListener);
                 } else {
                     subWindow.removeListener(resizeListener);
-                    mainWindow.removeListener(resizeListener);
+                    mainWindow.removeListener(browserWindowResizeListener);
                 }
 
             }
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
index a225028726..9526fd7aec 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
@@ -8,9 +8,9 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.Root;
+import com.vaadin.ui.Root.BrowserWindowResizeEvent;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.Window.ResizeEvent;
-import com.vaadin.ui.Window.ResizeListener;
 
 public class WindowResizeListener extends TestBase {
 
@@ -34,11 +34,11 @@ public class WindowResizeListener extends TestBase {
         final Label l = new Label();
         getLayout().addComponent(l);
 
-        getMainWindow().addListener(new ResizeListener() {
-            public void windowResized(ResizeEvent e) {
-                l.setValue("Current main window size: "
-                        + getMainWindow().getWidth() + " x "
-                        + getMainWindow().getHeight());
+        getMainWindow().addListener(new Root.BrowserWindowResizeListener() {
+            public void browserWindowResized(BrowserWindowResizeEvent event) {
+                l.setValue("Current browser window size: "
+                        + getMainWindow().getBrowserWindowWidth() + " x "
+                        + getMainWindow().getBrowserWindowHeight());
             }
         });
 
diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
index 90e9d69300..eb26faacc0 100644
--- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
@@ -6,8 +6,7 @@ import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Root;
-import com.vaadin.ui.Window;
-import com.vaadin.ui.Window.ResizeEvent;
+import com.vaadin.ui.Root.BrowserWindowResizeEvent;
 
 public class EmbedSizeTest extends TestBase {
 
@@ -35,11 +34,11 @@ public class EmbedSizeTest extends TestBase {
         addComponent(lazyCheckBox);
 
         addComponent(log);
-        mainWindow.addListener(new Window.ResizeListener() {
-            public void windowResized(ResizeEvent e) {
-                Window window = e.getWindow();
-                log.log("Resize event: " + window.getWidth() + " x "
-                        + window.getHeight());
+        mainWindow.addListener(new Root.BrowserWindowResizeListener() {
+            public void browserWindowResized(BrowserWindowResizeEvent event) {
+                log.log("Resize event: " + event.getWidth() + " x "
+                        + event.getHeight());
+
             }
         });
     }