From d10b1c6f226ef761ea4a77e517c093b5ea7084eb Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Wed, 21 Dec 2011 16:37:45 +0000
Subject: [PATCH] Test for #8170

svn changeset:22465/svn branch:6.7
---
 .../AttachShouldBeCalledForSubWindows.java    | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index a6040c06d3..593491f1e9 100644
--- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
@@ -10,7 +10,6 @@ import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
 
@@ -31,16 +30,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase
                 log(this);
                 super.attach();
             }
-
-            @Override
-            public void addWindow(Window w) {
-                log.log("Adding sub window");
-                super.addWindow(w);
-                log.log("Sub window added");
-
-            }
         };
-        mainWindow.setCaption("Main window");
         mainWindow.addComponent(log);
         mainWindow.getContent().setSizeFull();
         Label label = new Label("This is the main app") {
@@ -55,14 +45,15 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase
         Window loginWindow = createSubWindow();
         if (addSubWindowBeforeMainWindow) {
             mainWindow.addWindow(loginWindow);
+            log.log("Sub window added to application");
         }
 
-        log.log("Setting main window");
         setMainWindow(mainWindow); // At this point
         log.log("Main window set");
 
         if (!addSubWindowBeforeMainWindow) {
             mainWindow.addWindow(loginWindow);
+            log.log("Sub window added to application");
         }
     }
 
@@ -94,13 +85,12 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase
         return w;
     }
 
-    public void log(Component c) {
-        Class<?> cls = c.getClass();
+    public void log(Object o) {
+        Class cls = o.getClass();
         if (cls.isAnonymousClass()) {
             cls = cls.getSuperclass();
         }
-        log.log(cls.getName() + " '" + c.getCaption()
-                + "' attached to application");
+        log.log(cls.getName() + " attached to application");
     }
 
     @Override
-- 
2.39.5