1 files changed, 54 insertions, 21 deletions

diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index e1e27907d9..789544cef0 100755
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.java
@@ -27,65 +27,74 @@
 package complex.broken_document;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.frame.FrameSearchFlag;
+// import com.sun.star.frame.FrameSearchFlag;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XFrame;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
+
+
+// ---------- 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.*;
+// ------------------------------------------
 
 /**
  * Check, if message boxes appear when the Office is in "headless" mode. Tests
  * bug i15809. This test uses the broken document dbf.dbf.emf.
  */
-public class LoadDocument extends ComplexTestCase {
+public class LoadDocument {
 
     /** defect file to load **/
-    private final String mFileName = "dbf.dbf.emf";
+    // private final String mFileName = "dbf.dbf.emf";
 
     /**
      * Get all test methods.
      * @return The test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkHeadlessState"};
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkHeadlessState"};
+//    }
 
     /**
      * Start Office with "-headless" parameter, then
      * load the broken document "dbf.dbf.emf", that brings a message box up in
      * the ui, see if the headless mode of SOffice changes.
      */
-    public void checkHeadlessState() {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
+    @Test public void checkHeadlessState()
+    {
+        XMultiServiceFactory xMSF = getMSF();
         XFrame xDesktop = null;
 
         try {
-            xDesktop = (XFrame)UnoRuntime.queryInterface(XFrame.class,
-                        xMSF.createInstance("com.sun.star.frame.Desktop"));
+            xDesktop = UnoRuntime.queryInterface(XFrame.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
         }
         catch(com.sun.star.uno.Exception e) {
-            failed("Could not create a desktop instance.");
+            fail("Could not create a desktop instance.");
         }
 
-        XComponentLoader xDesktopLoader = (XComponentLoader)
-                UnoRuntime.queryInterface(XComponentLoader.class, xDesktop);
+        XComponentLoader xDesktopLoader = UnoRuntime.queryInterface(XComponentLoader.class, xDesktop);
         System.out.println("xDektopLoader is null: " + (xDesktopLoader == null));
         PropertyValue[] val = new PropertyValue[0];
 
-        String workingDir = (String)param.get("WorkingDir") + System.getProperty("file.separator") + mFileName;
-        System.out.println("Working dir: " + workingDir);
-        String fileUrl = util.utils.getFullURL(workingDir);
+        // String workingDir = (String)param.get("WorkingDir") + System.getProperty("file.separator") + mFileName;
+        // System.out.println("Working dir: " + workingDir);
+        String fileUrl = complex.broken_document.TestDocument.getUrl("dbf.dbf.emf");
         System.out.println("File Url: " + fileUrl);
 
         try {
             xDesktopLoader.loadComponentFromURL(fileUrl, "_blank", 0, val);
         }
         catch(com.sun.star.io.IOException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
         catch(com.sun.star.lang.IllegalArgumentException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
 
         // try again: headless mode defect now?
@@ -93,11 +102,35 @@ public class LoadDocument extends ComplexTestCase {
             xDesktopLoader.loadComponentFromURL(fileUrl, "_blank", 0, val);
         }
         catch(com.sun.star.io.IOException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
         catch(com.sun.star.lang.IllegalArgumentException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
 
     }
+
+
+
+  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();
+
 }