User: obo Date: 2008-07-25 07:48:28+0000 Modified: dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java
Log: 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 File Changes: Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: QueryInQuery.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java?r1=1.6&r2=1.7 Delta lines: +3 -28 -------------------- --- QueryInQuery.java 2008-04-10 12:16:33+0000 1.6 +++ QueryInQuery.java 2008-07-25 07:48:25+0000 1.7 @@ -34,20 +34,15 @@ 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 @@ } // -------------------------------------------------------------------------------------------------------- - 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 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 ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
