1 files changed, 30 insertions, 19 deletions
diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java
index 4c964e82dc06..bffc1ce97c4c 100644
--- a/dbaccess/qa/complex/dbaccess/ApplicationController.java
+++ b/dbaccess/qa/complex/dbaccess/ApplicationController.java
@@ -48,6 +48,17 @@ import helper.URLHelper;
 import java.io.File;
 import java.io.IOException;
 
+
+// ---------- 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.*;
+// ------------------------------------------
+
 /** complex test case for Base's application UI
  */
 public class ApplicationController extends TestCase
@@ -64,13 +75,13 @@ public class ApplicationController extends TestCase
 
     // --------------------------------------------------------------------------------------------------------
 
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-                {
-                    "checkSaveAs"
-                };
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//                {
+//                    "checkSaveAs"
+//                };
+//    }
 
     // --------------------------------------------------------------------------------------------------------
     public String getTestObjectName()
@@ -98,16 +109,16 @@ public class ApplicationController extends TestCase
 
         // create/load the new database document
         m_database = (_documentURL == null)
-                ? new HsqlDatabase(getORB())
-                : new HsqlDatabase(getORB(), _documentURL);
+                ? new HsqlDatabase(getMSF())
+                : new HsqlDatabase(getMSF(), _documentURL);
         m_databaseDocument = m_database.getDatabaseDocument();
 
         // load it into a frame
-        final Object object = getORB().createInstance("com.sun.star.frame.Desktop");
+        final Object object = getMSF().createInstance("com.sun.star.frame.Desktop");
         final XComponentLoader xComponentLoader = UnoRuntime.queryInterface(XComponentLoader.class, object);
         final XComponent loadedComponent = xComponentLoader.loadComponentFromURL(m_database.getDocumentURL(), "_blank", FrameSearchFlag.ALL, new PropertyValue[0]);
 
-        assure("too many document instances!",
+        assertTrue("too many document instances!",
                 UnoRuntime.areSame(loadedComponent, m_databaseDocument));
 
         // get the controller, which provides access to various UI operations
@@ -118,21 +129,21 @@ public class ApplicationController extends TestCase
     }
 
     // --------------------------------------------------------------------------------------------------------
-    public void before() throws java.lang.Exception
+    @Before public void before() throws java.lang.Exception
     {
         super.before();
         impl_switchToDocument(null);
     }
 
     // --------------------------------------------------------------------------------------------------------
-    public void after() throws java.lang.Exception
+    @After public void after() throws java.lang.Exception
     {
         impl_closeDocument();
         super.after();
     }
     // --------------------------------------------------------------------------------------------------------
 
-    public void checkSaveAs() throws Exception, IOException, java.lang.Exception
+    @Test public void checkSaveAs() throws Exception, IOException, java.lang.Exception
     {
         // issue 93737 describes the problem that when you save-as a database document, and do changes to it,
         // then those changes are saved in the old document, actually
@@ -146,7 +157,7 @@ public class ApplicationController extends TestCase
 
         // connect
         m_documentUI.connect();
-        assure("could not connect to " + m_database.getDocumentURL(), m_documentUI.isConnected());
+        assertTrue("could not connect to " + m_database.getDocumentURL(), m_documentUI.isConnected());
 
         // create a table in the database
         m_database.createTable(new HsqlTableDescriptor("abc", new HsqlColumnDescriptor[]
@@ -159,18 +170,18 @@ public class ApplicationController extends TestCase
         // load the old document, and verify there is *no* table therein
         impl_switchToDocument(oldDocumentURL);
         m_documentUI.connect();
-        assure("could not connect to " + m_database.getDocumentURL(), m_documentUI.isConnected());
+        assertTrue("could not connect to " + m_database.getDocumentURL(), m_documentUI.isConnected());
         XTablesSupplier suppTables = UnoRuntime.queryInterface( XTablesSupplier.class, m_documentUI.getActiveConnection() );
         XNameAccess tables = suppTables.getTables();
-        assure("the table was created in the wrong database", !tables.hasByName("abc"));
+        assertTrue("the table was created in the wrong database", !tables.hasByName("abc"));
 
         // load the new document, and verify there *is* a table therein
         impl_switchToDocument(newDocumentURL);
         m_documentUI.connect();
-        assure("could not connect to " + m_database.getDocumentURL(), m_documentUI.isConnected());
+        assertTrue("could not connect to " + m_database.getDocumentURL(), m_documentUI.isConnected());
 
         suppTables = UnoRuntime.queryInterface( XTablesSupplier.class, m_documentUI.getActiveConnection() );
         tables = suppTables.getTables();
-        assure("the newly created table has not been written", tables.hasByName("abc"));
+        assertTrue("the newly created table has not been written", tables.hasByName("abc"));
     }
 }