1 files changed, 65 insertions, 28 deletions

diff --git a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
index 842a365d4714..6fda574ae8f5 100644
--- a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
+++ b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
@@ -3,21 +3,31 @@
  *
  * Created on 26. April 2004, 10:37
  */
-
 package complex.filter.misc;
 
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import complexlib.ComplexTestCase;
+
 import util.utils;
 
+// ---------- 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.*;
+// ------------------------------------------
+
 /**
  *
  * @author  cn93815
  */
-public class TypeDetection6FileFormat extends ComplexTestCase {
+public class TypeDetection6FileFormat
+{
 
     static XMultiServiceFactory xMSF;
 
@@ -25,20 +35,20 @@ public class TypeDetection6FileFormat extends ComplexTestCase {
      * A function to tell the framework, which test functions are available.
      * @return All test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkFilterFactory",
-                            "checkTypeDetection"};
-    }
-
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkFilterFactory",
+//                            "checkTypeDetection"};
+//    }
     /** Create the environment for following tests.
      * Use either a component loader from desktop or
      * from frame
      * @throws Exception Exception
      */
-    public void before() throws Exception {
+    @Before public void before() throws Exception
+    {
 
-        xMSF = (XMultiServiceFactory)param.getMSF();
-        assure("Could not get XMultiServiceFactory", xMSF != null);
+        xMSF = getMSF();
+        assertNotNull("Could not get XMultiServiceFactory", xMSF);
 
     }
 
@@ -46,7 +56,8 @@ public class TypeDetection6FileFormat extends ComplexTestCase {
      * call the function <CODE>checkFileFormatSupport</CODE> to test <CODE>com.sun.star.document.FilterFactory</CODE>
      * @see com.sun.star.document.FilterFactory
      */
-    public void checkFilterFactory(){
+    @Test public void checkFilterFactory()
+    {
         checkFileFormatSupport("com.sun.star.document.FilterFactory");
     }
 
@@ -54,7 +65,8 @@ public class TypeDetection6FileFormat extends ComplexTestCase {
      * call the function <CODE>checkFileFormatSupport</CODE> to test <CODE>com.sun.star.document.TypeDetection</CODE>
      * @see com.sun.star.document.TypeDetection
      */
-    public void checkTypeDetection(){
+    @Test public void checkTypeDetection()
+    {
         checkFileFormatSupport("com.sun.star.document.TypeDetection");
 
     }
@@ -64,42 +76,67 @@ public class TypeDetection6FileFormat extends ComplexTestCase {
      * The serve was created and the filter 'TypeDetection6FileFormat' was searched
      * @param serviceName the name of the service to test
      */
-    private void checkFileFormatSupport(String serviceName){
-        log.println("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-        log.println("testing service '" + serviceName + "'");
+    private void checkFileFormatSupport(String serviceName)
+    {
+        System.out.println("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+        System.out.println("testing service '" + serviceName + "'");
 
         XInterface oObj = null;
-        try{
+        try
+        {
             oObj = getTestObject(serviceName);
-            log.println("ImplName: "+utils.getImplName(oObj));
-        } catch (java.lang.Exception e){
-            failed("could not get test object");
+            System.out.println("ImplName: " + utils.getImplName(oObj));
+        }
+        catch (java.lang.Exception e)
+        {
+            fail("could not get test object");
         }
-        XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface
-            (XNameAccess.class, oObj);
+        XNameAccess xNA = UnoRuntime.queryInterface(XNameAccess.class, oObj);
         String msg = "Could not find filter 'TypeDetection6FileFormat'!";
         msg += "\nMaybe 'TypeDetection6FileFormat.xcu' is not registered.";
-        assure(msg, xNA.hasByName("TypeDetection6FileFormat"),CONTINUE);
+        assertTrue(msg, xNA.hasByName("TypeDetection6FileFormat"));
 
 
     }
 
-     /**
+    /**
      * Creates an instance for the given <CODE>serviceName</CODE>
      * @param serviceName the name of the service which should be created
      * @throws Exception was thrown if creataion failes
      * @return <CODE>XInterface</CODE> of service
      */
-    public XInterface getTestObject(String serviceName) throws Exception{
+    public XInterface getTestObject(String serviceName) throws Exception
+    {
 
         Object oInterface = xMSF.createInstance(serviceName);
 
-        if (oInterface == null) {
-            failed("Service wasn't created") ;
-            throw new Exception("could not create service '"+serviceName+"'");
+        if (oInterface == null)
+        {
+            fail("Service wasn't created");
+            throw new Exception("could not create service '" + serviceName + "'");
         }
         return (XInterface) oInterface;
     }
 
+        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();
 
 }