sb123:#i111449# cleanups in svl qa/complex tests

4 files changed, 138 insertions, 115 deletions

diff --git a/svl/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index 4afa2bf33f55..78141b6b20d4 100644
--- a/svl/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
@@ -27,20 +27,25 @@
 
 package complex.ConfigItems;
 
-import com.sun.star.beans.*;
-import com.sun.star.lang.*;
-import com.sun.star.uno.*;
-import com.sun.star.task.*;
+import com.sun.star.beans.NamedValue;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.task.XJob;
+import com.sun.star.uno.UnoRuntime;
 
-import complexlib.*;
 
-import java.lang.*;
-import java.util.*;
+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  todo document me
+ * @deprecated this tests seems no longer work as expected.
  */
-public class CheckConfigItems extends ComplexTestCase
+public class CheckConfigItems
 {
     //-------------------------------------------
     // some const
@@ -64,43 +69,44 @@ public class CheckConfigItems extends ComplexTestCase
         @return All test methods.
         @todo   Think about selection of tests from outside ...
      */
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-        {
-            "checkPicklist",
-            "checkURLHistory",
-            "checkHelpBookmarks",
-            "checkPrintOptions",
-            "checkAccessibilityOptions",
-            "checkUserOptions"
-        };
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//        {
+//            "checkPicklist",
+//            "checkURLHistory",
+//            "checkHelpBookmarks",
+//            "checkPrintOptions",
+//            "checkAccessibilityOptions",
+//          "checkUserOptions"
+//        };
+//    }
 
     //-------------------------------------------
     /** @short  Create the environment for following tests.
 
-        @descr  Use either a component loader from desktop or
+     * @throws java.lang.Exception
+     * @descr  Use either a component loader from desktop or
                 from frame
      */
-    public void before()
+    @Before public void before()
         throws java.lang.Exception
     {
         // get uno service manager from global test environment
-        m_xSmgr = (XMultiServiceFactory)param.getMSF();
+        m_xSmgr = getMSF();
 
         // TODO register helper service
 
         // create module manager
-        m_xTest = (XJob)UnoRuntime.queryInterface(
-                    XJob.class,
-                    m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest"));
+        m_xTest = UnoRuntime.queryInterface(XJob.class, m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest"));
     }
 
     //-------------------------------------------
-    /** @short  close the environment.
+    /**
+     * @throws java.lang.Exception
+     * @short  close the environment.
      */
-    public void after()
+    @After public void after()
         throws java.lang.Exception
     {
         // TODO deregister helper service
@@ -110,54 +116,66 @@ public class CheckConfigItems extends ComplexTestCase
     }
 
     //-------------------------------------------
-    /** @todo document me
+    /**
+     * @throws java.lang.Exception
+     * @todo document me
      */
-    public void checkPicklist()
+    @Test public void checkPicklist()
         throws java.lang.Exception
     {
         impl_triggerTest("checkPicklist");
     }
 
     //-------------------------------------------
-    /** @todo document me
+    /**
+     * @throws java.lang.Exception
+     * @todo document me
      */
-    public void checkURLHistory()
+    @Test public void checkURLHistory()
         throws java.lang.Exception
     {
         impl_triggerTest("checkURLHistory");
     }
 
     //-------------------------------------------
-    /** @todo document me
+    /**
+     * @throws java.lang.Exception
+     * @todo document me
      */
-    public void checkHelpBookmarks()
+    @Test public void checkHelpBookmarks()
         throws java.lang.Exception
     {
         impl_triggerTest("checkHelpBookmarks");
     }
 
     //-------------------------------------------
-    /** @todo document me
+    /**
+     * @throws java.lang.Exception
+     * @todo document me
      */
-    public void checkPrintOptions()
-        throws java.lang.Exception
-    {
-        impl_triggerTest("checkPrintOptions");
-    }
+//     @Test public void checkPrintOptions()
+//         throws java.lang.Exception
+//     {
+//         impl_triggerTest("checkPrintOptions");
+//     }
 
     //-------------------------------------------
-    /** @todo document me
+    /**
+     * @throws java.lang.Exception
+     * @todo document me
      */
-    public void checkAccessibilityOptions()
+    @Test public void checkAccessibilityOptions()
         throws java.lang.Exception
     {
         impl_triggerTest("checkAccessibilityOptions");
     }
 
     //-------------------------------------------
-    /** @todo document me
+    /**
+     * @throws java.lang.Exception
+     * @todo document me
      */
-    public void checkUserOptions()
+    @Test public void checkUserOptions()
         throws java.lang.Exception
     {
         impl_triggerTest("checkUserOptions");
@@ -175,4 +193,27 @@ public class CheckConfigItems extends ComplexTestCase
                      lArgs[0].Value = sTest;
         m_xTest.execute(lArgs);
     }
+
+
+       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/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index f9840605a6d5..b342eff7ff76 100644
--- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
@@ -26,8 +26,8 @@
  ************************************************************************/
 
 #include "HistoryOptTest.hxx"
-#include "AccessibilityOptTest.hxx"
-#include "PrintOptTest.hxx"
+// #include "AccessibilityOptTest.hxx"
+// #include "PrintOptTest.hxx"
 #include "UserOptTest.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -50,8 +50,8 @@ static const ::rtl::OUString PROP_TEST                  = ::rtl::OUString::creat
 static const ::rtl::OUString TEST_PICKLIST              = ::rtl::OUString::createFromAscii("checkPicklist");
 static const ::rtl::OUString TEST_URLHISTORY            = ::rtl::OUString::createFromAscii("checkURLHistory");
 static const ::rtl::OUString TEST_HELPBOOKMARKS         = ::rtl::OUString::createFromAscii("checkHelpBookmarks");
-static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS  = ::rtl::OUString::createFromAscii("checkAccessibilityOptions");
-static const ::rtl::OUString TEST_PRINTOPTIONS          = ::rtl::OUString::createFromAscii("checkPrintOptions");
+// static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS  = ::rtl::OUString::createFromAscii("checkAccessibilityOptions");
+// static const ::rtl::OUString TEST_PRINTOPTIONS          = ::rtl::OUString::createFromAscii("checkPrintOptions");
 static const ::rtl::OUString TEST_USEROPTIONS           = ::rtl::OUString::createFromAscii("checkUserOptions");
 
 //=============================================================================
@@ -136,16 +136,16 @@ css::uno::Any SAL_CALL ConfigItemTest::execute(const css::uno::Sequence< css::be
         HistoryOptTest aOptTest;
         aOptTest.checkHelpBookmarks();
     }
-    else if (sTest.equals(TEST_ACCESSIBILITYOPTIONS))
-    {
-        AccessibilityOptTest aOptTest;
-        aOptTest.impl_checkAccessibilityOptions();
-    }
-    else if (sTest.equals(TEST_PRINTOPTIONS))
-    {
-        PrintOptTest aOptTest;
-        aOptTest.impl_checkPrint();
-    }
+//  else if (sTest.equals(TEST_ACCESSIBILITYOPTIONS))
+//  {
+//      AccessibilityOptTest aOptTest;
+//      aOptTest.impl_checkAccessibilityOptions();
+//  }
+//  else if (sTest.equals(TEST_PRINTOPTIONS))
+//  {
+//         PrintOptTest aOptTest;
+//         aOptTest.impl_checkPrint();
+//  }
     else if (sTest.equals(TEST_USEROPTIONS))
     {
         UserOptTest aOptTest;
diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index 13ea12106792..95f2e456fab3 100644
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
@@ -24,7 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..$/..$/..
+PRJ=../../../..
 
 PRJNAME=			svl
 TARGET=				ConfigItemTest
@@ -38,26 +38,27 @@ NO_BSYMBOLIC=		TRUE
 
 # --- Generate -----------------------------------------------------
 
-INCPOST += $(PRJ)$/source$/inc
+INCPOST += $(PRJ)/source/inc
 
 # --- light services library ----------------------------------------------------
 
 SHL1TARGET=		svt_$(TARGET)
 
 SHL1OBJS=       \
-                $(SLO)$/UserOptTest.obj				\
-                $(SLO)$/PrintOptTest.obj			\
-                $(SLO)$/AccessibilityOptTest.obj	\
-                $(SLO)$/HistoryOptTest.obj			\
-                $(SLO)$/ConfigItemTest.obj
+                $(SLO)/UserOptTest.obj	\
+                $(SLO)/HistoryOptTest.obj \
+                $(SLO)/ConfigItemTest.obj
+
+#				$(SLO)/PrintOptTest.obj	
+#				$(SLO)/AccessibilityOptTest.obj	
 
 SHL1STDLIBS=	\
-                $(SVLIB) 						\
-                $(SVLLIB) 						    \
-                $(UNOTOOLSLIB)						\
-                $(COMPHELPERLIB)					\
-                $(CPPUHELPERLIB)					\
-                $(CPPULIB)							\
+                $(SVLIB) \
+                $(SVLLIB) \
+                $(UNOTOOLSLIB) \
+                $(COMPHELPERLIB) \
+                $(CPPUHELPERLIB) \
+                $(CPPULIB) \
                 $(SALLIB)
 
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
diff --git a/svl/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
index 6838cc79a660..ba980e325904 100644
--- a/svl/qa/complex/ConfigItems/makefile.mk
+++ b/svl/qa/complex/ConfigItems/makefile.mk
@@ -24,60 +24,41 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ = ..$/..$/..
-TARGET  = CheckConfigItems
-PRJNAME = svl
-PACKAGE = complex$/ConfigItems
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-                  OOoRunner.jar
-                  
-JAVAFILES       = CheckConfigItems.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 = svl
+TARGET = qa_complex_ConfigItems
 
-# --- Parameters for the test --------------------------------------
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/ConfigItems
 
-# 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 = \
+    CheckConfigItems.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
+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
 
-.INCLUDE :  target.mk
+.END
 
-RUN: run
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-run:
-    java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
+ALLTAR : javatest
 
+.END