sb123:#i111449# cleanups in framework for qa/complex tests

4 files changed, 311 insertions, 238 deletions

diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index 518ec277ae53..ce08c8bed6da 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -24,110 +24,119 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 package complex.dispatches;
 
-import com.sun.star.frame.*;
-import com.sun.star.lang.*;
-import com.sun.star.util.*;
-import com.sun.star.beans.*;
-import com.sun.star.uno.*;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.DispatchInformation;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XDispatchInformationProvider;
+import com.sun.star.frame.XDispatchProviderInterception;
+import com.sun.star.frame.XDispatchProviderInterceptor;
+import com.sun.star.frame.XFrame;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XCloseable;
+import complex.dispatches.helper.Interceptor;
+import java.util.HashMap;
+
+
 
-import java.util.*;
 
-import complexlib.ComplexTestCase;
 
-import helper.*;
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 //-----------------------------------------------
 /** @short  Check the interface XDispatchInformationProvider
 
-    @descr  Because there exists more then one implementation of a dispatch
-            object, we have to test all these implementations ...
+@descr  Because there exists more then one implementation of a dispatch
+object, we have to test all these implementations ...
  */
-public class checkdispatchapi extends ComplexTestCase
+public class checkdispatchapi
 {
     //-------------------------------------------
     // some const
 
     //-------------------------------------------
     // member
-
     /** points to the global uno service manager. */
     private XMultiServiceFactory m_xMSF = null;
     private connectivity.tools.HsqlDatabase db;
-
     /** can be used to create new test frames. */
     private XFrame m_xDesktop = null;
-
     /** provides XDispatchInformationProvider interface. */
     private XFrame m_xFrame = null;
 
     //-------------------------------------------
     // test environment
-
     //-------------------------------------------
     /** @short  A function to tell the framework,
-                which test functions are available.
+    which test functions are available.
 
-        @return All test methods.
-        @todo   Think about selection of tests from outside ...
+    @return All test methods.
+    @todo   Think about selection of tests from outside ...
      */
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-        {
-            "checkDispatchInfoOfWriter",
-            "checkDispatchInfoOfCalc",
-            "checkDispatchInfoOfDraw",
-            "checkDispatchInfoOfImpress",
-            "checkDispatchInfoOfMath",
-            "checkDispatchInfoOfChart",
-            "checkDispatchInfoOfBibliography",
-            "checkDispatchInfoOfQueryDesign",
-            "checkDispatchInfoOfTableDesign",
-            "checkDispatchInfoOfFormGridView",
-            "checkDispatchInfoOfDataSourceBrowser",
-            "checkDispatchInfoOfRelationDesign",
-            "checkDispatchInfoOfBasic",
-            "checkDispatchInfoOfStartModule",
-            "checkInterceptorLifeTime",
-            "checkInterception"
-        };
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//                {
+//                    "checkDispatchInfoOfWriter",
+//                    "checkDispatchInfoOfCalc",
+//                    "checkDispatchInfoOfDraw",
+//                    "checkDispatchInfoOfImpress",
+//                    "checkDispatchInfoOfMath",
+//                    "checkDispatchInfoOfChart",
+//                    "checkDispatchInfoOfBibliography",
+//                    "checkDispatchInfoOfQueryDesign",
+//                    "checkDispatchInfoOfTableDesign",
+//                    "checkDispatchInfoOfFormGridView",
+//                    "checkDispatchInfoOfDataSourceBrowser",
+//                    "checkDispatchInfoOfRelationDesign",
+//                    "checkDispatchInfoOfBasic",
+//                    "checkDispatchInfoOfStartModule",
+//                    "checkInterceptorLifeTime",
+//                    "checkInterception"
+//                };
+//    }
 
     //-------------------------------------------
     /** @short  Create the environment for following tests.
 
-        @descr  create an empty test frame, where we can load
-                different components inside.
+    @descr  create an empty test frame, where we can load
+    different components inside.
      */
-    public void before()
+    @Before public void before()
     {
         try
         {
             // get uno service manager from global test environment
-            m_xMSF = (XMultiServiceFactory)param.getMSF();
+            m_xMSF = getMSF();
 
             db = new connectivity.tools.HsqlDatabase(m_xMSF);
 
             // create desktop
-            m_xDesktop = (XFrame)UnoRuntime.queryInterface(
-                                XFrame.class,
-                                m_xMSF.createInstance("com.sun.star.frame.Desktop"));
+            m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
 
             m_xFrame = impl_createNewFrame();
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
-            failed("Cant initialize test environment.");
+            fail("Cant initialize test environment.");
         }
     }
 
     //-------------------------------------------
     /** @short  close the environment.
      */
-    public void after()
+    @After public void after()
     {
         db.close();
         impl_closeFrame(m_xFrame);
@@ -135,109 +144,115 @@ public class checkdispatchapi extends ComplexTestCase
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfWriter()
+    @Test public void checkDispatchInfoOfWriter()
     {
         impl_checkDispatchInfoOfXXX("private:factory/swriter");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfCalc()
+    @Test public void checkDispatchInfoOfCalc()
     {
         impl_checkDispatchInfoOfXXX("private:factory/scalc");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfDraw()
+    @Test public void checkDispatchInfoOfDraw()
     {
         impl_checkDispatchInfoOfXXX("private:factory/sdraw");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfImpress()
+    @Test public void checkDispatchInfoOfImpress()
     {
         impl_checkDispatchInfoOfXXX("private:factory/simpress");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfChart()
+    @Test public void checkDispatchInfoOfChart()
     {
         impl_checkDispatchInfoOfXXX("private:factory/schart");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfMath()
+    @Test public void checkDispatchInfoOfMath()
     {
         impl_checkDispatchInfoOfXXX("private:factory/smath");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfDataBase()
+    @Test public void checkDispatchInfoOfDataBase()
     {
         impl_checkDispatchInfoOfXXX("private:factory/sdatabase");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfBibliography()
+    @Test public void checkDispatchInfoOfBibliography()
     {
         impl_checkDispatchInfoOfXXX(".component:Bibliography/View1");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfQueryDesign()
+    @Test public void checkDispatchInfoOfQueryDesign()
     {
         callDatabaseDispatch(".component:DB/QueryDesign");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfTableDesign()
+    @Test public void checkDispatchInfoOfTableDesign()
     {
         callDatabaseDispatch(".component:DB/TableDesign");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfFormGridView()
+    @Test public void checkDispatchInfoOfFormGridView()
     {
         impl_checkDispatchInfoOfXXX(".component:DB/FormGridView");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfDataSourceBrowser()
+    @Test public void checkDispatchInfoOfDataSourceBrowser()
     {
         impl_checkDispatchInfoOfXXX(".component:DB/DataSourceBrowser");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfRelationDesign()
+    @Test public void checkDispatchInfoOfRelationDesign()
     {
         callDatabaseDispatch(".component:DB/RelationDesign");
     }
     //-------------------------------------------
+
     private void callDatabaseDispatch(String url)
     {
         try
         {
             final PropertyValue args = new PropertyValue();
             args.Name = "ActiveConnection";
-            args.Value = (Object)db.defaultConnection();
+            args.Value = (Object) db.defaultConnection();
 
             XFrame xFrame = impl_createNewFrame();
 
-            impl_loadIntoFrame(xFrame, url, new PropertyValue[] { args });
+            impl_loadIntoFrame(xFrame, url, new PropertyValue[]
+                    {
+                        args
+                    });
             impl_checkDispatchInfo(xFrame);
             impl_closeFrame(xFrame);
-         } catch(java.lang.Exception e ) {
-         }
+        }
+        catch (java.lang.Exception e)
+        {
+        }
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfBasic()
+    @Test public void checkDispatchInfoOfBasic()
     {
         Object aComponent = impl_createUNOComponent("com.sun.star.script.BasicIDE");
         impl_checkDispatchInfo(aComponent);
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfStartModule()
+    @Test public void checkDispatchInfoOfStartModule()
     {
         Object aComponent = impl_createUNOComponent("com.sun.star.frame.StartModule");
         impl_checkDispatchInfo(aComponent);
@@ -250,60 +265,56 @@ public class checkdispatchapi extends ComplexTestCase
         // xInterceptor. Otherwhise we cant check some internal states of aInterceptor at the end of this method, because
         // it was already killed .-)
 
-        Interceptor aInterceptor = new Interceptor(log);
-        com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterceptor.class,
-                                                                                aInterceptor);
+        Interceptor aInterceptor = new Interceptor();
+        XDispatchProviderInterceptor xInterceptor = UnoRuntime.queryInterface(XDispatchProviderInterceptor.class, aInterceptor);
 
-        com.sun.star.frame.XFrame xFrame = impl_createNewFrame();
-        com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterception.class,
-                                                                                xFrame);
+        XFrame xFrame = impl_createNewFrame();
+        XDispatchProviderInterception xInterception = UnoRuntime.queryInterface(XDispatchProviderInterception.class, xFrame);
 
         xInterception.registerDispatchProviderInterceptor(xInterceptor);
         impl_closeFrame(xFrame);
 
-        int     nRegCount     = aInterceptor.getRegistrationCount();
+        int nRegCount = aInterceptor.getRegistrationCount();
         boolean bIsRegistered = aInterceptor.isRegistered();
 
-        log.println("registration count = "+nRegCount    );
-        log.println("is registered ?    = "+bIsRegistered);
+        System.out.println("registration count = " + nRegCount);
+        System.out.println("is registered ?    = " + bIsRegistered);
 
         if (nRegCount < 1)
-            failed("Interceptor was never registered.");
+        {
+            fail("Interceptor was never registered.");
+        }
 
         if (bIsRegistered)
-            failed("Interceptor was not deregistered automaticly on closing the corresponding frame.");
+        {
+            fail("Interceptor was not deregistered automaticly on closing the corresponding frame.");
+        }
 
-        log.println("Destruction of interception chain works as designed .-)");
+        System.out.println("Destruction of interception chain works as designed .-)");
     }
 
     //-------------------------------------------
     public void checkInterception()
     {
-        String [] lDisabledURLs    = new String [1];
-                  lDisabledURLs[0] = ".uno:Open";
+        String[] lDisabledURLs = new String[1];
+        lDisabledURLs[0] = ".uno:Open";
 
-        log.println("create and initialize interceptor ...");
-        Interceptor aInterceptor = new Interceptor(log);
+        System.out.println("create and initialize interceptor ...");
+        Interceptor aInterceptor = new Interceptor();
         aInterceptor.setURLs4URLs4Blocking(lDisabledURLs);
 
-        com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterceptor.class,
-                                                                                aInterceptor);
+        XDispatchProviderInterceptor xInterceptor = UnoRuntime.queryInterface(XDispatchProviderInterceptor.class, aInterceptor);
 
-        log.println("create and initialize frame ...");
-        com.sun.star.frame.XFrame xFrame = impl_createNewFrame();
+        System.out.println("create and initialize frame ...");
+        XFrame xFrame = impl_createNewFrame();
         impl_loadIntoFrame(xFrame, "private:factory/swriter", null);
 
-        com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterception.class,
-                                                                                xFrame);
+        XDispatchProviderInterception xInterception = UnoRuntime.queryInterface(XDispatchProviderInterception.class, xFrame);
 
-        log.println("register interceptor ...");
+        System.out.println("register interceptor ...");
         xInterception.registerDispatchProviderInterceptor(xInterceptor);
 
-        log.println("deregister interceptor ...");
+        System.out.println("deregister interceptor ...");
         xInterception.releaseDispatchProviderInterceptor(xInterceptor);
     }
 
@@ -311,7 +322,7 @@ public class checkdispatchapi extends ComplexTestCase
     private void impl_checkDispatchInfoOfXXX(String sXXX)
     {
         XFrame xFrame = impl_createNewFrame();
-        impl_loadIntoFrame(xFrame, sXXX,null);
+        impl_loadIntoFrame(xFrame, sXXX, null);
         impl_checkDispatchInfo(xFrame);
         impl_closeFrame(xFrame);
     }
@@ -319,26 +330,28 @@ public class checkdispatchapi extends ComplexTestCase
     //-------------------------------------------
     /** @short  load an URL into the current test frame.
      */
-    private void impl_loadIntoFrame(XFrame xFrame, String sURL,PropertyValue args[])
+    private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[])
     {
-        XComponentLoader xLoader = (XComponentLoader)UnoRuntime.queryInterface(
-                                        XComponentLoader.class,
-                                        xFrame);
+        XComponentLoader xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame);
         if (xLoader == null)
-            failed("Frame does not provide required interface XComponentLoader.");
+        {
+            fail("Frame does not provide required interface XComponentLoader.");
+        }
 
         XComponent xDoc = null;
         try
         {
             xDoc = xLoader.loadComponentFromURL(sURL, "_self", 0, args);
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
             xDoc = null;
         }
 
         if (xDoc == null)
-            failed("Could not load \""+sURL+"\".");
+        {
+            fail("Could not load \"" + sURL + "\".");
+        }
     }
 
     //-------------------------------------------
@@ -351,112 +364,135 @@ public class checkdispatchapi extends ComplexTestCase
         {
             aComponent = m_xMSF.createInstance(sName);
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
             aComponent = null;
         }
 
         if (aComponent == null)
-            failed("Could not create UNO component \""+sName+"\".");
+        {
+            fail("Could not create UNO component \"" + sName + "\".");
+        }
         return aComponent;
     }
 
     //-------------------------------------------
     /** @short  check the interface XDispatchInformationProvider
-                at the specified component.
+    at the specified component.
      */
     private void impl_checkDispatchInfo(Object aComponent)
     {
-        XDispatchInformationProvider xInfoProvider = (XDispatchInformationProvider)UnoRuntime.queryInterface(
-                                                        XDispatchInformationProvider.class,
-                                                        aComponent);
+        XDispatchInformationProvider xInfoProvider = UnoRuntime.queryInterface(XDispatchInformationProvider.class, aComponent);
         if (xInfoProvider == null)
         {
             // Warning
-            log.println("Warning:\tComponent does not provide the [optional!] interface XDispatchInformationProvider.");
+            System.out.println("Warning:\tComponent does not provide the [optional!] interface XDispatchInformationProvider.");
             return;
         }
 
         try
         {
             short[] lGroups = xInfoProvider.getSupportedCommandGroups();
-            int     c1      = lGroups.length;
-            int     i1      = 0;
-            for (i1=0; i1<c1; ++i1)
+            int c1 = lGroups.length;
+            int i1 = 0;
+            for (i1 = 0; i1 < c1; ++i1)
             {
-                short                 nGroup = lGroups[i1];
+                short nGroup = lGroups[i1];
                 DispatchInformation[] lInfos = xInfoProvider.getConfigurableDispatchInformation(nGroup);
-                int                   c2     = lInfos.length;
-                int                   i2     = 0;
+                int c2 = lInfos.length;
+                int i2 = 0;
 
                 // check for empty lists
                 // Warning
                 if (lInfos.length < 1)
-                    log.println("Warning:\tCould not get any DispatchInformation for group ["+nGroup+"].");
+                {
+                    System.out.println("Warning:\tCould not get any DispatchInformation for group [" + nGroup + "].");
+                }
 
                 // check for duplicates (and by the way, if the info item match the requested group)
                 HashMap aCheckMap = new HashMap(c2);
-                for (i2=0; i2<c2; ++i2)
+                for (i2 = 0; i2 < c2; ++i2)
                 {
                     DispatchInformation aInfo = lInfos[i2];
                     if (aInfo.GroupId != nGroup)
                     {
                         // Error
-                        failed("At least one DispatchInformation item does not match the requested group.\n\trequested group=["+nGroup+
-                               "] returned groupd=["+aInfo.GroupId+"] command=\""+aInfo.Command+"\"", true); // true => dont break this test
+                        fail("At least one DispatchInformation item does not match the requested group.\n\trequested group=[" + nGroup
+                                + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
                         continue;
                     }
 
                     if (aCheckMap.containsKey(aInfo.Command))
                     {
                         // Error
-                        failed("Found a duplicate item: group=["+aInfo.GroupId+"] command=\""+aInfo.Command+"\"", true); // true => dont break this test
+                        fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
                         continue;
                     }
 
                     aCheckMap.put(aInfo.Command, aInfo.Command);
-                    log.println("\t["+aInfo.GroupId+"] \""+aInfo.Command+"\"");
+                    System.out.println("\t[" + aInfo.GroupId + "] \"" + aInfo.Command + "\"");
                 }
             }
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
-            failed("Exception caught during using XDispatchInformationProvider.");
-            ex.printStackTrace();
+            fail("Exception caught during using XDispatchInformationProvider.");
+            // ex.printStackTrace();
         }
     }
 
     //-------------------------------------------
-    private synchronized com.sun.star.frame.XFrame impl_createNewFrame()
+    private synchronized XFrame impl_createNewFrame()
     {
-        com.sun.star.frame.XFrame xFrame = null;
+        XFrame xFrame = null;
 
         try
         {
             xFrame = m_xDesktop.findFrame("_blank", 0);
             xFrame.getContainerWindow().setVisible(true);
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
-            failed("Could not create the frame instance.");
+            fail("Could not create the frame instance.");
         }
 
         return xFrame;
-   }
+    }
 
     //-------------------------------------------
-    private synchronized void impl_closeFrame(com.sun.star.frame.XFrame xFrame)
+    private synchronized void impl_closeFrame(XFrame xFrame)
     {
-        com.sun.star.util.XCloseable xClose = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface(
-                                                    com.sun.star.util.XCloseable.class,
-                                                    xFrame);
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame);
         try
         {
             xClose.close(false);
         }
-        catch(com.sun.star.util.CloseVetoException exVeto)
+        catch (com.sun.star.util.CloseVetoException exVeto)
         {
-            failed("Test frame couldn't be closed successfully.");
+            fail("Test frame couldn't be closed successfully.");
         }
     }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/helper/Interceptor.java
index a5b6b25c69d5..70e50b212a01 100644
--- a/framework/qa/complex/dispatches/helper/Interceptor.java
+++ b/framework/qa/complex/dispatches/helper/Interceptor.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.dispatches;
+package complex.dispatches.helper;
 
 // __________ Imports __________
 
@@ -32,19 +32,18 @@ package complex.dispatches;
 import com.sun.star.beans.PropertyValue;
 
 // exceptions
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.RuntimeException;
-
-// interfaces
-import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.frame.DispatchDescriptor;
 import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XDispatchProviderInterceptor;
-import com.sun.star.frame.XDispatchProviderInterception;
 import com.sun.star.frame.XInterceptorInfo;
+import com.sun.star.frame.XStatusListener;
+
+// interfaces
+
 
 // helper
-import com.sun.star.uno.UnoRuntime;
-import share.LogWriter;
+import com.sun.star.util.URL;
 
 // others
 //import java.lang.*;
@@ -54,10 +53,10 @@ import share.LogWriter;
 /**
  * implements a configurable interceptor for dispatch events.
  */
-public class Interceptor implements com.sun.star.frame.XDispatchProvider,
-                                    com.sun.star.frame.XDispatch,
-                                    com.sun.star.frame.XDispatchProviderInterceptor,
-                                    com.sun.star.frame.XInterceptorInfo
+public class Interceptor implements XDispatchProvider,
+                                    XDispatch,
+                                    XDispatchProviderInterceptor,
+                                    XInterceptorInfo
 {
     // ____________________
 
@@ -88,8 +87,8 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
         The slave can be used inside queryDispatch() to forward requests,
         which are not handled by this interceptor instance.
      */
-    private com.sun.star.frame.XDispatchProvider m_xSlave  = null;
-    private com.sun.star.frame.XDispatchProvider m_xMaster = null;
+    private XDispatchProvider m_xSlave  = null;
+    private XDispatchProvider m_xMaster = null;
 
     // ____________________
 
@@ -107,20 +106,14 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
      */
     private boolean m_bIsRegistered = false;
 
-    // ____________________
-
-    /** used for log output.
-     */
-    private LogWriter m_aLog;
 
     // ____________________
 
     /** ctor
      *  It's initialize an object of this class with default values.
      */
-    public Interceptor(LogWriter aLog)
+    public Interceptor()
     {
-        m_aLog = aLog;
     }
 
     // ____________________
@@ -134,27 +127,27 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized com.sun.star.frame.XDispatchProvider getSlaveDispatchProvider()
+    public synchronized XDispatchProvider getSlaveDispatchProvider()
     {
-        m_aLog.println("Interceptor.getSlaveDispatchProvider() called");
+        System.out.println("Interceptor.getSlaveDispatchProvider() called");
         return m_xSlave;
     }
 
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized com.sun.star.frame.XDispatchProvider getMasterDispatchProvider()
+    public synchronized XDispatchProvider getMasterDispatchProvider()
     {
-        m_aLog.println("Interceptor.getMasterDispatchProvider() called");
+        System.out.println("Interceptor.getMasterDispatchProvider() called");
         return m_xMaster;
     }
 
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized void setSlaveDispatchProvider(com.sun.star.frame.XDispatchProvider xSlave)
+    public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave)
     {
-        m_aLog.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called");
+        System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called");
 
         if (xSlave != null)
         {
@@ -162,7 +155,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
             m_bIsRegistered = true;
         }
         else
+        {
             m_bIsRegistered = false;
+        }
 
         m_xSlave = xSlave;
     }
@@ -170,9 +165,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized void setMasterDispatchProvider(com.sun.star.frame.XDispatchProvider xMaster)
+    public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster)
     {
-        m_aLog.println("Interceptor.setMasterDispatchProvider("+xMaster+") called");
+        System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called");
         m_xMaster = xMaster;
     }
 
@@ -180,25 +175,25 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
 
     /** XDispatchProvider
      */
-    public synchronized com.sun.star.frame.XDispatch queryDispatch(com.sun.star.util.URL aURL            ,
+    public synchronized XDispatch queryDispatch(URL aURL            ,
                                                                    String                sTargetFrameName,
                                                                    int                   nSearchFlags    )
     {
-        m_aLog.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called");
+        System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called");
 
         if (impl_isBlockedURL(aURL.Complete))
         {
-            m_aLog.println("Interceptor.queryDispatch(): URL blocked => returns NULL");
+            System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL");
             return null;
         }
 
         if (m_xSlave != null)
         {
-            m_aLog.println("Interceptor.queryDispatch(): ask slave ...");
+            System.out.println("Interceptor.queryDispatch(): ask slave ...");
             return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags);
         }
 
-        m_aLog.println("Interceptor.queryDispatch(): no idea => returns this");
+        System.out.println("Interceptor.queryDispatch(): no idea => returns this");
         return this;
     }
 
@@ -206,12 +201,12 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
 
     /** XDispatchProvider
      */
-    public com.sun.star.frame.XDispatch[] queryDispatches(com.sun.star.frame.DispatchDescriptor[] lRequests)
+    public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests)
     {
         int i = 0;
         int c = lRequests.length;
 
-        com.sun.star.frame.XDispatch[] lResults = new com.sun.star.frame.XDispatch[c];
+        XDispatch[] lResults = new XDispatch[c];
         for (i=0; i<c; ++i)
         {
             lResults[i] = queryDispatch(lRequests[i].FeatureURL ,
@@ -226,30 +221,30 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
 
     /** XDispatch
      */
-    public synchronized void dispatch(com.sun.star.util.URL              aURL      ,
-                                      com.sun.star.beans.PropertyValue[] lArguments)
+    public synchronized void dispatch(URL              aURL      ,
+                                      PropertyValue[] lArguments)
     {
-        m_aLog.println("Interceptor.dispatch('"+aURL.Complete+"') called");
+        System.out.println("Interceptor.dispatch('"+aURL.Complete+"') called");
     }
 
     // ____________________
 
     /** XDispatch
      */
-    public synchronized void addStatusListener(com.sun.star.frame.XStatusListener xListener,
+    public synchronized void addStatusListener(XStatusListener xListener,
                                                com.sun.star.util.URL              aURL     )
     {
-        m_aLog.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called");
+        System.out.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called");
     }
 
     // ____________________
 
     /** XDispatch
      */
-    public synchronized void removeStatusListener(com.sun.star.frame.XStatusListener xListener,
+    public synchronized void removeStatusListener(XStatusListener xListener,
                                                   com.sun.star.util.URL              aURL     )
     {
-        m_aLog.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called");
+        System.out.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called");
     }
 
     // ____________________
@@ -332,7 +327,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
         for (i=0; i<c; ++i)
         {
             if (impl_match(sURL, lBlockedURLs[i]))
+            {
                 return true;
+            }
         }
 
         return false;
diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/framework/qa/complex/dispatches/helper/makefile.mk
index be761c54fae4..2b2ccab5ebef 100644
--- a/framework/qa/complex/dispatches/helper/makefile.mk
+++ b/framework/qa/complex/dispatches/helper/makefile.mk
@@ -24,10 +24,10 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ = ..$/..$/..$/..
+PRJ = ../../../..
 TARGET  = checkdispatchapi
 PRJNAME = framework
-PACKAGE = complex$/dispatches$/helper
+PACKAGE = complex/dispatches/helper
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
@@ -35,10 +35,9 @@ PACKAGE = complex$/dispatches$/helper
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  Generator.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar Generator.jar
 JAVAFILES       = Interceptor.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
 
 MAXLINELENGTH = 100000
 
diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk
index 87eba000cf71..46c0772061da 100644
--- a/framework/qa/complex/dispatches/makefile.mk
+++ b/framework/qa/complex/dispatches/makefile.mk
@@ -24,69 +24,110 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ = ..$/..$/..
-TARGET  = checkdispatchapi
-PRJNAME = framework
-PACKAGE = complex$/dispatches
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar ConnectivityTools.jar
-JAVAFILES       = checkdispatchapi.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-SUBDIRS=helper
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+PRJ = ../../..
+PRJNAME = framework
+TARGET = qa_complex_dispatches
 
-# --- Parameters for the test --------------------------------------
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/dispatches
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    checkdispatchapi.java
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+# put here all other files
+JAVAFILES = $(JAVATESTFILES)
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+# subdirectories
+SUBDIRS         = helper
 
-# --- Targets ------------------------------------------------------
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-.IF "$(depend)" == ""
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-.ELSE
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-.ENDIF
+.END
 
-.INCLUDE :  target.mk
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-#   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-#   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
+ALLTAR : javatest
 
-RUN: run
+.END
 
-run:
-   +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
 
 
 
+# PRJ = ..$/..$/..
+# TARGET  = checkdispatchapi
+# PRJNAME = framework
+# PACKAGE = complex$/dispatches
+# 
+# # --- Settings -----------------------------------------------------
+# .INCLUDE: settings.mk
+# 
+# 
+# #----- compile .java files -----------------------------------------
+# 
+# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
+#                   OOoRunner.jar mysql.jar ConnectivityTools.jar
+# JAVAFILES       = checkdispatchapi.java
+# 
+# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# 
+# SUBDIRS=helper
+# 
+# #----- make a jar from compiled files ------------------------------
+# 
+# MAXLINELENGTH = 100000
+# 
+# JARCLASSDIRS    = $(PACKAGE)
+# JARTARGET       = $(TARGET).jar
+# JARCOMPRESS 	= TRUE
+# 
+# # --- Parameters for the test --------------------------------------
+# 
+# # start an office if the parameter is set for the makefile
+# .IF "$(OFFICE)" == ""
+# CT_APPEXECCOMMAND =
+# .ELSE
+# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
+# .ENDIF
+# 
+# # test base is java complex
+# CT_TESTBASE = -TestBase java_complex
+# 
+# # test looks something like the.full.package.TestName
+# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+# 
+# # start the runner application
+# CT_APP      = org.openoffice.Runner
+# 
+# # --- Targets ------------------------------------------------------
+# 
+# .IF "$(depend)" == ""
+# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
+# .ELSE
+# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
+# .ENDIF
+# 
+# .INCLUDE :  target.mk
+# 
+# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
+# #   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
+# #   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
+# 
+# RUN: run
+# 
+# run:
+#    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
+# 
+# 
+#