INTEGRATION: CWS dba30g (1.6.58); FILE MERGED

2008/07/22 06:53:02 fs 1.6.58.1: copying following changes from CWS dba30h to CWS dba30g:
2008/07/21 10:07:02 fs 1.6.62.1: #i91857# base on CRMBasedTestCase

1 files changed, 4 insertions, 29 deletions

diff --git a/dbaccess/qa/complex/dbaccess/QueryInQuery.java b/dbaccess/qa/complex/dbaccess/QueryInQuery.java
index 02123771ace2..c9d3e02a0b80 100644
--- a/dbaccess/qa/complex/dbaccess/QueryInQuery.java
+++ b/dbaccess/qa/complex/dbaccess/QueryInQuery.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: QueryInQuery.java,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,20 +34,15 @@ import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.CommandType;
-import com.sun.star.sdb.ErrorCondition;
-import com.sun.star.sdb.XSingleSelectQueryComposer;
 import com.sun.star.sdbc.SQLException;
-import com.sun.star.uno.UnoRuntime;
 import connectivity.tools.HsqlColumnDescriptor;
 import connectivity.tools.HsqlTableDescriptor;
 import connectivity.tools.RowSet;
 import com.sun.star.sdbc.XStatement;
 import com.sun.star.sdbc.XResultSet;
 
-public class QueryInQuery extends complexlib.ComplexTestCase
+public class QueryInQuery extends CRMBasedTestCase
 {
-    private CRMDatabase                 m_database;
-
     // --------------------------------------------------------------------------------------------------------
     public String[] getTestMethodNames()
     {
@@ -61,24 +56,17 @@ public class QueryInQuery extends complexlib.ComplexTestCase
     }
 
     // --------------------------------------------------------------------------------------------------------
-    private final XMultiServiceFactory getORB()
-    {
-        return (XMultiServiceFactory)param.getMSF();
-    }
-
-    // --------------------------------------------------------------------------------------------------------
     public String getTestObjectName()
     {
         return "QueryInQuery";
     }
 
     // --------------------------------------------------------------------------------------------------------
-    private void createTestCase()
+    protected void createTestCase()
     {
         try
         {
-            m_database = new CRMDatabase( getORB() );
-
+            super.createTestCase();
             m_database.getDatabase().getDataSource().createQuery( "query products", "SELECT * FROM \"products\"" );
         }
         catch ( Exception e )
@@ -89,19 +77,6 @@ public class QueryInQuery extends complexlib.ComplexTestCase
     }
 
     // --------------------------------------------------------------------------------------------------------
-    public void before()
-    {
-        createTestCase();
-    }
-
-    // --------------------------------------------------------------------------------------------------------
-    public void after()
-    {
-        if ( m_database != null )
-            m_database.close();
-    }
-
-    // --------------------------------------------------------------------------------------------------------
     private void verifyEqualRowSetContent( int _outerCommandType, String _outerCommand, int _innerCommandType, String _innerCommand ) throws SQLException
     {
         RowSet outerRowSet = m_database.getDatabase().createRowSet( _outerCommandType, _outerCommand );