CRMDatabase now has built-in capabilities to load on creation

5 files changed, 6 insertions, 23 deletions

diff --git a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
index d69da173a890..69858f91439f 100644
--- a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
+++ b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
@@ -45,7 +45,7 @@ public abstract class CRMBasedTestCase extends TestCase
     {
         try
         {
-            m_database = new CRMDatabase( getORB() );
+            m_database = new CRMDatabase( getORB(), false );
         }
         catch ( Exception e )
         {
diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index 429ac00f820f..6cb0b7ee4b17 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -67,7 +67,7 @@ public class DataSource extends ComplexTestCase
         {
             if (m_database == null)
             {
-                final CRMDatabase database = new CRMDatabase(getFactory());
+                final CRMDatabase database = new CRMDatabase( getFactory(), false );
                 m_database = database.getDatabase();
                 m_dataSource = m_database.getDataSource();
             }
diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java
index ec13a800ea49..27042767d588 100644
--- a/dbaccess/qa/complex/dbaccess/Query.java
+++ b/dbaccess/qa/complex/dbaccess/Query.java
@@ -63,7 +63,7 @@ public class Query extends complexlib.ComplexTestCase {
         {
             if ( m_database == null )
             {
-                final CRMDatabase database = new CRMDatabase( getFactory() );
+                final CRMDatabase database = new CRMDatabase( getFactory(), false );
                 m_database = database.getDatabase();
             }
         }
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index e519d1737eb6..734ae25c56f9 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -145,7 +145,7 @@ public class RowSet extends ComplexTestCase
         {
             try
             {
-                final CRMDatabase database = new CRMDatabase(getFactory());
+                final CRMDatabase database = new CRMDatabase( getFactory(), false );
                 m_database = database.getDatabase();
                 m_dataSource = m_database.getDataSource();
             }
diff --git a/dbaccess/qa/complex/dbaccess/UISettings.java b/dbaccess/qa/complex/dbaccess/UISettings.java
index 2f2d6f985255..92be58f28dd6 100644
--- a/dbaccess/qa/complex/dbaccess/UISettings.java
+++ b/dbaccess/qa/complex/dbaccess/UISettings.java
@@ -60,29 +60,12 @@ public class UISettings extends TestCase
     }
 
     // --------------------------------------------------------------------------------------------------------
-    private CRMDatabase impl_createConnectedDatabaseDocument() throws Exception
-    {
-        final CRMDatabase database = new CRMDatabase( getORB() );
-
-        // load the document
-        String docURL = database.getDatabase().getDocumentURL();
-        XModel doc = loadDocument( docURL );
-
-        // establish the connection
-        XDatabaseDocumentUI docUI = UnoRuntime.queryInterface( XDatabaseDocumentUI.class,
-            doc.getCurrentController() );
-        docUI.connect();
-
-        return database;
-    }
-
-    // --------------------------------------------------------------------------------------------------------
     /** verifies that aliases for inner queries work as expected
      */
     public void checkTableFormattingPersistence() throws java.lang.Exception
     {
         // create, load, and connect a DB doc
-        CRMDatabase database = impl_createConnectedDatabaseDocument();
+        CRMDatabase database = new CRMDatabase( getORB(), true );
 
         // display a table
         XFormController tableViewController = UnoRuntime.queryInterface( XFormController.class,
@@ -134,7 +117,7 @@ public class UISettings extends TestCase
     public void checkTransparentQueryColumnSettings() throws java.lang.Exception
     {
         // create, load, and connect a DB doc
-        CRMDatabase database = impl_createConnectedDatabaseDocument();
+        CRMDatabase database = new CRMDatabase( getORB(), true );
 
         // display a table
         XController tableView = database.loadSubComponent( DatabaseObject.TABLE, "customers" );