sb118: improved tests (no getActiveTopWindow etc.)

7 files changed, 22 insertions, 119 deletions

diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
index e0ad77dfa753..3bc7e81885c3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.PosSize;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlContainer;
 import com.sun.star.awt.XControlModel;
-import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XFixedText;
 import com.sun.star.awt.XWindow;
 import com.sun.star.lang.XMultiServiceFactory;
@@ -150,17 +149,11 @@ public class AccessibleFixedText extends TestCase {
             throw new StatusException("Couldn't get toolkit", e);
         }
 
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                      XExtendedToolkit.class, oObj);
-
         shortWait();
 
         AccessibilityTools at = new AccessibilityTools();
 
-        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class,
-                                                              tk.getActiveTopWindow());
-
-        XAccessible xRoot = at.getAccessibleObject(xWindow);
+        XAccessible xRoot = at.getAccessibleObject(xWinDlg);
 
         at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
index d309f8cd969d..4eaec80dcd81 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
@@ -31,8 +31,8 @@ import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.accessibility.XAccessibleText;
-import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
@@ -102,23 +102,10 @@ public class AccessibleMenu extends TestCase {
             throw new StatusException("Can't create document", e);
         }
 
-        XInterface oObj = null;
-
-        try {
-            oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit");
-        } catch (com.sun.star.uno.Exception e) {
-            log.println("Couldn't get toolkit");
-            e.printStackTrace(log);
-            throw new StatusException("Couldn't get toolkit", e);
-        }
-
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                      XExtendedToolkit.class, oObj);
-
         shortWait();
 
-        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class,
-                                                              tk.getActiveTopWindow());
+        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
+            getCurrentController().getFrame().getContainerWindow();
 
         AccessibilityTools at = new AccessibilityTools();
 
@@ -127,6 +114,7 @@ public class AccessibleMenu extends TestCase {
         at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
         XAccessibleContext menubar = at.getAccessibleObjectForRole(xRoot,
                                                                    AccessibleRole.MENU_BAR);
+        XInterface oObj = null;
         Object menu2 = null;
 
         try {
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
index 86929c463167..2441bdaa7075 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
@@ -30,8 +30,8 @@ import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.accessibility.XAccessibleComponent;
-import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
@@ -83,34 +83,18 @@ public class AccessibleMenuBar extends TestCase {
      */
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
-        XInterface oObj = null;
-
-        try {
-            oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance(
-                           "com.sun.star.awt.Toolkit");
-        } catch (com.sun.star.uno.Exception e) {
-            log.println("Couldn't get toolkit");
-            e.printStackTrace(log);
-            throw new StatusException("Couldn't get toolkit", e);
-        }
-
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                      XExtendedToolkit.class, oObj);
-
         shortWait();
 
         AccessibilityTools at = new AccessibilityTools();
 
-        Object atw = tk.getActiveTopWindow();
-
-        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class,
-                                                              atw);
+        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
+            getCurrentController().getFrame().getContainerWindow();
 
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
 
         at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
-        oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR);
+        XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR);
 
         log.println("ImplementationName " + utils.getImplName(oObj));
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
index 4c68b532b4b2..f05bcb025803 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
@@ -32,6 +32,7 @@ import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
@@ -82,27 +83,12 @@ public class AccessibleMenuSeparator extends TestCase {
      */
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
-        XInterface oObj = null;
-
-        try {
-            oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit");
-        } catch (com.sun.star.uno.Exception e) {
-            log.println("Couldn't get toolkit");
-            e.printStackTrace(log);
-            throw new StatusException("Couldn't get toolkit", e);
-        }
-
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                      XExtendedToolkit.class, oObj);
-
         shortWait();
 
         AccessibilityTools at = new AccessibilityTools();
 
-        Object atw = tk.getActiveTopWindow();
-
-        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class,
-                                                              atw);
+        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
+            getCurrentController().getFrame().getContainerWindow();
 
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
@@ -110,6 +96,7 @@ public class AccessibleMenuSeparator extends TestCase {
         XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot,
                                                                    AccessibleRole.MENU_BAR);
         XAccessibleAction act = null;
+        XInterface oObj = null;
 
         try {
             //activate Edit-Menu
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
index 432493d9d134..32dd630370a3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
@@ -32,7 +32,6 @@ import com.sun.star.awt.PosSize;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
-import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
@@ -84,19 +83,9 @@ import util.SOfficeFactory;
  * @see ifc.accessibility.XAccessibleAction
  */
 public class AccessibleStatusBar extends TestCase {
-    private static XDesktop the_Desk;
     private static XTextDocument xTextDoc;
 
     /**
-     * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
-     */
-    protected void initialize(TestParameters Param, PrintWriter log) {
-        the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class,
-                                                        DesktopTools.createDesktop(
-                                                                (XMultiServiceFactory) Param.getMSF()));
-    }
-
-    /**
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
@@ -155,16 +144,13 @@ public class AccessibleStatusBar extends TestCase {
             throw new StatusException("Couldn't create document", e);
         }
 
-        XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class,
-                                                           xTextDoc);
-
         XInterface oObj = null;
 
         AccessibilityTools at = new AccessibilityTools();
 
-        XWindow xWindow = at.getCurrentContainerWindow(
-                                  (XMultiServiceFactory) tParam.getMSF(),
-                                  aModel);
+        final XWindow xWindow =
+            UnoRuntime.queryInterface(XModel.class, xTextDoc).
+            getCurrentController().getFrame().getContainerWindow();
 
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
@@ -180,15 +166,14 @@ public class AccessibleStatusBar extends TestCase {
         tEnv.addObjRelation("EventProducer",
                             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
             public void fireEvent() {
-                XWindow xWin = (XWindow) UnoRuntime.queryInterface(
-                                       XWindow.class, tk.getActiveTopWindow());
-                Rectangle newPosSize = xWin.getPosSize();
+                Rectangle newPosSize = xWindow.getPosSize();
                 newPosSize.Width = newPosSize.Width - 20;
                 newPosSize.Height = newPosSize.Height - 20;
                 newPosSize.X = newPosSize.X + 20;
                 newPosSize.Y = newPosSize.Y + 20;
-                xWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width,
-                                newPosSize.Height, PosSize.POSSIZE);
+                xWindow.setPosSize(
+                    newPosSize.X, newPosSize.Y, newPosSize.Width,
+                    newPosSize.Height, PosSize.POSSIZE);
             }
         });
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
index 381ef7571b9f..c02017508695 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
@@ -47,8 +47,6 @@ import lib.TestParameters;
 import util.AccessibilityTools;
 import util.DesktopTools;
 import util.SOfficeFactory;
-import util.UITools;
-
 
 /**
  * Test for object that implements the following interfaces :
@@ -141,20 +139,10 @@ public class AccessibleToolBox extends TestCase {
             throw new StatusException("Couldn't create document", e);
         }
 
-        XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class,
-                xTextDoc);
-
         XInterface oObj = null;
 
-        UITools oUI = new UITools(msf, aModel);
-
-        XWindow xWindow = null;
-        try {
-            xWindow = oUI.getActiveTopWindow();
-        } catch (Exception ex) {
-            ex.printStackTrace(log);
-            throw new StatusException("Couldn't get active top window", ex);
-        }
+        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
+            getCurrentController().getFrame().getContainerWindow();
 
         AccessibilityTools at = new AccessibilityTools();
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
index 8b6aacee0734..5be41be69f27 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
@@ -220,8 +220,6 @@ public class UnoTreeControl extends TestCase {
         });
         System.out.println("ImplementationName: " + utils.getImplName(oObj));
 
-        //this.getAccessibleContext(xNode);
-
         return tEnv;
     } // finish method getTestEnvironment
 
@@ -289,26 +287,6 @@ public class UnoTreeControl extends TestCase {
         }
     }
 
-    private XAccessibleContext getAccessibleContext(XMutableTreeNode xNode ){
-
-        UITools oDocUITools = new UITools(this.mxMSF, this.xTextDoc);
-
-        XWindow xDialogWindow = null;
-        try {
-
-            xDialogWindow = oDocUITools.getActiveTopWindow();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        UITools oDialog = new UITools(mxMSF, xDialogWindow);
-
-        oDialog.printAccessibleTree(log, debug);
-
-        return null;
-
-    }
-
     private class execurteDialog extends Thread{
         private XDialog mXDialog;