Tag: cws_dev300_dba30h User: fs Date: 2008-07-23 13:01:34+0000 Removed: dba/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java dba/dbaccess/qa/complex/dbaccess/Parser.java
Modified: dba/dbaccess/qa/complex/dbaccess/CRMDatabase.java dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java dba/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java dba/dbaccess/qa/complex/dbaccess/dbaccess.sce Log: reverted previous fix - it has been copied to CWS dba30g File Changes: Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [removed]: CRMBasedTestCase.java File [changed]: CRMDatabase.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/CRMDatabase.java?r1=1.6.62.1&r2=1.6.62.2 Delta lines: +7 -23 -------------------- --- CRMDatabase.java 2008-07-21 10:06:09+0000 1.6.62.1 +++ CRMDatabase.java 2008-07-23 13:01:31+0000 1.6.62.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CRMDatabase.java,v $ - * $Revision: 1.6.62.1 $ + * $Revision: 1.6.62.2 $ * * This file is part of OpenOffice.org. * @@ -30,7 +30,6 @@ package complex.dbaccess; import com.sun.star.container.ElementExistException; -import com.sun.star.io.IOException; import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.sdb.XSingleSelectQueryComposer; @@ -86,37 +85,23 @@ } // -------------------------------------------------------------------------------------------------------- - public void close() throws SQLException, IOException + public void close() { - m_database.store(); m_database.close(); } // -------------------------------------------------------------------------------------------------------- private void createTables() throws SQLException { - HsqlTableDescriptor table = new HsqlTableDescriptor( "categories", + HsqlTableDescriptor table = new HsqlTableDescriptor( "products", new HsqlColumnDescriptor[] { new HsqlColumnDescriptor( "ID", "INTEGER", HsqlColumnDescriptor.PRIMARY ), - new HsqlColumnDescriptor( "Name", "VARCHAR(50)" ), - new HsqlColumnDescriptor( "Description", "VARCHAR(1024)" ), - new HsqlColumnDescriptor( "Image", "LONGVARBINARY" ) } ); - m_database.createTable( table, true ); - - m_database.executeSQL( "INSERT INTO \"categories\" ( \"ID\", \"Name\" ) VALUES ( 1, 'Food' )" ); - m_database.executeSQL( "INSERT INTO \"categories\" ( \"ID\", \"Name\" ) VALUES ( 2, 'Furniture' )" ); - - table = new HsqlTableDescriptor( "products", - new HsqlColumnDescriptor[] { - new HsqlColumnDescriptor( "ID", "INTEGER", HsqlColumnDescriptor.PRIMARY ), - new HsqlColumnDescriptor( "Name", "VARCHAR(50)" ), - new HsqlColumnDescriptor( "CategoryID", "INTEGER", HsqlColumnDescriptor.REQUIRED, "categories", "ID" ) } ); + new HsqlColumnDescriptor( "Name", "VARCHAR(50)" ) } ); m_database.createTable( table, true ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 1, 'Oranges', 1 )" ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 2, 'Apples', 1 )" ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 3, 'Pears', 1 )" ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 4, 'Strawberries', 1 )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 1, 'Oranges' )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 2, 'Apples' )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 3, 'Pears' )" ); table = new HsqlTableDescriptor( "customers", new HsqlColumnDescriptor[] { @@ -130,7 +115,6 @@ m_database.executeSQL( "INSERT INTO \"customers\" VALUES(1,'Food, Inc.','Down Under','Melbourne','509') " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(2,'Simply Delicious','Down Under','Melbourne','518') " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(3,'Pure Health','10 Fish St.','San Francisco','94107') " ); - m_database.executeSQL( "INSERT INTO \"customers\" VALUES(4,'Milk And More','Arlington Road 21','Dublin','31021') " ); table = new HsqlTableDescriptor( "orders", new HsqlColumnDescriptor[] { File [removed]: Parser.java File [changed]: QueryInQuery.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java?r1=1.6.62.1&r2=1.6.62.2 Delta lines: +29 -4 -------------------- --- QueryInQuery.java 2008-07-21 10:07:02+0000 1.6.62.1 +++ QueryInQuery.java 2008-07-23 13:01:31+0000 1.6.62.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: QueryInQuery.java,v $ - * $Revision: 1.6.62.1 $ + * $Revision: 1.6.62.2 $ * * This file is part of OpenOffice.org. * @@ -34,15 +34,20 @@ 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 CRMBasedTestCase +public class QueryInQuery extends complexlib.ComplexTestCase { + private CRMDatabase m_database; + // -------------------------------------------------------------------------------------------------------- public String[] getTestMethodNames() { @@ -56,17 +61,24 @@ } // -------------------------------------------------------------------------------------------------------- + private final XMultiServiceFactory getORB() + { + return (XMultiServiceFactory)param.getMSF(); + } + + // -------------------------------------------------------------------------------------------------------- public String getTestObjectName() { return "QueryInQuery"; } // -------------------------------------------------------------------------------------------------------- - protected void createTestCase() + private void createTestCase() { try { - super.createTestCase(); + m_database = new CRMDatabase( getORB() ); + m_database.getDatabase().getDataSource().createQuery( "query products", "SELECT * FROM \"products\"" ); } catch ( Exception e ) @@ -77,6 +89,19 @@ } // -------------------------------------------------------------------------------------------------------- + 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.26.1&r2=1.8.26.2 Delta lines: +74 -52 --------------------- --- SingleSelectQueryComposer.java 2008-07-21 10:07:02+0000 1.8.26.1 +++ SingleSelectQueryComposer.java 2008-07-23 13:01:31+0000 1.8.26.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SingleSelectQueryComposer.java,v $ - * $Revision: 1.8.26.1 $ + * $Revision: 1.8.26.2 $ * * 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 CRMBasedTestCase +public class SingleSelectQueryComposer extends ComplexTestCase { + private CRMDatabase m_database; private XSingleSelectQueryComposer m_composer; private final String complexFilter = "( \"ID\" = 1 AND \"Postal\" = '4' )" + @@ -71,21 +71,43 @@ } // -------------------------------------------------------------------------------------------------------- + private final XMultiServiceFactory getORB() + { + return (XMultiServiceFactory)param.getMSF(); + } + + // -------------------------------------------------------------------------------------------------------- private void createQueries() throws Exception { m_database.getDatabase().getDataSource().createQuery( innerProductsQuery, "SELECT * FROM \"products\"" ); } // -------------------------------------------------------------------------------------------------------- - protected void createTestCase() + public void before() + { + createTestCase(); + } + + // -------------------------------------------------------------------------------------------------------- + public void after() + { + if ( m_database != null ) + m_database.close(); + } + + // -------------------------------------------------------------------------------------------------------- + private void createTestCase() { try { - super.createTestCase(); + m_database = new CRMDatabase( getORB() ); createQueries(); - m_composer = createQueryComposer(); + XMultiServiceFactory connectionFactory = (XMultiServiceFactory)UnoRuntime.queryInterface( + XMultiServiceFactory.class, m_database.getConnection() ); + m_composer = (XSingleSelectQueryComposer)UnoRuntime.queryInterface( + XSingleSelectQueryComposer.class, connectionFactory.createInstance( "com.sun.star.sdb.SingleSelectQueryComposer" ) ); } catch ( Exception e ) File [changed]: dbaccess.sce Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/dbaccess.sce?r1=1.6.18.1&r2=1.6.18.2 Delta lines: +0 -1 ------------------- --- dbaccess.sce 2008-07-21 10:05:22+0000 1.6.18.1 +++ dbaccess.sce 2008-07-23 13:01:31+0000 1.6.18.2 @@ -5,4 +5,3 @@ -o complex.dbaccess.QueryInQuery -o complex.dbaccess.Storable -o complex.dbaccess.DataSource --o complex.dbaccess.Parser --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
