Tag: cws_dev300_dba30h User: fs Date: 2008-07-21 10:07:05+0000 Modified: dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java dba/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
Log: #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.6.62.1 Delta lines: +5 -30 -------------------- --- QueryInQuery.java 2008-04-10 12:16:33+0000 1.6 +++ QueryInQuery.java 2008-07-21 10:07:02+0000 1.6.62.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: QueryInQuery.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.62.1 $ * * This file is part of OpenOffice.org. * @@ -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 ); File [changed]: SingleSelectQueryComposer.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java?r1=1.8&r2=1.8.26.1 Delta lines: +53 -75 --------------------- --- SingleSelectQueryComposer.java 2008-06-16 12:30:05+0000 1.8 +++ SingleSelectQueryComposer.java 2008-07-21 10:07:02+0000 1.8.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SingleSelectQueryComposer.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.26.1 $ * * This file is part of OpenOffice.org. * @@ -37,13 +37,13 @@ import com.sun.star.container.*; import com.sun.star.lang.XMultiServiceFactory; -import complexlib.ComplexTestCase; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.logging.Level; +import java.util.logging.Logger; -public class SingleSelectQueryComposer extends ComplexTestCase +public class SingleSelectQueryComposer extends CRMBasedTestCase { - private CRMDatabase m_database; private XSingleSelectQueryComposer m_composer; private final String complexFilter = "( \"ID\" = 1 AND \"Postal\" = '4' )" + @@ -71,43 +71,21 @@ } // -------------------------------------------------------------------------------------------------------- - private final XMultiServiceFactory getORB() - { - return (XMultiServiceFactory)param.getMSF(); - } - - // -------------------------------------------------------------------------------------------------------- private void createQueries() throws Exception { m_database.getDatabase().getDataSource().createQuery( innerProductsQuery, "SELECT * FROM \"products\"" ); } // -------------------------------------------------------------------------------------------------------- - public void before() - { - createTestCase(); - } - - // -------------------------------------------------------------------------------------------------------- - public void after() - { - if ( m_database != null ) - m_database.close(); - } - - // -------------------------------------------------------------------------------------------------------- - private void createTestCase() + protected void createTestCase() { try { - m_database = new CRMDatabase( getORB() ); + super.createTestCase(); createQueries(); - XMultiServiceFactory connectionFactory = (XMultiServiceFactory)UnoRuntime.queryInterface( - XMultiServiceFactory.class, m_database.getConnection() ); - m_composer = (XSingleSelectQueryComposer)UnoRuntime.queryInterface( - XSingleSelectQueryComposer.class, connectionFactory.createInstance( "com.sun.star.sdb.SingleSelectQueryComposer" ) ); + m_composer = createQueryComposer(); } catch ( Exception e ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
