merge DEV300_m83

8 files changed, 341 insertions, 186 deletions

diff --git a/reportdesign/qa/complex/reportdesign/FileURL.java b/reportdesign/qa/complex/reportdesign/FileURL.java
new file mode 100644
index 000000000..3d93f756a
--- /dev/null
+++ b/reportdesign/qa/complex/reportdesign/FileURL.java
@@ -0,0 +1,62 @@
+/*
+ *  ************************************************************************
+ * 
+ *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *  
+ *  Copyright 2000, 2010 Oracle and/or its affiliates.
+ * 
+ *  OpenOffice.org - a multi-platform office productivity suite
+ * 
+ *  This file is part of OpenOffice.org.
+ * 
+ *  OpenOffice.org is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License version 3
+ *  only, as published by the Free Software Foundation.
+ * 
+ *  OpenOffice.org is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License version 3 for more details
+ *  (a copy is included in the LICENSE file that accompanied this code).
+ * 
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  version 3 along with OpenOffice.org.  If not, see
+ *  <http://www.openoffice.org/license.html>
+ *  for a copy of the LGPLv3 License.
+ * 
+ *  ************************************************************************
+ */
+
+package complex.reportdesign;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ *
+ * @author ll93751
+ */
+public class FileURL
+{
+    String m_sFileURL;
+
+    public FileURL(String _sFileURL)
+    {
+        m_sFileURL = _sFileURL;
+    }
+    public boolean exists()
+    {
+        try
+        {
+            final URI aURI = new URI(m_sFileURL);
+            final File aFile = new File(aURI);
+            return aFile.exists();
+        }
+        catch (URISyntaxException ex)
+        {
+            System.out.println("Error: URI is wrong. '" + m_sFileURL + "': " + ex.getMessage());
+        }
+        return false;
+    }
+}
diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 2a652fa46..446efacef 100755
--- a/reportdesign/qa/complex/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex;
+package complex.reportdesign;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -50,11 +50,11 @@ import com.sun.star.util.XCloseable;
 // import util.BasicMacroTools;
 // import util.DesktopTools;
 // import util.dbg;
-import complexlib.ComplexTestCase;
-import util.utils;
+// import complexlib.ComplexTestCase;
+// import util.utils;
 import helper.OfficeProvider;
 import helper.URLHelper;
-import helper.OfficeWatcher;
+// import helper.OfficeWatcher;
 
 import convwatch.DB;
 
@@ -76,7 +76,13 @@ import convwatch.DB;
 // import util.DynamicClassLoader;
 // import java.util.StringTokenizer;
 
-
+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.*;
 
 
 class PropertySetHelper
@@ -84,7 +90,7 @@ class PropertySetHelper
     XPropertySet m_xPropertySet;
     public PropertySetHelper(Object _aObj)
         {
-            m_xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, _aObj);
+            m_xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _aObj);
         }
     
     /**
@@ -152,57 +158,73 @@ class PropertyHelper
         }
 }
 
-public class ReportDesignerTest extends ComplexTestCase {
+public class ReportDesignerTest
+{
     
     String mTestDocumentPath;
 
-    public String[] getTestMethodNames() 
-        {
-            return new String[] {"firsttest"};
-        }
-
-    private void checkIfOfficeExists(String _sOfficePathWithTrash)
-        {
-            String sOfficePath = "";
-            int nIndex = _sOfficePathWithTrash.indexOf("soffice.exe");
-            if (nIndex > 0)
-            {
-                sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 11);
-            }
-            else
-            {
-                nIndex = _sOfficePathWithTrash.indexOf("soffice");
-                if (nIndex > 0)
-                {
-                    sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7);
-                }
-            }
-            
-            log.println(sOfficePath);
-            File sOffice = new File(sOfficePath);
-            if (! sOffice.exists())
-            {
-                log.println("ERROR: There exists no office installation at given path: '" + sOfficePath + "'");
-                System.exit(0);
-            }
-        }
+//    public String[] getTestMethodNames()
+//        {
+//            return new String[] {"firsttest"};
+//        }
+
+    @Before public void before()
+    {
+        System.out.println("before");
+        // String tempdir = System.getProperty("java.io.tmpdir");
+        //
+        int dummy = 0;
+        // m_xXMultiServiceFactory = getMSF();
+    }
+    
+    @After public void after()
+    {
+        System.out.println("after");
+    }
+
+//    private void checkIfOfficeExists(String _sOfficePathWithTrash)
+//        {
+//            String sOfficePath = "";
+//            int nIndex = _sOfficePathWithTrash.indexOf("soffice.exe");
+//            if (nIndex > 0)
+//            {
+//                sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 11);
+//            }
+//            else
+//            {
+//                nIndex = _sOfficePathWithTrash.indexOf("soffice");
+//                if (nIndex > 0)
+//                {
+//                    sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7);
+//                }
+//            }
+//
+//            System.out.println(sOfficePath);
+//            File sOffice = new File(sOfficePath);
+//            if (! sOffice.exists())
+//            {
+//                System.out.println("ERROR: There exists no office installation at given path: '" + sOfficePath + "'");
+//                System.exit(0);
+//            }
+//        }
     
     
-    private static XDesktop m_xDesktop = null;
-    public static XDesktop getXDesktop()
+    private XDesktop m_xDesktop = null;
+    public XDesktop getXDesktop()
         {
 
             if (m_xDesktop == null) 
             {
                 try 
                 {
-                    XInterface xInterface = (XInterface) m_xXMultiServiceFactory.createInstance( "com.sun.star.frame.Desktop" );
-                    m_xDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, xInterface);
+                    XInterface xInterface = (XInterface) getMSF().createInstance( "com.sun.star.frame.Desktop" );
+                    m_xDesktop = UnoRuntime.queryInterface(XDesktop.class, xInterface);
+                    assertNotNull("Can't get XDesktop", m_xDesktop);
                 }
                 catch (com.sun.star.uno.Exception e) 
                 {
-                    log.println("ERROR: uno.Exception caught");
-                    log.println("Message: " + e.getMessage());
+                    System.out.println("ERROR: uno.Exception caught");
+                    System.out.println("Message: " + e.getMessage());
                 }
             }
             return m_xDesktop;
@@ -226,28 +248,27 @@ public class ReportDesignerTest extends ComplexTestCase {
         
         
     private OfficeProvider m_aProvider = null;
-    private static XMultiServiceFactory m_xXMultiServiceFactory = null;
-    private void startOffice()
-        {
-            // int tempTime = param.getInt("SingleTimeOut");
-            param.put("TimeOut", new Integer(300000));
-            System.out.println("TimeOut: " + param.getInt("TimeOut"));
-            System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut"));
-
-            // OfficeProvider aProvider = null;
-            m_aProvider = new OfficeProvider();
-            m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param);
-            param.put("ServiceFactory", m_xXMultiServiceFactory);
-        }
-
-    private void stopOffice()
-        {
-            if (m_aProvider != null)
-            {
-                m_aProvider.closeExistingOffice(param, true);
-                m_aProvider = null;
-            }
-        }
+//    private void startOffice()
+//        {
+//            // int tempTime = param.getInt("SingleTimeOut");
+//            param.put("TimeOut", new Integer(300000));
+//            System.out.println("TimeOut: " + param.getInt("TimeOut"));
+//            System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut"));
+//
+//            // OfficeProvider aProvider = null;
+//            m_aProvider = new OfficeProvider();
+//            m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param);
+//            param.put("ServiceFactory", m_xXMultiServiceFactory);
+//        }
+//
+//    private void stopOffice()
+//        {
+//            if (m_aProvider != null)
+//            {
+//                m_aProvider.closeExistingOffice(param, true);
+//                m_aProvider = null;
+//            }
+//        }
         
     private String m_sMailAddress = null;
     private String m_sUPDMinor;
@@ -256,78 +277,77 @@ public class ReportDesignerTest extends ComplexTestCase {
     private static final int WRITER = 1;
     private static final int CALC = 2;
 
-    public void firsttest() 
+    @Test public void firsttest()
         {
-            convwatch.GlobalLogWriter.set(log);
-            try
-            {
+            // convwatch.GlobalLogWriter.set(log);
                     
-                // -------------------- preconditions, try to find an office --------------------
-                
-                String sAppExecutionCommand = (String) param.get("AppExecutionCommand");
+            // -------------------- preconditions, try to find an office --------------------
 
-                String sUser = System.getProperty("user.name");
-                log.println("user.name='" + sUser + "'");
-                    
-                String sVCSID = System.getProperty("VCSID");
-                log.println("VCSID='" + sVCSID + "'");
-                m_sMailAddress = sVCSID + "@openoffice.org";
-                log.println("Assumed mail address: " + m_sMailAddress);
+//                String sAppExecutionCommand = (String) param.get("AppExecutionCommand");
 
-                m_sUPDMinor = System.getProperty("UPDMINOR");
-                m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP");
-                // createDBEntry();
-                log.println("Current CWS: " + m_sCWS_WORK_STAMP);
-                log.println("Current MWS: " + m_sUPDMinor);
+            String sUser = System.getProperty("user.name");
+            System.out.println("user.name='" + sUser + "'");
 
-                // System.exit(1);
+            String sVCSID = System.getProperty("VCSID");
+            System.out.println("VCSID='" + sVCSID + "'");
+            m_sMailAddress = sVCSID + "@openoffice.org";
+            System.out.println("Assumed mail address: " + m_sMailAddress);
 
-                sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser);
-                log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'");
-                    
-                // an other way to replace strings
-                // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser);
-                    
-                checkIfOfficeExists(sAppExecutionCommand);
-                param.put("AppExecutionCommand", new String(sAppExecutionCommand));
-                    
-                // --------------------------- Start the given Office ---------------------------
-                    
-                startOffice();
-                
-                // ------------------------------ Start a test run ------------------------------
-                    
-                String sCurrentDirectory = System.getProperty("user.dir");
-                log.println("Current Dir: " + sCurrentDirectory);
-                    
-                String sWriterDocument =  sCurrentDirectory + "/" + "RPTWriterTests.odb";
-                startTestForFile(sWriterDocument, WRITER);
+            m_sUPDMinor = System.getProperty("UPDMINOR");
+            m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP");
+            // createDBEntry();
+            System.out.println("Current CWS: " + m_sCWS_WORK_STAMP);
+            System.out.println("Current MWS: " + m_sUPDMinor);
 
-                String sCalcDocument =  sCurrentDirectory + "/" + "RPTCalcTests.odb";
-                startTestForFile(sCalcDocument, CALC);
-            }
-            catch (AssureException e)
-            {
-                stopOffice();
-                throw new AssureException(e.getMessage());
-            }
-                
+            // System.exit(1);
+
+//                sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser);
+//                System.out.println("sAppExecutionCommand='" + sAppExecutionCommand + "'");
+//
+            // an other way to replace strings
+            // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser);
+
+//                checkIfOfficeExists(sAppExecutionCommand);
+//                param.put("AppExecutionCommand", new String(sAppExecutionCommand));
+
+            // --------------------------- Start the given Office ---------------------------
+
+//                startOffice();
+
+            // ------------------------------ Start a test run ------------------------------
+
+//            String sCurrentDirectory = System.getProperty("user.dir");
+//            System.out.println("Current Dir: " + sCurrentDirectory);
+//
+            String sWriterDocument =  TestDocument.getUrl("RPTWriterTests.odb");
+            startTestForFile(sWriterDocument, WRITER);
+
+            String sCalcDocument =  TestDocument.getUrl("RPTCalcTests.odb");
+            startTestForFile(sCalcDocument, CALC);
+//            catch (AssureException e)
+//            {
+//                stopOffice();
+//                throw new AssureException(e.getMessage());
+//            }
+//
             // ------------------------------ Office shutdown ------------------------------
-            stopOffice();
+//            stopOffice();
         }
         
 // -----------------------------------------------------------------------------
     private void startTestForFile(String _sDocument, int _nType)
         {
-            File aFile = new File(_sDocument);
-            assure("Test File doesn't '" + _sDocument + "'exist.", aFile.exists());
+            FileURL aFileURL = new FileURL(_sDocument);
+            assertTrue("Test File doesn't '" + _sDocument + "'exist.", aFileURL.exists());
             
-            String sFileURL = URLHelper.getFileURLFromSystemPath(_sDocument);
-            log.println("File URL: " + sFileURL);
+            String sFileURL = _sDocument; // URLHelper.getFileURLFromSystemPath(_sDocument);
+            System.out.println("File URL: " + sFileURL);
                     
             XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null);
-            log.println("Load done");
-// 	context = createUnoService("com.sun.star.sdb.DatabaseContext")
+            System.out.println("Load done");
+            assertNotNull("Can't load document ", xDocComponent);
+
+            // 	context = createUnoService("com.sun.star.sdb.DatabaseContext")
 //     oDataBase = context.getByName("hh")
 //     oDBDoc = oDataBase.DatabaseDocument
 // 
@@ -339,31 +359,33 @@ public class ReportDesignerTest extends ComplexTestCase {
                     
             try
             {
-                XInterface x = (XInterface)m_xXMultiServiceFactory.createInstance("com.sun.star.sdb.DatabaseContext");
-                assure("can't create instance of com.sun.star.sdb.DatabaseContext", x != null);
-                log.println("createInstance com.sun.star.sdb.DatabaseContext done");
+                XInterface x = (XInterface)getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
+                assertNotNull("can't create instance of com.sun.star.sdb.DatabaseContext", x);
+                System.out.println("createInstance com.sun.star.sdb.DatabaseContext done");
                 
-                XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x);
+                XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x);
                 showElements(xNameAccess);
                 Object aObj = xNameAccess.getByName(sFileURL);
-//                    log.println("1");
+//                    System.out.println("1");
                 
                     // PropertySetHelper aHelper = new PropertySetHelper(aObj);
-                XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
+                XDocumentDataSource xDataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
 //                    Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument");
                 XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
                 
                 // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument);
-                assure("can't access DatabaseDocument", xOfficeDBDoc != null);
-//                    log.println("2");
+                assertNotNull("can't access DatabaseDocument", xOfficeDBDoc);
+//                    System.out.println("2");
                 
-                XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
+                XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
                 Object aController = xDBSource.getCurrentController();
-                assure("Controller of xOfficeDatabaseDocument is empty!", aController != null);
-//                     log.println("3");
+                assertNotNull("Controller of xOfficeDatabaseDocument is empty!", aController);
+//                     System.out.println("3");
                 
-                XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
-                boolean isConnect = aDBDocUI.connect();
+                XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
+                /* boolean isConnect = */
+// TODO: throws an exception in DEV300m78
+                aDBDocUI.connect();
 //                     if (isConnect)
 //                     {
 //                         System.out.println("true");
@@ -372,23 +394,23 @@ public class ReportDesignerTest extends ComplexTestCase {
 //                     {
 //                         System.out.println("false");
 //                     }
-//                     log.println("4");
+//                     System.out.println("4");
                 
                 // aHelper = new PropertySetHelper(aController);
                 
                 // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection");
                 Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); 
-                assure("ActiveConnection is empty", aActiveConnectionObj != null);
-//                     log.println("5");
+                assertNotNull("ActiveConnection is empty", aActiveConnectionObj);
+//                     System.out.println("5");
                 
-                XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
+                XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
                 xNameAccess = xSupplier.getReportDocuments();
-                assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null);
-//                     log.println("5");
+                assertNotNull("xOfficeDatabaseDocument returns no Report Document", xNameAccess);
+//                     System.out.println("5");
                 
                 showElements(xNameAccess);
                 
-                ArrayList aPropertyList = new ArrayList();
+                ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
                 
                 PropertyValue aActiveConnection = new PropertyValue();
                 aActiveConnection.Name = "ActiveConnection";
@@ -400,7 +422,7 @@ public class ReportDesignerTest extends ComplexTestCase {
             }
             catch(com.sun.star.uno.Exception e)
             {
-                log.println("ERROR: Exception caught");
+                fail("ERROR: Exception caught" + e.getMessage());
             }
             
                 // String mTestDocumentPath = (String) param.get("TestDocumentPath");
@@ -421,8 +443,8 @@ public class ReportDesignerTest extends ComplexTestCase {
     private void createDBEntry(int _nType)
         {
             // try to connect the database
-            String sDBConnection = (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING );
-            log.println("DBConnection: " + sDBConnection);
+            String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING );
+            System.out.println("DBConnection: " + sDBConnection);
             DB.init(sDBConnection);
             String sDestinationVersion = m_sCWS_WORK_STAMP;
             if (sDestinationVersion.length() == 0)
@@ -436,10 +458,10 @@ public class ReportDesignerTest extends ComplexTestCase {
             String sSpecial = "";
 
             String sFixRefSubDirectory = "ReportDesign_qa_complex_" + getFileFormat(_nType);
-            DB.insertinto_documentcompare(sFixRefSubDirectory, "", "fixref",
-                                          sDestinationVersion, sDestinationName, sDestinationCreatorType,
-                                          sDocumentPoolDir, sDocumentPoolName, m_sMailAddress,
-                                          sSpecial);
+//            DB.insertinto_documentcompare(sFixRefSubDirectory, "", "fixref",
+//                                          sDestinationVersion, sDestinationName, sDestinationCreatorType,
+//                                          sDocumentPoolDir, sDocumentPoolName, m_sMailAddress,
+//                                          sSpecial);
             // DB.test();
             // System.exit(1);
         }
@@ -495,7 +517,7 @@ public class ReportDesignerTest extends ComplexTestCase {
     
     private String getOutputPath(int _nType)
         {
-            String sOutputPath = (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH );
+            String sOutputPath = util.utils.getOfficeTemp/*Dir*/(getMSF());// (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH );
 
             if (!sOutputPath.endsWith("/") ||         // construct the output file name
                 !sOutputPath.endsWith("\\"))
@@ -533,7 +555,7 @@ public class ReportDesignerTest extends ComplexTestCase {
             
             String sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputPath);
 
-            ArrayList aPropertyList = new ArrayList(); // set some properties for storeAsURL
+            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); // set some properties for storeAsURL
 
             PropertyValue aFileFormat = new PropertyValue();
             aFileFormat.Name = "FilterName";
@@ -546,19 +568,19 @@ public class ReportDesignerTest extends ComplexTestCase {
             aPropertyList.add(aOverwrite);
 
             // store the document in an other directory
-            XStorable aStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, _xComponent);
+            XStorable aStorable = UnoRuntime.queryInterface(XStorable.class, _xComponent);
             if (aStorable != null)
             {
-                log.println("store document as URL: '" + sOutputURL + "'");
+                System.out.println("store document as URL: '" + sOutputURL + "'");
                 try
                 {
                     aStorable.storeAsURL(sOutputURL, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList));
                 }
                 catch (com.sun.star.io.IOException e)
                 {
-                    log.println("ERROR: Exception caught");
-                    log.println("Can't write document URL: '" + sOutputURL + "'");
-                    log.println("Message: " + e.getMessage());
+                    System.out.println("ERROR: Exception caught");
+                    System.out.println("Can't write document URL: '" + sOutputURL + "'");
+                    System.out.println("Message: " + e.getMessage());
                 }
             }
         }
@@ -566,25 +588,25 @@ public class ReportDesignerTest extends ComplexTestCase {
     private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList)
         {
             XComponent xDocComponent = null;
-            XComponentLoader xComponentLoader = (XComponentLoader) UnoRuntime.queryInterface( XComponentLoader.class, _xComponent );
+            XComponentLoader xComponentLoader = UnoRuntime.queryInterface(XComponentLoader.class, _xComponent);
 
             try
             {
                 PropertyValue[] aLoadProperties = PropertyHelper.createPropertyValueArrayFormArrayList(_aPropertyList);
-                log.println("Load component: '" + _sName + "'");
+                System.out.println("Load component: '" + _sName + "'");
                 xDocComponent = xComponentLoader.loadComponentFromURL(_sName, "_blank", 0, aLoadProperties);
             }
             catch (com.sun.star.io.IOException e)
             {
-                log.println("ERROR: Exception caught");
-                log.println("Can't load document '" + _sName + "'");
-                log.println("Message: " + e.getMessage());
+                System.out.println("ERROR: Exception caught");
+                System.out.println("Can't load document '" + _sName + "'");
+                System.out.println("Message: " + e.getMessage());
             }
             catch (com.sun.star.lang.IllegalArgumentException e)
             {
-                log.println("ERROR: Exception caught");
-                log.println("Illegal Arguments given to loadComponentFromURL.");
-                log.println("Message: " + e.getMessage());
+                System.out.println("ERROR: Exception caught");
+                System.out.println("Illegal Arguments given to loadComponentFromURL.");
+                System.out.println("Message: " + e.getMessage());
             }
             return xDocComponent;
         }
@@ -592,17 +614,39 @@ public class ReportDesignerTest extends ComplexTestCase {
     private void closeComponent(XComponent _xDoc)
         {
             // Close the document
-            XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, _xDoc);
+            XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, _xDoc);
             try
             {
                 xCloseable.close(true);
             }
             catch (com.sun.star.util.CloseVetoException e)
             {
-                log.println("ERROR: CloseVetoException caught");
-                log.println("CloseVetoException occured Can't close document.");
-                log.println("Message: " + e.getMessage());
+                System.out.println("ERROR: CloseVetoException caught");
+                System.out.println("CloseVetoException occured Can't close document.");
+                System.out.println("Message: " + e.getMessage());
             }
         }
+
+
+    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/reportdesign/qa/complex/reportdesign/TestDocument.java b/reportdesign/qa/complex/reportdesign/TestDocument.java
new file mode 100644
index 000000000..abaecebff
--- /dev/null
+++ b/reportdesign/qa/complex/reportdesign/TestDocument.java
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+package complex.reportdesign;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument
+{
+    public static String getUrl(String name) 
+        {
+            return OfficeFileUrl.getAbsolute(new File("test_documents", name));
+        }
+
+    private TestDocument() {}
+}
diff --git a/reportdesign/qa/complex/makefile.mk b/reportdesign/qa/complex/reportdesign/makefile.mk
index 9d1b7667c..68140b184 100755
--- a/reportdesign/qa/complex/makefile.mk
+++ b/reportdesign/qa/complex/reportdesign/makefile.mk
@@ -25,34 +25,42 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
+.ELSE
 
+PRJ = ../../..
 PRJNAME = reportdesign
-PACKAGE = complex
-TARGET = rptdesigntest
+TARGET = qa_complex_reportdesign
 
-# --- Settings -----------------------------------------------------
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/reportdesign
 
-.INCLUDE :  settings.mk
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    ReportDesignerTest.java
 
-# --- Files --------------------------------------------------------
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+    TestDocument.java \
+    FileURL.java
 
-JARFILES = ridl.jar jurt.jar unoil.jar juh.jar OOoRunner.jar
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-JAVAFILES =	ReportDesignerTest.java
+# subdirectories
+# SUBDIRS         = helper
 
-# --- Targets ------------------------------------------------------
+# Sample how to debug
+JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-.INCLUDE :  target.mk
+.END
 
-# JAVADEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8502,suspend=y
-JAVADEBUG=
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-MYSQL_CONNECTOR=$(PWD)$/mysql-connector-java-5.0.6-bin.jar
-CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(MYSQL_CONNECTOR)
+ALLTAR : javatest
 
-run: ALLTAR
-    $(PERL) mysql-connector-exists.pl $(MYSQL_CONNECTOR)
-#	@echo $(CLASSPATH)
-#	@echo $(VCSID)
-    @java $(JAVADEBUG) -cp $(CLASSPATH) -DVCSID=$(VCSID) -DCWS_WORK_STAMP=$(CWS_WORK_STAMP) -DUPDMINOR=$(UPDMINOR) org.openoffice.Runner -ini runner.props 
+.END
diff --git a/reportdesign/qa/complex/mysql-connector-exists.pl b/reportdesign/qa/complex/reportdesign/mysql-connector-exists.pl
index 6eefe2bb0..6eefe2bb0 100644
--- a/reportdesign/qa/complex/mysql-connector-exists.pl
+++ b/reportdesign/qa/complex/reportdesign/mysql-connector-exists.pl
diff --git a/reportdesign/qa/complex/runner.props b/reportdesign/qa/complex/reportdesign/runner.props
index d894366ce..d894366ce 100755
--- a/reportdesign/qa/complex/runner.props
+++ b/reportdesign/qa/complex/reportdesign/runner.props
diff --git a/reportdesign/qa/complex/RPTCalcTests.odb b/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb
index 0e91d633d..0e91d633d 100755
--- a/reportdesign/qa/complex/RPTCalcTests.odb
+++ b/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb
diff --git a/reportdesign/qa/complex/RPTWriterTests.odb b/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb
index 86228f457..7099b1abf 100755
--- a/reportdesign/qa/complex/RPTWriterTests.odb
+++ b/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb