You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(7) |
Aug
(37) |
Sep
|
Oct
|
Nov
(1) |
Dec
(22) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(8) |
Feb
(68) |
Mar
(72) |
Apr
(149) |
May
(32) |
Jun
(46) |
Jul
(26) |
Aug
(59) |
Sep
(25) |
Oct
(18) |
Nov
(4) |
Dec
(3) |
2004 |
Jan
(90) |
Feb
(19) |
Mar
(38) |
Apr
(41) |
May
(44) |
Jun
(2) |
Jul
(10) |
Aug
|
Sep
(14) |
Oct
|
Nov
(1) |
Dec
|
2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(15) |
Jun
(1) |
Jul
|
Aug
(9) |
Sep
|
Oct
(17) |
Nov
|
Dec
|
2006 |
Jan
(1) |
Feb
(16) |
Mar
|
Apr
(1) |
May
(48) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(29) |
2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
(23) |
Mar
(31) |
Apr
|
May
(26) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
(7) |
Oct
(1) |
Nov
(8) |
Dec
(8) |
2009 |
Jan
(5) |
Feb
(9) |
Mar
(1) |
Apr
|
May
(23) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
(9) |
Oct
(28) |
Nov
(18) |
Dec
(8) |
2010 |
Jan
(19) |
Feb
(24) |
Mar
(3) |
Apr
|
May
(5) |
Jun
(4) |
Jul
|
Aug
(1) |
Sep
(11) |
Oct
|
Nov
(2) |
Dec
(1) |
2011 |
Jan
|
Feb
(7) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(32) |
Oct
(6) |
Nov
|
Dec
|
From: <mla...@us...> - 2002-08-03 02:26:46
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/test/org/dbunit/database Modified Files: DatabaseDataSetTest.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: DatabaseDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DatabaseDataSetTest.java 13 Jun 2002 17:24:59 -0000 1.13 --- DatabaseDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.14 *************** *** 28,31 **** --- 28,33 ---- import java.util.Arrays; + import java.util.Comparator; + import java.lang.reflect.Array; /** *************** *** 67,73 **** } protected void sort(Object[] array) { ! Arrays.sort(array); } --- 69,98 ---- } + protected IDataSet createDuplicateDataSet() throws Exception + { + throw new UnsupportedOperationException(); + } + protected void sort(Object[] array) { ! if (ITable[].class.isInstance(array)) ! { ! Arrays.sort(array, new TableComparator()); ! } ! else ! { ! Arrays.sort(array); ! } ! } ! ! private class TableComparator implements Comparator ! { ! public int compare(Object o1, Object o2) ! { ! String name1 = ((ITable)o1).getTableMetaData().getTableName(); ! String name2 = ((ITable)o2).getTableMetaData().getTableName(); ! ! return name1.compareTo(name2); ! } } *************** *** 200,203 **** --- 225,247 ---- // } + public void testGetDuplicateTable() throws Exception + { + // Cannot test! Unsuported feature. + } + + public void testGetDuplicateTableMetaData() throws Exception + { + // Cannot test! Unsuported feature. + } + + public void testGetDuplicateTableNames() throws Exception + { + // Cannot test! Unsuported feature. + } + + public void testGetDuplicateTables() throws Exception + { + // Cannot test! Unsuported feature. + } } |
From: <mla...@us...> - 2002-08-03 02:26:46
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/java/org/dbunit/operation Modified Files: RefreshOperation.java DeleteAllOperation.java AbstractBatchOperation.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: RefreshOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** RefreshOperation.java 13 Jun 2002 17:24:58 -0000 1.18 --- RefreshOperation.java 3 Aug 2002 02:26:41 -0000 1.19 *************** *** 139,148 **** // for each table ! ITable[] tables = DataSetUtils.getTables(dataSet); for (int i = 0; i < tables.length; i++) { // do not process empty table ! String tableName = tables[i].getTableMetaData().getTableName(); ! ITable table = dataSet.getTable(tableName); if (table.getRowCount() == 0) { --- 139,147 ---- // for each table ! ITable[] tables = dataSet.getTables(); for (int i = 0; i < tables.length; i++) { // do not process empty table ! ITable table = tables[i]; if (table.getRowCount() == 0) { *************** *** 151,155 **** ITableMetaData metaData = AbstractBatchOperation.getOperationMetaData( ! connection, dataSet.getTableMetaData(tableName)); // setup select count statement --- 150,154 ---- ITableMetaData metaData = AbstractBatchOperation.getOperationMetaData( ! connection, table.getTableMetaData()); // setup select count statement Index: DeleteAllOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteAllOperation.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DeleteAllOperation.java 13 Jun 2002 17:24:57 -0000 1.10 --- DeleteAllOperation.java 3 Aug 2002 02:26:41 -0000 1.11 *************** *** 61,71 **** for (int i = 0; i < tableNames.length; i++) { - String name = tableNames[i]; - ITableMetaData metaData = dataSet.getTableMetaData(name); - StringBuffer sqlBuffer = new StringBuffer(128); sqlBuffer.append("delete from "); sqlBuffer.append(DataSetUtils.getQualifiedName( ! connection.getSchema(), metaData.getTableName())); statement.addBatch(sqlBuffer.toString()); } --- 61,68 ---- for (int i = 0; i < tableNames.length; i++) { StringBuffer sqlBuffer = new StringBuffer(128); sqlBuffer.append("delete from "); sqlBuffer.append(DataSetUtils.getQualifiedName( ! connection.getSchema(), tableNames[i])); statement.addBatch(sqlBuffer.toString()); } Index: AbstractBatchOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AbstractBatchOperation.java 13 Jun 2002 17:24:57 -0000 1.14 --- AbstractBatchOperation.java 3 Aug 2002 02:26:41 -0000 1.15 *************** *** 96,107 **** { IStatementFactory factory = connection.getStatementFactory(); ! String[] tableNames = getTableNames(dataSet); // for each table ! for (int i = 0; i < tableNames.length; i++) { // do not process empty table ! String tableName = tableNames[i]; ! ITable table = dataSet.getTable(tableName); if (table.getRowCount() == 0) { --- 96,107 ---- { IStatementFactory factory = connection.getStatementFactory(); ! ITable[] tables = dataSet.getTables(); ! // String[] tableNames = getTableNames(dataSet); // for each table ! for (int i = 0; i < tables.length; i++) { // do not process empty table ! ITable table = tables[i]; if (table.getRowCount() == 0) { *************** *** 109,114 **** } ITableMetaData metaData = getOperationMetaData(connection, ! dataSet.getTableMetaData(tableName)); OperationData operationData = getOperationData( connection.getSchema(), metaData); --- 109,115 ---- } + // String tableName = tableNames[i]; ITableMetaData metaData = getOperationMetaData(connection, ! table.getTableMetaData()); OperationData operationData = getOperationData( connection.getSchema(), metaData); |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit Modified Files: dbunit.ipr Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: dbunit.ipr =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** dbunit.ipr 17 Jul 2002 01:55:20 -0000 1.46 --- dbunit.ipr 3 Aug 2002 02:26:41 -0000 1.47 *************** *** 273,277 **** <option name="TEST_RUNNER" value="Text" /> </configuration> ! <configuration name="FilteredDataSetTest" type="JUnit" default="false" selected="true"> <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.FilteredDataSetTest" /> <option name="VM_PARAMETERS" /> --- 273,277 ---- <option name="TEST_RUNNER" value="Text" /> </configuration> ! <configuration name="FilteredDataSetTest" type="JUnit" default="false" selected="false"> <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.FilteredDataSetTest" /> <option name="VM_PARAMETERS" /> *************** *** 279,282 **** --- 279,360 ---- <option name="TEST_RUNNER" value="Text" /> </configuration> + <configuration name="FlatDtdDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatDtdDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="FlatXmlDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatXmlDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="XmlDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.XmlDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="FlatXmlTableWriteTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatXmlTableWriteTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="CaseInsensitiveDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.CaseInsensitiveDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="CompositeDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.CompositeDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="DefaultDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.DefaultDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="DatabaseDataSetTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseDataSetTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="DeleteOperationTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.DeleteOperationTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="InsertOperationTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.InsertOperationTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="UpdateOperationTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.UpdateOperationTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="DeleteAllOperationTest" type="JUnit" default="false" selected="false"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.DeleteAllOperationTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> + <configuration name="RefreshOperationTest" type="JUnit" default="false" selected="true"> + <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.RefreshOperationTest" /> + <option name="VM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="TEST_RUNNER" value="Text" /> + </configuration> </component> <component class="com.intellij.ide.SelectInManager"> *************** *** 296,320 **** <component class="com.intellij.ide.desktop.IdeDocumentManager"> <recent_files> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" column="47" line="65" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" column="54" line="173" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/AbstractDatabaseConnection.java" column="30" line="99" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/ITable.java" column="17" line="31" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DataSetUtils.java" column="36" line="186" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteAllOperationTest.java" column="0" line="106" /> ! <file_info url="jar://J:/jdk1.3.1_03/src.jar!/src/java/util/Arrays.java" column="22" line="1539" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/AbstractDataSetTest.java" column="0" line="113" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" column="20" line="46" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/AllTests.java" column="23" line="33" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractTable.java" column="0" line="44" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" column="45" line="106" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AllTests.java" column="0" line="36" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" column="19" line="24" /> ! <file_info url="file://$PROJECT_DIR$/build.xml" column="50" line="139" /> </recent_files> - <open_files> - <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" column="19" line="24" /> - <file_info url="file://$PROJECT_DIR$/build.xml" column="50" line="139" /> - <active_file url="file://$PROJECT_DIR$/build.xml" /> - </open_files> </component> <component class="com.intellij.ide.hierarchy.HierarchyBrowserManager"> --- 374,393 ---- <component class="com.intellij.ide.desktop.IdeDocumentManager"> <recent_files> ! <file_info url="file://$PROJECT_DIR$/src/xml/flatXmlDataSetDuplicateTest.xml" column="5" line="2" /> ! <file_info url="file://$PROJECT_DIR$/src/xml/compositeDataSetDuplicateTest1.xml" column="5" line="2" /> ! <file_info url="file://$PROJECT_DIR$/src/xml/caseInsensitiveDataSetDuplicateTest.xml" column="14" line="2" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" column="29" line="65" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="32" line="160" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteOperation.java" column="13" line="35" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" column="40" line="129" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/AbstractBatchOperation.java" column="0" line="56" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteOperationTest.java" column="0" line="205" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/statement/IStatementFactory.java" column="17" line="32" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteAllOperationTest.java" column="41" line="89" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteAllOperation.java" column="21" line="53" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/RefreshOperationTest.java" column="9" line="88" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="0" line="108" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/RefreshOperation.java" column="16" line="111" /> </recent_files> </component> <component class="com.intellij.ide.hierarchy.HierarchyBrowserManager"> *************** *** 329,342 **** <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> <expanded_node type="directory" url="file://$PROJECT_DIR$" /> </navigator> <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true"> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" /> - <expanded_node type="class" url="org.dbunit.dataset.FilteredDataSet" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" /> </navigator> </component> --- 402,410 ---- <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> <expanded_node type="directory" url="file://$PROJECT_DIR$" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/xml" /> </navigator> <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true"> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> </navigator> </component> |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/java/org/dbunit/dataset/xml Modified Files: FlatDtdDataSet.java FlatXmlDataSet.java XmlDataSet.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: FlatDtdDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FlatDtdDataSet.java 13 Jun 2002 17:24:57 -0000 1.2 --- FlatDtdDataSet.java 3 Aug 2002 02:26:40 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; + import org.dbunit.database.AmbiguousTableNameException; import java.io.*; *************** *** 145,148 **** --- 146,154 ---- public ITable getTable(String tableName) throws DataSetException { + if (_tableNames.indexOf(tableName) != _tableNames.lastIndexOf(tableName)) + { + throw new AmbiguousTableNameException(tableName); + } + ITable table = (ITable)_tableMap.get(tableName); if (table == null) *************** *** 153,156 **** --- 159,182 ---- return table; } + + public ITable[] getTables() throws DataSetException + { + String[] names = (String[])_tableNames.toArray(new String[0]); + ITable[] tables = new ITable[names.length]; + for (int i = 0; i < names.length; i++) + { + String tableName = names[i]; + ITable table = (ITable)_tableMap.get(tableName); + if (table == null) + { + throw new NoSuchTableException(tableName); + } + + tables[i] = table; + } + + return tables; + } + } Index: FlatXmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FlatXmlDataSet.java 13 Jun 2002 17:24:57 -0000 1.16 --- FlatXmlDataSet.java 3 Aug 2002 02:26:40 -0000 1.17 *************** *** 171,175 **** { Document document = new Document(); ! String[] tableNames = dataSet.getTableNames(); // dataset --- 171,176 ---- { Document document = new Document(); ! ITable[] tables = dataSet.getTables(); ! // String[] tableNames = dataSet.getTableNames(); // dataset *************** *** 177,184 **** // tables ! for (int i = 0; i < tableNames.length; i++) { ! String tableName = tableNames[i]; ! ITable table = dataSet.getTable(tableName); Column[] columns = table.getTableMetaData().getColumns(); --- 178,187 ---- // tables ! for (int i = 0; i < tables.length; i++) { ! ITable table = tables[i]; ! ITableMetaData metaData = tables[i].getTableMetaData(); ! String tableName = metaData.getTableName(); ! Column[] columns = table.getTableMetaData().getColumns(); *************** *** 301,309 **** //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITable[] getTables() throws DataSetException { ! return _tables; } --- 304,312 ---- //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } Index: XmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlDataSet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** XmlDataSet.java 13 Jun 2002 17:24:57 -0000 1.11 --- XmlDataSet.java 3 Aug 2002 02:26:40 -0000 1.12 *************** *** 100,112 **** { Document document = new Document(); ! String[] tableNames = dataSet.getTableNames(); // dataset Element rootElem = document.addElement("dataset"); ! for (int i = 0; i < tableNames.length; i++) { ! String tableName = tableNames[i]; ! ITable table = dataSet.getTable(tableName); ! ITableMetaData metaData = table.getTableMetaData(); // table --- 100,112 ---- { Document document = new Document(); ! ITable[] tables = dataSet.getTables(); // dataset Element rootElem = document.addElement("dataset"); ! for (int i = 0; i < tables.length; i++) { ! ITable table = tables[i]; ! ITableMetaData metaData = tables[i].getTableMetaData(); ! String tableName = metaData.getTableName(); // table *************** *** 175,183 **** //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITable[] getTables() throws DataSetException { ! return _tables; } --- 175,183 ---- //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/test/org/dbunit Modified Files: Main.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: Main.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/Main.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Main.java 4 Jul 2002 21:33:43 -0000 1.22 --- Main.java 3 Aug 2002 02:26:40 -0000 1.23 *************** *** 24,27 **** --- 24,32 ---- import org.dbunit.database.IDatabaseConnection; + import org.dbunit.dataset.xml.XmlDataSet; + import org.dbunit.dataset.xml.FlatXmlDataSet; + + import java.io.FileOutputStream; + import java.io.FileInputStream; /** *************** *** 46,49 **** --- 51,57 ---- // connection.createDataSet()), // new FileOutputStream("test.xml")); + FlatXmlDataSet.write(new FlatXmlDataSet( + new FileInputStream("P:/dbunit-cvs/dbunit/src/xml/flatXmlDataSetDuplicateTest.xml")), + new FileOutputStream("flattest.xml")); |
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/java/org/dbunit/dataset Modified Files: DataSetUtils.java CompositeDataSet.java DefaultDataSet.java AbstractDataSet.java IDataSet.java CaseInsensitiveDataSet.java FilteredDataSet.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: DataSetUtils.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DataSetUtils.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DataSetUtils.java 13 Jun 2002 17:24:56 -0000 1.11 --- DataSetUtils.java 3 Aug 2002 02:26:40 -0000 1.12 *************** *** 203,207 **** public static ITable[] getTables(IDataSet dataSet) throws DataSetException { ! return getTables(dataSet.getTableNames(), dataSet); } --- 203,208 ---- public static ITable[] getTables(IDataSet dataSet) throws DataSetException { ! // return getTables(dataSet.getTableNames(), dataSet); ! return dataSet.getTables(); } Index: CompositeDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CompositeDataSet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CompositeDataSet.java 13 Jun 2002 17:24:56 -0000 1.9 --- CompositeDataSet.java 3 Aug 2002 02:26:40 -0000 1.10 *************** *** 32,42 **** public class CompositeDataSet extends AbstractDataSet { ! private final ITable[] _tables; /** * Creates a composite dataset that combines specified datasets. */ public CompositeDataSet(IDataSet[] dataSets) throws DataSetException { List tableList = new ArrayList(); for (int i = 0; i < dataSets.length; i++) --- 32,58 ---- public class CompositeDataSet extends AbstractDataSet { ! private ITable[] _tables; /** * Creates a composite dataset that combines specified datasets. + * Tables having the same name are merged into one table. */ public CompositeDataSet(IDataSet[] dataSets) throws DataSetException { + this(dataSets, true); + } + + /** + * Creates a composite dataset that combines specified datasets. + * + * @param dataSets + * list of datasets + * @param combine + * if <code>true</code>, tables having the same name are merged into + * one table. + */ + public CompositeDataSet(IDataSet[] dataSets, boolean combine) + throws DataSetException + { List tableList = new ArrayList(); for (int i = 0; i < dataSets.length; i++) *************** *** 50,58 **** } ! _tables = combineTables((ITable[])tableList.toArray(new ITable[0])); } /** * Creates a composite dataset that combines the two specified datasets. */ public CompositeDataSet(IDataSet dataSet1, IDataSet dataSet2) --- 66,79 ---- } ! _tables = (ITable[])tableList.toArray(new ITable[0]); ! if (combine) ! { ! _tables = combineTables(_tables); ! } } /** * Creates a composite dataset that combines the two specified datasets. + * Tables having the same name are merged into one table. */ public CompositeDataSet(IDataSet dataSet1, IDataSet dataSet2) *************** *** 63,67 **** --- 84,106 ---- /** + * Creates a composite dataset that combines the two specified datasets. + * + * @param dataSet1 + * first dataset + * @param dataSet2 + * second dataset + * @param combine + * if <code>true</code>, tables having the same name are merged into + * one table. + */ + public CompositeDataSet(IDataSet dataSet1, IDataSet dataSet2, boolean combine) + throws DataSetException + { + this(new IDataSet[]{dataSet1, dataSet2}, combine); + } + + /** * Creates a composite dataset that combines tables having identical name. + * Tables having the same name are merged into one table. */ public CompositeDataSet(ITable[] tables) throws DataSetException *************** *** 113,121 **** //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITable[] getTables() throws DataSetException { ! return _tables; } } --- 152,160 ---- //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } } Index: DefaultDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DefaultDataSet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DefaultDataSet.java 13 Jun 2002 17:24:56 -0000 1.7 --- DefaultDataSet.java 3 Aug 2002 02:26:40 -0000 1.8 *************** *** 43,51 **** //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITable[] getTables() throws DataSetException { ! return _tables; } } --- 43,51 ---- //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } } Index: AbstractDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/AbstractDataSet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AbstractDataSet.java 13 Jun 2002 17:24:56 -0000 1.7 --- AbstractDataSet.java 3 Aug 2002 02:26:40 -0000 1.8 *************** *** 23,26 **** --- 23,28 ---- package org.dbunit.dataset; + import org.dbunit.database.AmbiguousTableNameException; + import java.util.Arrays; *************** *** 35,44 **** public abstract class AbstractDataSet implements IDataSet { ! ! /** ! * Returns this dataset tables. This template method must be implemented by ! * subclass. ! */ ! protected abstract ITable[] getTables() throws DataSetException; //////////////////////////////////////////////////////////////////////////// --- 37,49 ---- public abstract class AbstractDataSet implements IDataSet { ! protected ITable[] cloneTables(ITable[] tables) ! { ! ITable[] clones = new ITable[tables.length]; ! for (int i = 0; i < tables.length; i++) ! { ! clones[i] = tables[i]; ! } ! return clones; ! } //////////////////////////////////////////////////////////////////////////// *************** *** 64,67 **** --- 69,73 ---- public ITable getTable(String tableName) throws DataSetException { + ITable found = null; ITable[] tables = getTables(); for (int i = 0; i < tables.length; i++) *************** *** 70,75 **** if (tableName.equals(table.getTableMetaData().getTableName())) { ! return table; } } --- 76,91 ---- if (tableName.equals(table.getTableMetaData().getTableName())) { ! if (found != null) ! { ! throw new AmbiguousTableNameException(tableName); ! } ! ! found = table; } + } + + if (found != null) + { + return found; } Index: IDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/IDataSet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** IDataSet.java 13 Jun 2002 17:24:56 -0000 1.7 --- IDataSet.java 3 Aug 2002 02:26:40 -0000 1.8 *************** *** 32,37 **** { /** ! * Returns table names this dataset contains. ! * */ public String[] getTableNames() throws DataSetException; --- 32,38 ---- { /** ! * Returns table names this dataset contains. Multiple occurence of a name ! * may be present in the returned list if the dataset contains multiple ! * tables having the same name. */ public String[] getTableNames() throws DataSetException; *************** *** 39,42 **** --- 40,49 ---- /** * Returns the specified table metatdata. + * + * @throws AmbiguousTableNameException if dataset contains multiple tables + * having the specified name. Use {@link getTables} to access + * to all tables. + * @throws NoSuchTableException if dataset do not contains the specified + * table */ public ITableMetaData getTableMetaData(String tableName) *************** *** 45,50 **** --- 52,69 ---- /** * Returns the specified table. + * + * @throws AmbiguousTableNameException if dataset contains multiple tables + * having the specified name. Use {@link getTables} to access + * to all tables. + * @throws NoSuchTableException if dataset do not contains the specified + * table */ public ITable getTable(String tableName) throws DataSetException; + + /** + * Returns tables contained by this dataset. Multiple table having the same + * name but different data may be returned. + */ + public ITable[] getTables() throws DataSetException; } Index: CaseInsensitiveDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CaseInsensitiveDataSet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CaseInsensitiveDataSet.java 13 Jun 2002 17:24:56 -0000 1.4 --- CaseInsensitiveDataSet.java 3 Aug 2002 02:26:40 -0000 1.5 *************** *** 11,14 **** --- 11,16 ---- package org.dbunit.dataset; + import org.dbunit.database.AmbiguousTableNameException; + /** * Allows access to a decorated dataset in a case insensitive way. Dataset *************** *** 30,33 **** --- 32,36 ---- private String getInternalTableName(String tableName) throws DataSetException { + String found = null; String[] names = _dataSet.getTableNames(); for (int i = 0; i < names.length; i++) *************** *** 35,42 **** if (tableName.equalsIgnoreCase(names[i])) { ! return names[i]; } } throw new NoSuchTableException(tableName); } --- 38,54 ---- if (tableName.equalsIgnoreCase(names[i])) { ! if (found != null) ! { ! throw new AmbiguousTableNameException(tableName); ! } ! found = names[i]; } } + if (found != null) + { + return found; + } + throw new NoSuchTableException(tableName); } *************** *** 60,63 **** --- 72,80 ---- ITable table = _dataSet.getTable(getInternalTableName(tableName)); return new CaseInsensitiveTable(table); + } + + public ITable[] getTables() throws DataSetException + { + return _dataSet.getTables(); } } Index: FilteredDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/FilteredDataSet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FilteredDataSet.java 4 Jul 2002 21:33:43 -0000 1.9 --- FilteredDataSet.java 3 Aug 2002 02:26:40 -0000 1.10 *************** *** 23,26 **** --- 23,28 ---- package org.dbunit.dataset; + import org.dbunit.database.AmbiguousTableNameException; + import java.util.Arrays; *************** *** 47,61 **** } ! protected void assertValidTableName(String tableName) throws NoSuchTableException { for (int i = 0; i < _tableNames.length; i++) { if (tableName.equals(_tableNames[i])) { ! return; } } ! throw new NoSuchTableException(tableName); } --- 49,71 ---- } ! protected void assertValidTableName(String tableName) throws DataSetException { + boolean found = false; for (int i = 0; i < _tableNames.length; i++) { if (tableName.equals(_tableNames[i])) { ! if (found) ! { ! throw new AmbiguousTableNameException(tableName); ! } ! found = true; } } ! if (!found) ! { ! throw new NoSuchTableException(tableName); ! } } *************** *** 79,82 **** --- 89,102 ---- assertValidTableName(tableName); return _dataSet.getTable(tableName); + } + + public ITable[] getTables() throws DataSetException + { + ITable[] tables = new ITable[_tableNames.length]; + for (int i = 0; i < tables.length; i++) + { + tables[i] = _dataSet.getTable(_tableNames[i]); + } + return tables; } |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/java/org/dbunit/operation/mssqlserver Modified Files: InsertIdentityOperation.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: InsertIdentityOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** InsertIdentityOperation.java 13 Jun 2002 17:24:58 -0000 1.8 --- InsertIdentityOperation.java 3 Aug 2002 02:26:41 -0000 1.9 *************** *** 107,120 **** // Execute decorated operation one table at a time ! String[] tableNames = dataSet.getTableNames(); ! for (int i = 0; i < tableNames.length; i++) { ! ITable table = dataSet.getTable(tableNames[i]); String tableName = DataSetUtils.getQualifiedName( ! connection.getSchema(), tableNames[i]); // enable identity insert - ITableMetaData databaseMetaData = databaseDataSet.getTableMetaData(tableNames[i]); - boolean hasIdentityColumn = hasIdentityColumn(databaseMetaData); if (hasIdentityColumn) --- 107,119 ---- // Execute decorated operation one table at a time ! ITable[] tables = dataSet.getTables(); ! for (int i = 0; i < tables.length; i++) { ! ITable table = tables[i]; ! ITableMetaData databaseMetaData = table.getTableMetaData(); String tableName = DataSetUtils.getQualifiedName( ! connection.getSchema(), databaseMetaData.getTableName()); // enable identity insert boolean hasIdentityColumn = hasIdentityColumn(databaseMetaData); if (hasIdentityColumn) |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/test/org/dbunit/dataset/xml Modified Files: FlatXmlDataSetTest.java FlatDtdDataSetTest.java XmlDataSetTest.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: FlatXmlDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatXmlDataSetTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FlatXmlDataSetTest.java 13 Jun 2002 17:25:00 -0000 1.9 --- FlatXmlDataSetTest.java 3 Aug 2002 02:26:40 -0000 1.10 *************** *** 46,80 **** } public void testWrite() throws Exception { List tableList = new ArrayList(); ! IDataSet dataSet = createDataSet(); File tempFile = File.createTempFile("flatXmlDataSetTest", ".xml"); try { OutputStream out = new FileOutputStream(tempFile); try { // write dataset in temp file ! FlatXmlDataSet.write(dataSet, out); // load new dataset from temp file ! FlatXmlDataSet xmlDataSet2 = new FlatXmlDataSet( ! new FileInputStream(tempFile)); // verify table count ! assertEquals("table count", dataSet.getTableNames().length, ! xmlDataSet2.getTableNames().length); // verify each table ! String[] tableNames = dataSet.getTableNames(); ! for (int i = 0; i < tableNames.length; i++) { ! String name = tableNames[i]; ! ITable table1 = dataSet.getTable(name); ! ITable table2 = xmlDataSet2.getTable(name); ! assertTrue("not same instance", table1 != table2); ! Assertion.assertEquals(table1, table2); } } --- 46,133 ---- } + protected IDataSet createDuplicateDataSet() throws Exception + { + return new FlatXmlDataSet( + new FileInputStream("src/xml/flatXmlDataSetDuplicateTest.xml")); + } + + // public void testWrite() throws Exception + // { + // List tableList = new ArrayList(); + // + // IDataSet dataSet = createDataSet(); + // File tempFile = File.createTempFile("flatXmlDataSetTest", ".xml"); + // try + // { + // OutputStream out = new FileOutputStream(tempFile); + // try + // { + // // write dataset in temp file + // FlatXmlDataSet.write(dataSet, out); + // + // // load new dataset from temp file + // FlatXmlDataSet xmlDataSet2 = new FlatXmlDataSet( + // new FileInputStream(tempFile)); + // + // // verify table count + // assertEquals("table count", dataSet.getTableNames().length, + // xmlDataSet2.getTableNames().length); + // + // // verify each table + // String[] tableNames = dataSet.getTableNames(); + // for (int i = 0; i < tableNames.length; i++) + // { + // String name = tableNames[i]; + // ITable table1 = dataSet.getTable(name); + // ITable table2 = xmlDataSet2.getTable(name); + // assertTrue("not same instance", table1 != table2); + // Assertion.assertEquals(table1, table2); + // } + // } + // finally + // { + // out.close(); + // } + // } + // finally + // { + // tempFile.delete(); + // } + // } + public void testWrite() throws Exception { List tableList = new ArrayList(); ! IDataSet expectedDataSet = (FlatXmlDataSet)createDataSet(); File tempFile = File.createTempFile("flatXmlDataSetTest", ".xml"); try { OutputStream out = new FileOutputStream(tempFile); + try { // write dataset in temp file ! FlatXmlDataSet.write(expectedDataSet, out); // load new dataset from temp file ! IDataSet actualDataSet = new FlatXmlDataSet(new FileInputStream(tempFile)); // verify table count ! assertEquals("table count", expectedDataSet.getTableNames().length, ! actualDataSet.getTableNames().length); // verify each table ! ITable[] expected = expectedDataSet.getTables(); ! ITable[] actual = actualDataSet.getTables(); ! assertEquals("table count", expected.length, actual.length); ! for (int i = 0; i < expected.length; i++) { ! String expectedName = expected[i].getTableMetaData().getTableName(); ! String actualName = actual[i].getTableMetaData().getTableName(); ! assertEquals("table name", expectedName, actualName); ! ! assertTrue("not same instance", expected[i] != actual[i]); ! Assertion.assertEquals(expected[i], actual[i]); } } *************** *** 90,93 **** --- 143,192 ---- } + public void testDuplicateWrite() throws Exception + { + List tableList = new ArrayList(); + + IDataSet expectedDataSet = createDuplicateDataSet(); + File tempFile = File.createTempFile("flatXmlDataSetDuplicateTest", ".xml"); + try + { + OutputStream out = new FileOutputStream(tempFile); + + try + { + // write dataset in temp file + FlatXmlDataSet.write(expectedDataSet, out); + + // load new dataset from temp file + IDataSet actualDataSet = new FlatXmlDataSet(new FileInputStream(tempFile)); + + // verify table count + assertEquals("table count", expectedDataSet.getTableNames().length, + actualDataSet.getTableNames().length); + + // verify each table + ITable[] expected = expectedDataSet.getTables(); + ITable[] actual = actualDataSet.getTables(); + assertEquals("table count", expected.length, actual.length); + for (int i = 0; i < expected.length; i++) + { + String expectedName = expected[i].getTableMetaData().getTableName(); + String actualName = actual[i].getTableMetaData().getTableName(); + assertEquals("table name", expectedName, actualName); + + assertTrue("not same instance", expected[i] != actual[i]); + Assertion.assertEquals(expected[i], actual[i]); + } + } + finally + { + out.close(); + } + } + finally + { + tempFile.delete(); + } + } } Index: FlatDtdDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatDtdDataSetTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FlatDtdDataSetTest.java 4 Jul 2002 21:33:43 -0000 1.4 --- FlatDtdDataSetTest.java 3 Aug 2002 02:26:40 -0000 1.5 *************** *** 12,20 **** import org.dbunit.DatabaseEnvironment; ! import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.*; import java.io.*; import java.util.Arrays; import FileAsserts; --- 12,22 ---- import org.dbunit.DatabaseEnvironment; ! import org.dbunit.Assertion; ! import org.dbunit.database.*; import org.dbunit.dataset.*; import java.io.*; import java.util.Arrays; + import java.util.Comparator; import FileAsserts; *************** *** 26,30 **** public class FlatDtdDataSetTest extends AbstractDataSetTest { ! private static final File DTD_FILE = new File("src/dtd/test.dtd"); public FlatDtdDataSetTest(String s) --- 28,35 ---- public class FlatDtdDataSetTest extends AbstractDataSetTest { ! private static final File DTD_FILE = ! new File("src/dtd/flatDtdDataSetTest.dtd"); ! private static final File DUPLICATE_FILE = ! new File("src/dtd/flatDtdDataSetDuplicateTest.dtd"); public FlatDtdDataSetTest(String s) *************** *** 41,47 **** } protected void sort(Object[] array) { ! Arrays.sort(array); } --- 46,81 ---- } + protected IDataSet createDuplicateDataSet() throws Exception + { + return new FlatDtdDataSet(new FileInputStream(DUPLICATE_FILE)); + } + protected void sort(Object[] array) { ! if (ITable[].class.isInstance(array)) ! { ! Arrays.sort(array, new TableComparator()); ! } ! else ! { ! Arrays.sort(array); ! } ! } ! ! private class TableComparator implements Comparator ! { ! public int compare(Object o1, Object o2) ! { ! String name1 = ((ITable)o1).getTableMetaData().getTableName(); ! String name2 = ((ITable)o2).getTableMetaData().getTableName(); ! ! return name1.compareTo(name2); ! } ! } ! ! ! protected int[] getExpectedDuplicateRows() ! { ! return new int[] {0, 0, 0}; } Index: XmlDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/XmlDataSetTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XmlDataSetTest.java 13 Jun 2002 17:25:00 -0000 1.6 --- XmlDataSetTest.java 3 Aug 2002 02:26:40 -0000 1.7 *************** *** 24,27 **** --- 24,28 ---- import org.dbunit.dataset.*; + import org.dbunit.Assertion; import java.io.*; *************** *** 47,83 **** } public void testWrite() throws Exception { List tableList = new ArrayList(); ! XmlDataSet xmlDataSet1 = (XmlDataSet)createDataSet(); File tempFile = File.createTempFile("dataSetTest", ".xml"); - OutputStream out = new FileOutputStream(tempFile); try { ! // write dataset in temp file ! XmlDataSet.write(xmlDataSet1, out); ! // load new dataset from temp file ! XmlDataSet xmlDataSet2 = new XmlDataSet(new FileInputStream(tempFile)); ! // verify table count ! assertEquals("table count", xmlDataSet1.getTableNames().length, ! xmlDataSet2.getTableNames().length); ! // verify each table ! String[] tableNames = xmlDataSet1.getTableNames(); ! for (int i = 0; i < tableNames.length; i++) { ! String name = tableNames[i]; ! ITable table1 = xmlDataSet1.getTable(name); ! ITable table2 = xmlDataSet2.getTable(name); ! assertTrue("not same instance", table1 != table2); ! DataSetUtils.assertEquals(table1, table2); } } finally { - out.close(); tempFile.delete(); } --- 48,148 ---- } + protected IDataSet createDuplicateDataSet() throws Exception + { + InputStream in = new FileInputStream( + new File("src/xml/xmlDataSetDuplicateTest.xml")); + return new XmlDataSet(in); + } + public void testWrite() throws Exception { List tableList = new ArrayList(); ! IDataSet expectedDataSet = (XmlDataSet)createDataSet(); File tempFile = File.createTempFile("dataSetTest", ".xml"); try { ! OutputStream out = new FileOutputStream(tempFile); ! try ! { ! // write dataset in temp file ! XmlDataSet.write(expectedDataSet, out); ! // load new dataset from temp file ! IDataSet actualDataSet = new XmlDataSet(new FileInputStream(tempFile)); ! // verify table count ! assertEquals("table count", expectedDataSet.getTableNames().length, ! actualDataSet.getTableNames().length); ! ! // verify each table ! ITable[] expected = expectedDataSet.getTables(); ! ITable[] actual = actualDataSet.getTables(); ! assertEquals("table count", expected.length, actual.length); ! for (int i = 0; i < expected.length; i++) ! { ! String expectedName = expected[i].getTableMetaData().getTableName(); ! String actualName = actual[i].getTableMetaData().getTableName(); ! assertEquals("table name", expectedName, actualName); ! ! assertTrue("not same instance", expected[i] != actual[i]); ! Assertion.assertEquals(expected[i], actual[i]); ! } ! } ! finally { ! out.close(); ! } ! } ! finally ! { ! tempFile.delete(); ! } ! } ! ! public void testDuplicateWrite() throws Exception ! { ! List tableList = new ArrayList(); ! ! IDataSet expectedDataSet = (XmlDataSet)createDuplicateDataSet(); ! File tempFile = File.createTempFile("xmlDataSetDuplicateTest", ".xml"); ! try ! { ! OutputStream out = new FileOutputStream(tempFile); ! ! try ! { ! // write dataset in temp file ! XmlDataSet.write(expectedDataSet, out); ! ! // load new dataset from temp file ! IDataSet actualDataSet = new XmlDataSet(new FileInputStream(tempFile)); ! ! // verify table count ! assertEquals("table count", expectedDataSet.getTableNames().length, ! actualDataSet.getTableNames().length); ! ! // verify each table ! ITable[] expected = expectedDataSet.getTables(); ! ITable[] actual = actualDataSet.getTables(); ! assertEquals("table count", expected.length, actual.length); ! for (int i = 0; i < expected.length; i++) ! { ! String expectedName = expected[i].getTableMetaData().getTableName(); ! String actualName = actual[i].getTableMetaData().getTableName(); ! assertEquals("table name", expectedName, actualName); ! ! assertTrue("not same instance", expected[i] != actual[i]); ! Assertion.assertEquals(expected[i], actual[i]); ! } ! } ! finally ! { ! out.close(); } } finally { tempFile.delete(); } |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/dtd In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/dtd Added Files: flatDtdDataSetTest.dtd flatDtdDataSetDuplicateTest.dtd Removed Files: test.dtd Log Message: Feature 551925 - Allow duplicate table names in dataset. --- NEW FILE: flatDtdDataSetTest.dtd --- <!ELEMENT dataset ( EMPTY_MULTITYPE_TABLE*, EMPTY_TABLE*, ONLY_PK_TABLE*, PK_TABLE*, SECOND_TABLE*, TEST_TABLE*)> <!ELEMENT EMPTY_MULTITYPE_TABLE EMPTY> <!ATTLIST EMPTY_MULTITYPE_TABLE VARCHAR_COL CDATA #IMPLIED NUMERIC_COL CDATA #IMPLIED TIMESTAMP_COL CDATA #IMPLIED VARBINARY_COL CDATA #IMPLIED > <!ELEMENT EMPTY_TABLE EMPTY> <!ATTLIST EMPTY_TABLE COLUMN0 CDATA #IMPLIED COLUMN1 CDATA #IMPLIED COLUMN2 CDATA #IMPLIED COLUMN3 CDATA #IMPLIED > <!ELEMENT ONLY_PK_TABLE EMPTY> <!ATTLIST ONLY_PK_TABLE PK0 CDATA #REQUIRED > <!ELEMENT PK_TABLE EMPTY> <!ATTLIST PK_TABLE PK0 CDATA #REQUIRED PK1 CDATA #REQUIRED PK2 CDATA #REQUIRED NORMAL0 CDATA #IMPLIED NORMAL1 CDATA #IMPLIED > <!ELEMENT SECOND_TABLE EMPTY> <!ATTLIST SECOND_TABLE COLUMN0 CDATA #IMPLIED COLUMN1 CDATA #IMPLIED COLUMN2 CDATA #IMPLIED COLUMN3 CDATA #IMPLIED > <!ELEMENT TEST_TABLE EMPTY> <!ATTLIST TEST_TABLE COLUMN0 CDATA #IMPLIED COLUMN1 CDATA #IMPLIED COLUMN2 CDATA #IMPLIED COLUMN3 CDATA #IMPLIED > --- NEW FILE: flatDtdDataSetDuplicateTest.dtd --- <!ELEMENT dataset ( DUPLICATE_TABLE*, EMPTY_TABLE*, DUPLICATE_TABLE)> <!ELEMENT EMPTY_TABLE EMPTY> <!ATTLIST EMPTY_TABLE COLUMN0 CDATA #IMPLIED COLUMN1 CDATA #IMPLIED COLUMN2 CDATA #IMPLIED COLUMN3 CDATA #IMPLIED > <!ELEMENT DUPLICATE_TABLE EMPTY> <!ATTLIST DUPLICATE_TABLE COLUMN0 CDATA #IMPLIED COLUMN1 CDATA #IMPLIED COLUMN2 CDATA #IMPLIED COLUMN3 CDATA #IMPLIED > --- test.dtd DELETED --- |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/./dbunit/src/xml In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/xml Added Files: compositeDataSetDuplicateTest2.xml compositeDataSetDuplicateTest1.xml caseInsensitiveDataSetDuplicateTest.xml xmlDataSetDuplicateTest.xml flatXmlDataSetDuplicateTest.xml refreshOperationDuplicateTest.xml Log Message: Feature 551925 - Allow duplicate table names in dataset. --- NEW FILE: compositeDataSetDuplicateTest2.xml --- <!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Manuel Laflamme (Java development) --> <dataset> <DUPLICATE_TABLE COLUMN0="row 1 col 0" COLUMN1="row 1 col 1" COLUMN2="row 1 col 2" COLUMN3="row 1 col 3"/> <DUPLICATE_TABLE COLUMN0="row 2 col 0" COLUMN1="row 2 col 1" COLUMN2="row 2 col 2" COLUMN3="row 2 col 3"/> </dataset> --- NEW FILE: compositeDataSetDuplicateTest1.xml --- <!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Manuel Laflamme (Java development) --> <dataset> <DUPLICATE_TABLE COLUMN0="row 0 col 0" COLUMN1="row 0 col 1" COLUMN2="row 0 col 2" COLUMN3="row 0 col 3"/> <EMPTY_TABLE/> </dataset> --- NEW FILE: caseInsensitiveDataSetDuplicateTest.xml --- <!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Stephane Besson (R&D) --> <dataset> <DUPLiCATE_TABLE COLUMN0="row 0 col 0" COLUMN1="row 0 col 1" COLUMN2="row 0 col 2" COLUMN3="row 0 col 3"/> <EMpTY_TAbLE/> <dUPLICATE_TABLE COLUMN0="row 1 col 0" COLUMN1="row 1 col 1" COLUMN2="row 1 col 2" COLUMN3="row 1 col 3"/> <dUPLICATE_TABLE COLUMN0="row 2 col 0" COLUMN1="row 2 col 1" COLUMN2="row 2 col 2" COLUMN3="row 2 col 3"/> </dataset> --- NEW FILE: xmlDataSetDuplicateTest.xml --- <dataset> <table name='DUPLICATE_TABLE'> <column>COLUMN0</column> <column>COLUMN1</column> <column>COLUMN2</column> <column>COLUMN3</column> <row> <value><![CDATA[row 0 col 0]]></value> <value><![CDATA[row 0 col 1]]></value> <value><![CDATA[row 0 col 2]]></value> <value><![CDATA[row 0 col 3]]></value> </row> </table> <table name='EMPTY_TABLE'/> <table name='DUPLICATE_TABLE'> <column>COLUMN0</column> <column>COLUMN1</column> <column>COLUMN2</column> <column>COLUMN3</column> <row> <value><![CDATA[row 1 col 0]]></value> <value><![CDATA[row 1 col 1]]></value> <value><![CDATA[row 1 col 2]]></value> <value><![CDATA[row 1 col 3]]></value> </row> <row> <value><![CDATA[row 2 col 0]]></value> <value><![CDATA[row 2 col 1]]></value> <value><![CDATA[row 2 col 2]]></value> <value><![CDATA[row 2 col 3]]></value> </row> </table> </dataset> --- NEW FILE: flatXmlDataSetDuplicateTest.xml --- <!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Manuel Laflamme (Java development) --> <dataset> <DUPLICATE_TABLE COLUMN0="row 0 col 0" COLUMN1="row 0 col 1" COLUMN2="row 0 col 2" COLUMN3="row 0 col 3"/> <EMPTY_TABLE/> <DUPLICATE_TABLE COLUMN0="row 1 col 0" COLUMN1="row 1 col 1" COLUMN2="row 1 col 2" COLUMN3="row 1 col 3"/> <DUPLICATE_TABLE COLUMN0="row 2 col 0" COLUMN1="row 2 col 1" COLUMN2="row 2 col 2" COLUMN3="row 2 col 3"/> </dataset> --- NEW FILE: refreshOperationDuplicateTest.xml --- <!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Stephane Besson (R&D) --> <dataset> <PK_TABLE PK0="1" PK1="11" PK2="111" NORMAL0="toto" NORMAL1="qwerty"/> <ONLY_PK_TABLE PK0="0"/> <PK_TABLE PK0="3" PK1="33" PK2="333" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="1"/> </dataset> |
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/test/org/dbunit/operation Modified Files: RefreshOperationTest.java DeleteAllOperationTest.java DeleteOperationTest.java InsertOperationTest.java UpdateOperationTest.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: RefreshOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/RefreshOperationTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RefreshOperationTest.java 13 Jun 2002 17:25:01 -0000 1.8 --- RefreshOperationTest.java 3 Aug 2002 02:26:40 -0000 1.9 *************** *** 75,78 **** --- 75,109 ---- } } + public void testExecuteWithDuplicateTables() throws Exception + { + String[] tableNames = {"PK_TABLE", "ONLY_PK_TABLE"}; + int[] tableRowCount = {3, 1}; + String primaryKey = "PK0"; + + IDataSet xmlDataSet = new FlatXmlDataSet( + new FileInputStream("src/xml/refreshOperationDuplicateTest.xml")); + assertEquals("table count", xmlDataSet.getTableNames().length, 4); + + // verify table before + assertEquals("array lenght", tableNames.length, tableRowCount.length); + for (int i = 0; i < tableNames.length; i++) + { + ITable tableBefore = createOrderedTable(tableNames[i], primaryKey); + assertEquals("row count before", tableRowCount[i], tableBefore.getRowCount()); + } + + DatabaseOperation.REFRESH.execute(_connection, xmlDataSet); + + // verify table after + IDataSet expectedDataSet = new FlatXmlDataSet( + new FileInputStream("src/xml/refreshOperationTestExpected.xml")); + + for (int i = 0; i < tableNames.length; i++) + { + ITable expectedTable = expectedDataSet.getTable(tableNames[i]); + ITable tableAfter = createOrderedTable(tableNames[i], primaryKey); + Assertion.assertEquals(expectedTable, tableAfter); + } + } public void testExecuteWithEmptyTable() throws Exception Index: DeleteAllOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteAllOperationTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DeleteAllOperationTest.java 13 Jun 2002 17:25:01 -0000 1.8 --- DeleteAllOperationTest.java 3 Aug 2002 02:26:40 -0000 1.9 *************** *** 73,76 **** --- 73,111 ---- } + public void testMockExecuteWithDuplicateTable() throws Exception + { + String schemaName = "schema"; + String tableName = "table"; + String expected = "delete from schema.table"; + + ITable table = new DefaultTable(tableName); + IDataSet dataSet = new DefaultDataSet(new ITable[] {table, table}); + + // setup mock objects + MockBatchStatement statement = new MockBatchStatement(); + statement.addExpectedBatchString(expected); + statement.addExpectedBatchString(expected); + statement.setExpectedExecuteBatchCalls(1); + statement.setExpectedClearBatchCalls(1); + statement.setExpectedCloseCalls(1); + + MockStatementFactory factory = new MockStatementFactory(); + factory.setExpectedCreateStatementCalls(1); + factory.setupStatement(statement); + + MockDatabaseConnection connection = new MockDatabaseConnection(); + connection.setupDataSet(new DefaultDataSet(table)); + connection.setupSchema(schemaName); + connection.setupStatementFactory(factory); + connection.setExpectedCloseCalls(0); + + // execute operation + new DeleteAllOperation().execute(connection, dataSet); + + statement.verify(); + factory.verify(); + connection.verify(); + } + public void testExecute() throws Exception { Index: DeleteOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteOperationTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DeleteOperationTest.java 13 Jun 2002 17:25:01 -0000 1.10 --- DeleteOperationTest.java 3 Aug 2002 02:26:40 -0000 1.11 *************** *** 94,97 **** --- 94,147 ---- } + public void testMockExecuteWithDuplicateTables() throws Exception + { + String schemaName = "schema"; + String tableName = "table"; + String[] expected = { + "delete from schema.table where c2 = 123.45 and c1 = 'qwerty'", + "delete from schema.table where c2 = 1234 and c1 = 'toto'", + "delete from schema.table where c2 = 123.45 and c1 = 'qwerty'", + "delete from schema.table where c2 = 1234 and c1 = 'toto'", + }; + + List valueList = new ArrayList(); + valueList.add(new Object[]{"toto", "1234", Boolean.FALSE}); + valueList.add(new Object[]{"qwerty", new Double("123.45"), "true"}); + Column[] columns = new Column[]{ + new Column("c1", DataType.VARCHAR), + new Column("c2", DataType.NUMERIC), + new Column("c3", DataType.BOOLEAN), + }; + String[] primaryKeys = {"c2", "c1"}; + + ITable table = new DefaultTable(new DefaultTableMetaData( + tableName, columns, primaryKeys), valueList); + IDataSet dataSet = new DefaultDataSet(new ITable[]{table, table}); + + // setup mock objects + MockBatchStatement statement = new MockBatchStatement(); + statement.addExpectedBatchStrings(expected); + statement.setExpectedExecuteBatchCalls(2); + statement.setExpectedClearBatchCalls(2); + statement.setExpectedCloseCalls(2); + + MockStatementFactory factory = new MockStatementFactory(); + factory.setExpectedCreatePreparedStatementCalls(2); + factory.setupStatement(statement); + + MockDatabaseConnection connection = new MockDatabaseConnection(); + connection.setupDataSet(new DefaultDataSet(table)); + connection.setupSchema(schemaName); + connection.setupStatementFactory(factory); + connection.setExpectedCloseCalls(0); + + // execute operation + new DeleteOperation().execute(connection, dataSet); + + statement.verify(); + factory.verify(); + connection.verify(); + } + public void testExecuteWithEmptyTable() throws Exception { *************** *** 154,158 **** assertEquals("after", "2", tableAfter.getValue(1, columnName).toString()); } - } --- 204,207 ---- Index: InsertOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/InsertOperationTest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** InsertOperationTest.java 13 Jun 2002 17:25:01 -0000 1.13 --- InsertOperationTest.java 3 Aug 2002 02:26:40 -0000 1.14 *************** *** 98,101 **** --- 98,149 ---- } + public void testMockExecuteWithDuplicateTables() throws Exception + { + String schemaName = "schema"; + String tableName = "table"; + String[] expected = { + "insert into schema.table (c1, c2, c3) values (NULL, 1234, 'false')", + "insert into schema.table (c1, c2, c3) values ('qwerty', 123.45, 'true')", + "insert into schema.table (c1, c2, c3) values (NULL, 1234, 'false')", + "insert into schema.table (c1, c2, c3) values ('qwerty', 123.45, 'true')", + }; + + // setup table + List valueList = new ArrayList(); + valueList.add(new Object[]{null, "1234", Boolean.FALSE}); + valueList.add(new Object[]{"qwerty", new Double("123.45"), "true"}); + Column[] columns = new Column[]{ + new Column("c1", DataType.VARCHAR), + new Column("c2", DataType.NUMERIC), + new Column("c3", DataType.BOOLEAN), + }; + DefaultTable table = new DefaultTable(tableName, columns, valueList); + IDataSet dataSet = new DefaultDataSet(new ITable[] {table, table}); + + // setup mock objects + MockBatchStatement statement = new MockBatchStatement(); + statement.addExpectedBatchStrings(expected); + statement.setExpectedExecuteBatchCalls(2); + statement.setExpectedClearBatchCalls(2); + statement.setExpectedCloseCalls(2); + + MockStatementFactory factory = new MockStatementFactory(); + factory.setExpectedCreatePreparedStatementCalls(2); + factory.setupStatement(statement); + + MockDatabaseConnection connection = new MockDatabaseConnection(); + connection.setupDataSet(new DefaultDataSet(table)); + connection.setupSchema(schemaName); + connection.setupStatementFactory(factory); + connection.setExpectedCloseCalls(0); + + // execute operation + new InsertOperation().execute(connection, dataSet); + + statement.verify(); + factory.verify(); + connection.verify(); + } + public void testExecuteWithEmptyTable() throws Exception { *************** *** 145,149 **** String tableName = "BLOB_TABLE"; ! // execute this test only if the target database support CLOB if (DatabaseEnvironment.getInstance() instanceof OracleEnvironment) { --- 193,197 ---- String tableName = "BLOB_TABLE"; ! // execute this test only if the target database support BLOB if (DatabaseEnvironment.getInstance() instanceof OracleEnvironment) { Index: UpdateOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** UpdateOperationTest.java 13 Jun 2002 17:25:01 -0000 1.10 --- UpdateOperationTest.java 3 Aug 2002 02:26:40 -0000 1.11 *************** *** 49,56 **** } ! public static Test suite() ! { ! return new UpdateOperationTest("testUpdateBlob"); ! } //////////////////////////////////////////////////////////////////////////// --- 49,56 ---- } ! // public static Test suite() ! // { ! // return new UpdateOperationTest("testUpdateBlob"); ! // } //////////////////////////////////////////////////////////////////////////// *************** *** 110,113 **** --- 110,163 ---- MockDatabaseConnection connection = new MockDatabaseConnection(); connection.setupDataSet(dataSet); + connection.setupSchema(schemaName); + connection.setupStatementFactory(factory); + connection.setExpectedCloseCalls(0); + + // execute operation + new UpdateOperation().execute(connection, dataSet); + + statement.verify(); + factory.verify(); + connection.verify(); + } + + public void testMockExecuteWithDuplicateTable() throws Exception + { + String schemaName = "schema"; + String tableName = "table"; + String[] expected = { + "update schema.table set c2 = 1234, c3 = 'false' where c4 = 0 and c1 = 'toto'", + "update schema.table set c2 = 123.45, c3 = NULL where c4 = 0 and c1 = 'qwerty'", + "update schema.table set c2 = 1234, c3 = 'false' where c4 = 0 and c1 = 'toto'", + "update schema.table set c2 = 123.45, c3 = NULL where c4 = 0 and c1 = 'qwerty'", + }; + + List valueList = new ArrayList(); + valueList.add(new Object[]{"toto", "1234", "false", "0"}); + valueList.add(new Object[]{"qwerty", new Double("123.45"), null, "0"}); + Column[] columns = new Column[]{ + new Column("c1", DataType.VARCHAR), + new Column("c2", DataType.NUMERIC), + new Column("c3", DataType.VARCHAR), + new Column("c4", DataType.NUMERIC), + }; + String[] primaryKeys = {"c4", "c1"}; + ITable table = new DefaultTable(new DefaultTableMetaData( + tableName, columns, primaryKeys), valueList); + IDataSet dataSet = new DefaultDataSet(new ITable[]{table, table}); + + // setup mock objects + MockBatchStatement statement = new MockBatchStatement(); + statement.addExpectedBatchStrings(expected); + statement.setExpectedExecuteBatchCalls(2); + statement.setExpectedClearBatchCalls(2); + statement.setExpectedCloseCalls(2); + + MockStatementFactory factory = new MockStatementFactory(); + factory.setExpectedCreatePreparedStatementCalls(2); + factory.setupStatement(statement); + + MockDatabaseConnection connection = new MockDatabaseConnection(); + connection.setupDataSet(new DefaultDataSet(table)); connection.setupSchema(schemaName); connection.setupStatementFactory(factory); |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/java/org/dbunit/database Modified Files: DatabaseDataSet.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: DatabaseDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DatabaseDataSet.java 13 Jun 2002 17:24:56 -0000 1.14 --- DatabaseDataSet.java 3 Aug 2002 02:26:41 -0000 1.15 *************** *** 26,31 **** import java.sql.*; ! import java.util.HashMap; ! import java.util.Map; /** --- 26,30 ---- import java.sql.*; ! import java.util.*; /** *************** *** 209,212 **** --- 208,221 ---- } + public ITable[] getTables() throws DataSetException + { + String[] names = getTableNames(); + List tableList = new ArrayList(names.length); + for (int i = 0; i < names.length; i++) + { + tableList.add(getTable(names[i])); + } + return (ITable[])tableList.toArray(new ITable[0]); + } } |
From: <mla...@us...> - 2002-08-03 02:26:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/java/org/dbunit Modified Files: Assertion.java Log Message: Feature 551925 - Allow duplicate table names in dataset. Index: Assertion.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/Assertion.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Assertion.java 13 Jun 2002 17:24:55 -0000 1.5 --- Assertion.java 3 Aug 2002 02:26:40 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- import java.util.Arrays; + import java.util.Comparator; import junit.framework.Assert; |
From: <mla...@us...> - 2002-07-18 11:20:04
|
Update of /cvsroot/dbunit/dbunit/docs In directory usw-pr-cvs1:/tmp/cvs-serv9954/dbunit/docs Removed Files: upload.bat Log Message: Removed unnecessary bat files... --- upload.bat DELETED --- |
From: <mla...@us...> - 2002-07-18 11:20:03
|
Update of /cvsroot/dbunit/dbunit/docs/api In directory usw-pr-cvs1:/tmp/cvs-serv9954/dbunit/docs/api Removed Files: upload.bat Log Message: Removed unnecessary bat files... --- upload.bat DELETED --- |
Update of /cvsroot/dbunit/dbunit/docs In directory usw-pr-cvs1:/tmp/cvs-serv1854/dbunit/docs Modified Files: anttask.html bestpractices.html changes.html download.html faq.html index.html resources.html Log Message: Ready for release of version 1.4 Index: anttask.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/anttask.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** anttask.html 16 Jun 2002 20:35:02 -0000 1.1 --- anttask.html 17 Jul 2002 01:55:20 -0000 1.2 *************** *** 84,87 **** --- 84,105 ---- <td>Yes</td> </tr> + <tr> + <td>schema </td> + <td>Database schema</td> + <td>No</td> + </tr> + <tr> + <td>useQualifiedTableNames</td> + <td>Set System.property dbunit.qualified.table.names <br> + equal to supplied boolean value</td> + <td>No</td> + </tr> + <tr> + <td>supportBatchStatement</td> + <td>Set System.property<br> + dbunit.support.batch.statement<br> + equal to supplied boolean value</td> + <td> No</td> + </tr> </table> <h4>Parameters specified as nested elements</h4> *************** *** 114,121 **** </tr> <tr> ! <td>flat</td> ! <td>If true, use <a class="code">FlatXmlDataSet</a> type in the ! supplied src file. Otherwise use <a class="code">XmlDataSet</a>. ! Defaults to <a class="code">true</a></td> <td> <p>No</p> --- 132,138 ---- </tr> <tr> ! <td>format</td> ! <td>Format type of supplied source file. Possible values are "flat" ! or "xml". Defaults to <a class="code">"flat"</a></td> <td> <p>No</p> *************** *** 125,128 **** --- 142,146 ---- </td> </tr> + <!-- <tr> <td>composite</td> *************** *** 164,167 **** --- 182,186 ---- </td> </tr> + --> <tr> <td>export</td> *************** *** 186,193 **** </tr> <tr> ! <td>flat</td> ! <td>If true, use <a class="code">FlatXmlDataSet</a> type in the ! supplied src file. Otherwise use <a class="code">XmlDataSet</a>. ! Defaults to <a class="code">true</a></td> <td> <p>No</p> --- 205,212 ---- </tr> <tr> ! <td>format</td> ! <td>Format type of supplied destination file. Possible values ! are "flat", "xml" or "dtd". Defaults ! to <a class="code">"flat"</a></td> <td> <p>No</p> *************** *** 221,229 **** </table> <h3>Examples</h3> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <operation type="UPDATE" src="updateFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and executes the UPDATE operation contained within the FlatXmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <operation type="INSERT" src="insertFile.xml"/><br> <operation type="UPDATE" src="updateFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the INSERT operation contained within the FlatXmlDataSet --- 240,248 ---- </table> <h3>Examples</h3> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <operation type="UPDATE" src="updateFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and executes the UPDATE operation contained within the FlatXmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <operation type="INSERT" src="insertFile.xml"/><br> <operation type="UPDATE" src="updateFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the INSERT operation contained within the FlatXmlDataSet *************** *** 231,258 **** followed by the execution of the UPDATE operation contained within the FlatXmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <operation type="UPDATE" src="updateFile.xml" flat="false"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and executes the UPDATE operation contained within the XmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <composite src="compositeFile.xml"><br> <operation type="DELETE"/><br> <operation type="INSERT"/><br> </composite><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the CompositeOperation, DELETE and then UPDATE, contained within the FlatXmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <composite src="compositeFile.xml" flat="false"><br> <operation type="INSERT"/><br> <operation type="UPDATE"/><br> </composite><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the CompositeOperation, DELETE and then UPDATE, contained within the XmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <export dest="exportFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the database to the given destination file as a FlatXmlDataSet. </p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <export dest="exportNonFlatFile.xml" flat="false"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the database to the given destination file as an XmlDataSet. </p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <export dest="exportFile.xml"><br> <table name="FOO"/><br> <table name="BAR"/><br> </export><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the contents of the provided tables to the given destination ! file as an XmlDataSet. <br> </p> <!-- #EndEditable --> --- 250,283 ---- followed by the execution of the UPDATE operation contained within the FlatXmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <operation type="UPDATE" src="updateFile.xml" flat="false"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and executes the UPDATE operation contained within the XmlDataSet file updateFile.xml.</p> ! <!-- ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <composite src="compositeFile.xml"><br> <operation type="DELETE"/><br> <operation type="INSERT"/><br> </composite><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the CompositeOperation, DELETE and then UPDATE, contained within the FlatXmlDataSet file updateFile.xml.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <composite src="compositeFile.xml" flat="false"><br> <operation type="INSERT"/><br> <operation type="UPDATE"/><br> </composite><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the CompositeOperation, DELETE and then UPDATE, contained within the XmlDataSet file updateFile.xml.</p> ! --> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <export dest="exportFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the database to the given destination file as a FlatXmlDataSet. </p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <export dest="exportNonFlatFile.xml" format="xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the database to the given destination file as an XmlDataSet. </p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <export dest="export.dtd" format="dtd"/><br> </dbunit></pre> ! <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver ! and <br> ! exports the document type definition (dtd) describing the flat xml format.</p> ! <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="sa"<br> password=""><br> <export dest="exportFile.xml"><br> <table name="FOO"/><br> <table name="BAR"/><br> </export><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the contents of the provided tables to the given destination ! file as an FlatXmlDataSet. <br> </p> <!-- #EndEditable --> Index: bestpractices.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/bestpractices.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** bestpractices.html 16 Jun 2002 19:21:09 -0000 1.15 --- bestpractices.html 17 Jul 2002 01:55:20 -0000 1.16 *************** *** 99,106 **** and tearDown(). Override the closeConnection() method with an empty body to modify this behavior. </p> - <p>You may be interested to look at the Daedalos JUnit Extensions (see <a href="resources.html">Resources</a>). - I haven't tried it myself but this seems to be an interesting way to reuse - the same connection across multiple tests.<br> - </p> <h4>In-container with Cactus or JUnitEE</h4> If you use the in-container strategy you should use a DatabaseDataSourceConnection --- 99,102 ---- Index: changes.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/changes.html,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** changes.html 16 Jun 2002 19:21:09 -0000 1.24 --- changes.html 17 Jul 2002 01:55:21 -0000 1.25 *************** *** 50,53 **** --- 50,54 ---- package because Visual Age for Java is not able to handle classes located in the default package.</li> + <li>Added system properties documentation.</li> <li>New features:</li> <ul> *************** *** 63,67 **** <li><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=554249&group_id=47439&atid=449494">554249</a> - None column values.</li> ! <li>Added support for BLOB and CLOB data types.</li> </ul> <li>Multiple bugfixes:</li> --- 64,70 ---- <li><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=554249&group_id=47439&atid=449494">554249</a> - None column values.</li> ! <li><strong><em>Ant Task</em></strong> contributed by Timothy Ruppert ! and Ben Cox.</li> ! <li>Support for BLOB and CLOB data types.</li> </ul> <li>Multiple bugfixes:</li> *************** *** 75,78 **** --- 78,83 ---- <li><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=547200&group_id=47439&atid=449491">547200</a> - PreparedStatement.clearParameters() problem with oracle 8i.</li> + <li><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=559693&group_id=47439&atid=449491">559693</a> + - Delete row order problem.</li> <li>DeleteAllOperation crash with empty dataset.</li> </ul> Index: download.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/download.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** download.html 16 Jun 2002 19:21:09 -0000 1.18 --- download.html 17 Jul 2002 01:55:21 -0000 1.19 *************** *** 45,52 **** <td class="body" valign="top"> <!-- #BeginEditable "body" --> <h2>Download</h2> ! <p>The current Dbunit release is version 1.3. The distribution archive contains the compiled classes, the java code and the java API documentation.</p> ! <p><a href="https://sourceforge.net/project/showfiles.php?group_id=47439&release_id=82941">Download ! version 1.3</a></p> <p>If your are not reading this page online, please visit the <a href="http://www.dbunit.org">online version</a> of this site since a more recent version of Dbunit might be --- 45,52 ---- <td class="body" valign="top"> <!-- #BeginEditable "body" --> <h2>Download</h2> ! <p>The current Dbunit release is version 1.4. The distribution archive contains the compiled classes, the java code and the java API documentation.</p> ! <p><a href="http://sourceforge.net/project/showfiles.php?group_id=47439&release_id=100096">Download ! version 1.4</a></p> <p>If your are not reading this page online, please visit the <a href="http://www.dbunit.org">online version</a> of this site since a more recent version of Dbunit might be Index: faq.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/faq.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** faq.html 16 Jun 2002 19:21:09 -0000 1.17 --- faq.html 17 Jul 2002 01:55:21 -0000 1.18 *************** *** 53,56 **** --- 53,57 ---- <li><a><a href="UnsatisfiedLinkError">Why I get an "UnsatisfiedLinkError" with the DB2 driver?</a></a></li> + <li><a href="#AmbiguousTableNameException">Why I get a AmbiguousTableNameException?</a></li> </ul> <hr> *************** *** 92,96 **** from the DB2 JDBC 1.0 driver.</p> <p>The steps for installing the DB2 JDBC 2.0 driver are covered in the DB2 ! documentation.<br> </p> <p></p> --- 93,107 ---- from the DB2 JDBC 1.0 driver.</p> <p>The steps for installing the DB2 JDBC 2.0 driver are covered in the DB2 ! documentation.</p> ! <h3><a name="AmbiguousTableNameException">Why I get a AmbiguousTableNameException?</a></h3> ! <p>This situation occurs when no schema is specified and that DbUnit detect ! that it is getting columns information from multiple tables having the ! same name and located in different schemas.</p> ! <p>You can solve this problem in three different ways:<br> ! 1. Provide the schema name when creating the database connection.<br> ! 2. Ensure that the connection is restricted to access only one schema.<br> ! 3. Use fully qualified table names as specified <a href="howto.html#multipleschema">here</a>.<br> ! </p> ! <p><br> </p> <p></p> Index: index.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/index.html,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** index.html 16 Jun 2002 19:21:09 -0000 1.21 --- index.html 17 Jul 2002 01:55:21 -0000 1.22 *************** *** 53,60 **** Something worth noting: Dbunit is using itself in its own test suite! </p> ! <a name="intro"><h2>News</h2> </a> <ul> ! <!--<li>2002-??-?? - The java API documentation is now available <a href="api/index.html">online</a>.</li>--> <li>2002-04-04 - Version 1.3 released. See <a href="changes.html#1.3">changes</a>.</li> <li>2002-04-04 - New website design done by <a href="http://www.silphid.com/">Silphid --- 53,64 ---- Something worth noting: Dbunit is using itself in its own test suite! </p> ! <a name="intro"> ! <h2>News</h2> </a> <ul> ! <li>2002-07-17 - The java API documentation is now available <a href="api/index.html">online</a>.</li> ! <li>2002-07-17 - Version 1.4 released. See <a href="changes.html#1.4">changes</a>.</li> ! <li>2002-05-10 - Timothy Ruppert and Ben Cox joined the DbUnit developement ! team.</li> <li>2002-04-04 - Version 1.3 released. See <a href="changes.html#1.3">changes</a>.</li> <li>2002-04-04 - New website design done by <a href="http://www.silphid.com/">Silphid Index: resources.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/resources.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** resources.html 16 Jun 2002 19:21:09 -0000 1.13 --- resources.html 17 Jul 2002 01:55:21 -0000 1.14 *************** *** 57,68 **** code</a><br> Richard Dallaway notes about database unit testing.</p> - <p><a href="http://www.daedalos.com/EN/djux">Daedalos JUnit Extensions</a><br> - Daedalos JUnitExtensions make it possible to define test resources as - known from the Smalltalk SUnit. Unit tests are speeded up by using test - resources, because time-consuming initializations are only done once and - remain active over a series of tests. As an example, a database connection - is opened before executing the first unit test and can be accessed during - the whole testing circle. It isn't necessary to re-open the database connection - before an unit test is executed. </p> <p><a href="http://mockobjects.sourceforge.net/papers/jdbc_testfirst.html">Developing JDBC applications test-first</a><br> --- 57,60 ---- |
From: <mla...@us...> - 2002-07-17 01:55:24
|
Update of /cvsroot/dbunit/dbunit In directory usw-pr-cvs1:/tmp/cvs-serv1854/dbunit Modified Files: build.properties build.xml dbunit.ipr Log Message: Ready for release of version 1.4 Index: build.properties =================================================================== RCS file: /cvsroot/dbunit/dbunit/build.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.properties 12 Apr 2002 17:42:28 -0000 1.6 --- build.properties 17 Jul 2002 01:55:19 -0000 1.7 *************** *** 1,3 **** ! version = 1.3 --- 1,3 ---- ! version = 1.4 Index: build.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 12 Apr 2002 17:42:28 -0000 1.5 --- build.xml 17 Jul 2002 01:55:19 -0000 1.6 *************** *** 48,56 **** </javac> </target> ! <target name="jar" depends="compile"> <jar jarfile="${build.dir}/${name}.jar" basedir="${java.classes.dir}"/> </target> ! <target name="javadoc" depends="init"> <mkdir dir="${java.docs.dir}"/> --- 48,56 ---- </javac> </target> ! <target name="jar" depends="compile"> <jar jarfile="${build.dir}/${name}.jar" basedir="${java.classes.dir}"/> </target> ! <target name="javadoc" depends="init"> <mkdir dir="${java.docs.dir}"/> *************** *** 118,122 **** <!-- Copy javadoc --> <mkdir dir="${dist.dir}/docs/api"/> ! <copy todir="${dist.dir}/docs/api" includeEmptyDirs="no"> <fileset dir="${java.docs.dir}"> <exclude name="**/CVS/*"/> --- 118,122 ---- <!-- Copy javadoc --> <mkdir dir="${dist.dir}/docs/api"/> ! <copy todir="${dist.dir}/docs/api" includeEmptyDirs="no" overwrite="yes"> <fileset dir="${java.docs.dir}"> <exclude name="**/CVS/*"/> *************** *** 138,142 **** <include name="dtdparser.jar"/> <include name="exml.jar"/> ! <include name="junit.jar"/> </fileset> <fileset dir="${build.dir}"> --- 138,142 ---- <include name="dtdparser.jar"/> <include name="exml.jar"/> ! <!--<include name="junit.jar"/>--> </fileset> <fileset dir="${build.dir}"> *************** *** 149,154 **** --- 149,157 ---- <zipfileset dir="${dist.dir}" prefix="${name}-${version}"/> </zip> + <tar tarfile="${build.dir}/htmldoc.tar" basedir="${dist.dir}/docs"/> + <gzip src="${build.dir}/htmldoc.tar" zipfile="${build.dir}/htmldoc.tar.gz"/> </target> + </project> Index: dbunit.ipr =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** dbunit.ipr 4 Jul 2002 21:33:43 -0000 1.45 --- dbunit.ipr 17 Jul 2002 01:55:20 -0000 1.46 *************** *** 296,300 **** <component class="com.intellij.ide.desktop.IdeDocumentManager"> <recent_files> - <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" column="13" line="41" /> <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" column="47" line="65" /> <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" column="54" line="173" /> --- 296,299 ---- *************** *** 310,318 **** <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" column="45" line="106" /> <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AllTests.java" column="0" line="36" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" column="23" line="33" /> </recent_files> <open_files> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" column="23" line="33" /> ! <active_file url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" /> </open_files> </component> --- 309,319 ---- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" column="45" line="106" /> <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AllTests.java" column="0" line="36" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" column="19" line="24" /> ! <file_info url="file://$PROJECT_DIR$/build.xml" column="50" line="139" /> </recent_files> <open_files> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" column="19" line="24" /> ! <file_info url="file://$PROJECT_DIR$/build.xml" column="50" line="139" /> ! <active_file url="file://$PROJECT_DIR$/build.xml" /> </open_files> </component> *************** *** 326,341 **** <navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" /> <navigator id="ProjectNavigator" flattenPackages="false" showMembers="false"> - <expanded_node type="directory" url="file://$PROJECT_DIR$" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> </navigator> <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true"> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> <expanded_node type="class" url="org.dbunit.dataset.FilteredDataSet" /> </navigator> </component> --- 327,342 ---- <navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" /> <navigator id="ProjectNavigator" flattenPackages="false" showMembers="false"> <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$" /> </navigator> <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true"> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" /> <expanded_node type="class" url="org.dbunit.dataset.FilteredDataSet" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" /> </navigator> </component> |
From: <bd...@us...> - 2002-07-15 01:00:39
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant In directory usw-pr-cvs1:/tmp/cvs-serv22997/src/test/org/dbunit/ant Modified Files: DbUnitTaskTest.java Log Message: Added export functionality. Also replaced boolean 'flat' with 'format' attributes in Export, Operation, and Composite Index: DbUnitTaskTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DbUnitTaskTest.java 13 Jun 2002 21:17:06 -0000 1.3 --- DbUnitTaskTest.java 15 Jul 2002 01:00:30 -0000 1.4 *************** *** 121,128 **** public void testSetFlatFalse() { ! String targetName = "set-flat-false"; Operation operation = (Operation)getFirstStepFromTarget(targetName); ! assertTrue("Operation attribute flat should have been false, but was: " ! + operation.getFlat(), !operation.getFlat()); } --- 121,128 ---- public void testSetFlatFalse() { ! String targetName = "set-format-xml"; Operation operation = (Operation)getFirstStepFromTarget(targetName); ! assertTrue("Operation attribute format should have been 'xml', but was: " ! + operation.getFormat(), operation.getFormat().equalsIgnoreCase("xml")); } *************** *** 190,195 **** public void testInvalidCompositeOperationFlat() { ! expectBuildException("invalid-composite-operation-flat", ! "Should have objected to nested operation flat attribute " + "being set."); } --- 190,195 ---- public void testInvalidCompositeOperationFlat() { ! expectBuildException("invalid-composite-operation-format-flat", ! "Should have objected to nested operation format attribute " + "being set."); } *************** *** 199,202 **** --- 199,205 ---- String targetName = "test-export-full"; Export export = (Export)getFirstStepFromTarget(targetName); + assertTrue("Should have been a flat format, " + + "but was: " + export.getFormat(), + export.getFormat().equalsIgnoreCase("flat")); List tables = export.getTables(); assertTrue("Should have been an empty table list " *************** *** 220,223 **** --- 223,259 ---- } + public void testExportFlat() + { + String targetName = "test-export-format-flat"; + Export export = (Export)getFirstStepFromTarget(targetName); + assertTrue("Should have been a flat format, " + + "but was: " + export.getFormat(), + export.getFormat().equalsIgnoreCase("flat")); + } + + public void testExportXml() + { + String targetName = "test-export-format-xml"; + Export export = (Export)getFirstStepFromTarget(targetName); + assertTrue("Should have been an xml format, " + + "but was: " + export.getFormat(), + export.getFormat().equalsIgnoreCase("xml")); + } + + public void testExportDtd() + { + String targetName = "test-export-format-dtd"; + Export export = (Export)getFirstStepFromTarget(targetName); + assertTrue("Should have been a dtd format, " + + "but was: " + export.getFormat(), + export.getFormat().equalsIgnoreCase("dtd")); + } + + public void testInvalidExportFormat() + { + expectBuildException("invalid-export-format", + "Should have objected to invalid format attribute."); + } + protected void assertOperationType(String failMessage, String targetName, DatabaseOperation expected) { *************** *** 264,271 **** } } - - } - - - --- 300,302 ---- |
From: <bd...@us...> - 2002-07-15 01:00:39
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory usw-pr-cvs1:/tmp/cvs-serv22997/src/java/org/dbunit/ant Modified Files: Composite.java DbUnitTask.java DbUnitTaskStep.java Export.java Operation.java Log Message: Added export functionality. Also replaced boolean 'flat' with 'format' attributes in Export, Operation, and Composite Index: Composite.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Composite.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Composite.java 13 Jun 2002 17:24:55 -0000 1.2 --- Composite.java 15 Jul 2002 01:00:29 -0000 1.3 *************** *** 24,29 **** import org.dbunit.DatabaseUnitException; ! ! import java.sql.Connection; import java.util.*; --- 24,28 ---- import org.dbunit.DatabaseUnitException; ! import org.dbunit.database.IDatabaseConnection; import java.util.*; *************** *** 76,83 **** * their src and flat value, and calls execute on each one. * ! * @param conn a <code>Connection</code> value * @exception DatabaseUnitException if an error occurs */ ! public void execute(Connection conn) throws DatabaseUnitException { Iterator operIter = operations.listIterator(); --- 75,82 ---- * their src and flat value, and calls execute on each one. * ! * @param conn a <code>IDatabaseConnection</code> value * @exception DatabaseUnitException if an error occurs */ ! public void execute(IDatabaseConnection connection) throws DatabaseUnitException { Iterator operIter = operations.listIterator(); *************** *** 91,101 **** } operation.setSrc(getSrc()); ! if (operation.getFlat() != getFlat()) { ! throw new DatabaseUnitException("Cannot override 'flat' attribute " + "in a <composite>'s sub-<operation>"); } ! operation.setFlat(getFlat()); ! operation.execute(conn); } --- 90,101 ---- } operation.setSrc(getSrc()); ! if (operation.getRawFormat() != null ! && !operation.getFormat().equalsIgnoreCase(getFormat())) { ! throw new DatabaseUnitException("Cannot override 'format' attribute " + "in a <composite>'s sub-<operation>"); } ! operation.setFormat(getFormat()); ! operation.execute(connection); } *************** *** 126,130 **** result.append("Composite: "); result.append(" src=" + getSrc().getAbsolutePath()); ! result.append(", flat=" + getFlat()); result.append(", operations=" + operations); --- 126,130 ---- result.append("Composite: "); result.append(" src=" + getSrc().getAbsolutePath()); ! result.append(", format=" + getFormat()); result.append(", operations=" + operations); Index: DbUnitTask.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/DbUnitTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DbUnitTask.java 13 Jun 2002 17:24:55 -0000 1.2 --- DbUnitTask.java 15 Jul 2002 01:00:29 -0000 1.3 *************** *** 24,27 **** --- 24,29 ---- import org.dbunit.DatabaseUnitException; + import org.dbunit.database.IDatabaseConnection; + import org.dbunit.database.DatabaseConnection; import java.sql.*; *************** *** 69,72 **** --- 71,79 ---- /** + * DB schema. + */ + private String schema = null; + + /** * Steps */ *************** *** 74,77 **** --- 81,94 ---- /** + * Flag for using the qualified table names. + */ + private boolean useQualifiedTableNames = false; + + /** + * Flag for using botched statements. + */ + private boolean supportBatchStatement = false; + + /** * Set the JDBC driver to be used. */ *************** *** 106,109 **** --- 123,152 ---- /** + * Set the schema for the DB connection. + */ + public void setSchema(String schema) + { + this.schema = schema; + } + + /** + * Set the flag for using the qualified table names. + */ + public void setUseQualifiedTableNames(boolean useQualifiedTableNames) + { + this.useQualifiedTableNames = useQualifiedTableNames; + } + + /** + * Set the flag for supporting batch statements. + * NOTE: This property cannot be used to force the usage of batch + * statement if your database does not support it. + */ + public void setSupportBatchStatement(boolean supportBatchStatement) + { + this.supportBatchStatement = supportBatchStatement; + } + + /** * Gets the Steps. */ *************** *** 162,167 **** throw new BuildException("Must declare at least one step in a <dbunit> task!"); } ! Driver driverInstance = null; try { --- 205,218 ---- throw new BuildException("Must declare at least one step in a <dbunit> task!"); } ! if (useQualifiedTableNames) ! { ! System.setProperty("dbunit.qualified.table.names", "true"); ! } ! if (supportBatchStatement) ! { ! System.setProperty("dbunit.database.supportBatchStatement", "true"); ! } + Driver driverInstance = null; try { *************** *** 206,211 **** { DbUnitTaskStep step = (DbUnitTaskStep)stepIter.next(); log(step.getLogMessage(), Project.MSG_INFO); ! step.execute(conn); } } --- 257,263 ---- { DbUnitTaskStep step = (DbUnitTaskStep)stepIter.next(); + IDatabaseConnection connection = new DatabaseConnection(conn, schema); log(step.getLogMessage(), Project.MSG_INFO); ! step.execute(connection); } } Index: DbUnitTaskStep.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/DbUnitTaskStep.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DbUnitTaskStep.java 13 Jun 2002 17:24:55 -0000 1.2 --- DbUnitTaskStep.java 15 Jul 2002 01:00:29 -0000 1.3 *************** *** 24,29 **** import org.dbunit.DatabaseUnitException; ! ! import java.sql.Connection; /** --- 24,28 ---- import org.dbunit.DatabaseUnitException; ! import org.dbunit.database.IDatabaseConnection; /** *************** *** 37,41 **** { ! public void execute(Connection conn) throws DatabaseUnitException; public String getLogMessage(); --- 36,40 ---- { ! public void execute(IDatabaseConnection connection) throws DatabaseUnitException; public String getLogMessage(); Index: Export.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Export.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Export.java 13 Jun 2002 17:24:55 -0000 1.2 --- Export.java 15 Jul 2002 01:00:30 -0000 1.3 *************** *** 28,31 **** --- 28,32 ---- import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; + import org.dbunit.dataset.xml.FlatDtdDataSet; import org.dbunit.dataset.xml.XmlDataSet; *************** *** 38,43 **** /** * The <code>Export</code> class is the step that facilitates exporting ! * the contents of the database to a file. The database can be exported ! * as a full dataset or partially if specific table names are identified. * * @author Timothy Ruppert && Ben Cox --- 39,45 ---- /** * The <code>Export</code> class is the step that facilitates exporting ! * the contents of the database and/or it's corresponding dtd to a file. ! * The export can be performed on a full dataset or a partial one if ! * specific table names are identified. * * @author Timothy Ruppert && Ben Cox *************** *** 48,53 **** { - private boolean flat = true; private File dest; private List tables = new ArrayList(); --- 50,55 ---- { private File dest; + private String format = "flat"; private List tables = new ArrayList(); *************** *** 56,59 **** --- 58,66 ---- } + private String getAbsolutePath(File filename) + { + return filename != null ? filename.getAbsolutePath() : "null"; + } + public File getDest() { *************** *** 61,72 **** } ! public List getTables() { ! return tables; } ! public boolean getFlat() { ! return flat; } --- 68,79 ---- } ! public String getFormat() { ! return format; } ! public List getTables() { ! return tables; } *************** *** 76,93 **** } ! public void addTable(Table table) { ! tables.add(table); } ! public void setFlat(boolean flat) { ! this.flat = flat; } ! public void execute(Connection conn) throws DatabaseUnitException { IDataSet dataset; - IDatabaseConnection connection = new DatabaseConnection(conn); try { --- 83,108 ---- } ! public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml") ! || format.equalsIgnoreCase("dtd")) ! { ! this.format = format; ! } ! else ! { ! throw new IllegalArgumentException("Type must be one of: 'flat'(default), 'xml', or 'dtd' but was: " + format); ! } } ! public void addTable(Table table) { ! tables.add(table); } ! public void execute(IDatabaseConnection connection) throws DatabaseUnitException { IDataSet dataset; try { *************** *** 100,111 **** dataset = connection.createDataSet(getTableArray()); } ! if (flat) ! { ! FlatXmlDataSet.write(dataset, new FileOutputStream(dest)); ! } ! else { ! XmlDataSet.write(dataset, new FileOutputStream(dest)); ! } } --- 115,137 ---- dataset = connection.createDataSet(getTableArray()); } ! if (dest == null) { ! throw new DatabaseUnitException ("'dest' is a required attribute of the <export> step."); ! } ! else ! { ! if (format.equalsIgnoreCase("flat")) ! { ! FlatXmlDataSet.write(dataset, new FileOutputStream(dest)); ! } ! else if (format.equalsIgnoreCase("xml")) ! { ! XmlDataSet.write(dataset, new FileOutputStream(dest)); ! } ! else if (format.equalsIgnoreCase("dtd")) ! { ! FlatDtdDataSet.write(dataset, new FileOutputStream(dest)); ! } ! } } *************** *** 134,138 **** { return "Executing export: " ! + "\n to file: " + dest.getAbsolutePath(); } --- 160,165 ---- { return "Executing export: " ! + "\n in format: " + format ! + " to datafile: " + getAbsolutePath(dest); } *************** *** 142,147 **** StringBuffer result = new StringBuffer(); result.append("Export: "); ! result.append(" dest=" + dest.getAbsolutePath()); ! result.append(", flat=" + flat); result.append(", tables= " + tables); --- 169,174 ---- StringBuffer result = new StringBuffer(); result.append("Export: "); ! result.append(" dest=" + getAbsolutePath(dest)); ! result.append(", format= " + tables); result.append(", tables= " + tables); Index: Operation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Operation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Operation.java 13 Jun 2002 21:17:06 -0000 1.3 --- Operation.java 15 Jul 2002 01:00:30 -0000 1.4 *************** *** 24,28 **** import org.dbunit.DatabaseUnitException; ! import org.dbunit.database.DatabaseConnection; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; --- 24,28 ---- import org.dbunit.DatabaseUnitException; ! import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; *************** *** 46,52 **** public class Operation implements DbUnitTaskStep { ! protected String type; ! private boolean flat = true; private File src; private DatabaseOperation dbOperation; --- 46,53 ---- public class Operation implements DbUnitTaskStep { ! protected String type; ! private final String DEFAULT_FORMAT = "flat"; ! private String format; private File src; private DatabaseOperation dbOperation; *************** *** 72,83 **** } ! public boolean getFlat() { ! return flat; } public void setType(String type) { - this.type = type; if ("UPDATE".equals(type)) { --- 73,96 ---- } ! public String getFormat() { ! return format != null ? format : DEFAULT_FORMAT; ! } ! ! /** ! * This returns the actual value of the <code>format</code> field, ! * which makes it possible to determine whether the setFormat() method was ever called ! * despite the fact that the <code>getFormat()</code> method returns a default. ! * ! * @return a <code>String</code>, the actual value of the <code>format</code> field. ! * If <code>setFormat()</code> has not been called, this method will return null. ! */ ! String getRawFormat() ! { ! return format; } public void setType(String type) { if ("UPDATE".equals(type)) { *************** *** 122,125 **** --- 135,139 ---- + " or MSSQL_REFRESH but was: " + type); } + this.type = type; } *************** *** 129,138 **** } ! public void setFlat(boolean flat) { ! this.flat = flat; } ! public void execute(Connection conn) throws DatabaseUnitException { if (dbOperation != null) --- 143,160 ---- } ! public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml")) ! { ! this.format = format; ! } ! else ! { ! throw new IllegalArgumentException("Type must be either 'flat'(default) or 'xml' but was: " + format); ! } } ! public void execute(IDatabaseConnection connection) throws DatabaseUnitException { if (dbOperation != null) *************** *** 140,154 **** try { - DatabaseConnection dbConn = new DatabaseConnection(conn); IDataSet dataset; ! if (flat) { ! dataset = new FlatXmlDataSet(new FileInputStream(src)); } ! else { ! dataset = new XmlDataSet(new FileInputStream(src)); } ! dbOperation.execute(dbConn, dataset); } catch (IOException e) --- 162,179 ---- try { IDataSet dataset; ! if (format == null) ! { ! format = DEFAULT_FORMAT; ! } ! if (format.equalsIgnoreCase("xml")) { ! dataset = new XmlDataSet(new FileInputStream(src)); } ! else { ! dataset = new FlatXmlDataSet(new FileInputStream(src)); } ! dbOperation.execute(connection, dataset); } catch (IOException e) *************** *** 170,174 **** { return "Executing operation: " + type ! + "\n on file: " + src.getAbsolutePath(); } --- 195,200 ---- { return "Executing operation: " + type ! + "\n on file: " + src.getAbsolutePath() ! + "\n with format: " + format; } *************** *** 179,183 **** result.append("Operation: "); result.append(" type=" + type); ! result.append(", flat=" + flat); result.append(", src=" + src.getAbsolutePath()); result.append(", dbOperation = " + dbOperation); --- 205,209 ---- result.append("Operation: "); result.append(" type=" + type); ! result.append(", format=" + format); result.append(", src=" + src.getAbsolutePath()); result.append(", dbOperation = " + dbOperation); |
From: <bd...@us...> - 2002-07-15 01:00:39
|
Update of /cvsroot/dbunit/dbunit/src/xml In directory usw-pr-cvs1:/tmp/cvs-serv22997/src/xml Modified Files: antTestBuildFile.xml Log Message: Added export functionality. Also replaced boolean 'flat' with 'format' attributes in Export, Operation, and Composite Index: antTestBuildFile.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/antTestBuildFile.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** antTestBuildFile.xml 13 Jun 2002 21:17:07 -0000 1.2 --- antTestBuildFile.xml 15 Jul 2002 01:00:30 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- <property name="testDataSet" value="src/xml/antTestDataSet.xml"/> <property name="exportDataSet" value="src/xml/antExportDataSet.xml"/> + <property name="exportDtd" value="src/xml/antExport.dtd"/> <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask"/> *************** *** 54,63 **** </target> ! <target name="set-flat-false"> <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <operation type="INSERT" src="${testDataSet}" flat="false"/> </dbunit> </target> --- 55,64 ---- </target> ! <target name="set-format-xml"> <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <operation type="INSERT" src="${testDataSet}" format="xml"/> </dbunit> </target> *************** *** 160,164 **** userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <composite src="${testDataSet}"> <operation type="CLEAN_INSERT"/> <operation type="DELETE"/> --- 161,165 ---- userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <composite src="${testDataSet}" format="xml"> <operation type="CLEAN_INSERT"/> <operation type="DELETE"/> *************** *** 172,176 **** userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <composite src="${testDataSet}"> <operation type="CLEAN_INSERT" src="${testDataSet}"/> <operation type="DELETE"/> --- 173,177 ---- userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <composite src="${testDataSet}" format="xml"> <operation type="CLEAN_INSERT" src="${testDataSet}"/> <operation type="DELETE"/> *************** *** 179,183 **** </target> ! <target name="invalid-composite-operation-flat"> <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" --- 180,184 ---- </target> ! <target name="invalid-composite-operation-format-xml"> <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" *************** *** 185,189 **** password="${dbunit.profile.password}"> <composite src="${testDataSet}"> ! <operation type="CLEAN_INSERT" flat="false"/> <operation type="DELETE"/> </composite> --- 186,190 ---- password="${dbunit.profile.password}"> <composite src="${testDataSet}"> ! <operation type="CLEAN_INSERT" format="xml"/> <operation type="DELETE"/> </composite> *************** *** 214,225 **** </target> ! <target name="test-export-flat"> <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <export dest="${exportDataSet}" flat="false"/>> </dbunit> <delete file="${exportDataSet}"/> </target> --- 215,255 ---- </target> ! <target name="test-export-format-flat"> <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> ! <export dest="${exportDataSet}" format="flat"/> ! </dbunit> ! <delete file="${exportDataSet}"/> ! </target> ! ! <target name="test-export-format-xml"> ! <dbunit driver="${dbunit.profile.driverClass}" ! url="${dbunit.profile.connectionUrl}" ! userid="${dbunit.profile.user}" ! password="${dbunit.profile.password}"> ! <export dest="${exportDataSet}" format="xml"/> </dbunit> <delete file="${exportDataSet}"/> + </target> + + <target name="test-export-format-dtd"> + <dbunit driver="${dbunit.profile.driverClass}" + url="${dbunit.profile.connectionUrl}" + userid="${dbunit.profile.user}" + password="${dbunit.profile.password}"> + <export dest="${exportDtd}" format="dtd"/> + </dbunit> + <delete file="${exportDtd}"/> + </target> + + <target name="invalid-export-format"> + <dbunit driver="${dbunit.profile.driverClass}" + url="${dbunit.profile.connectionUrl}" + userid="${dbunit.profile.user}" + password="${dbunit.profile.password}"> + <export dest="${exportDtd}" format="invalid"/> + </dbunit> </target> |
From: <mla...@us...> - 2002-06-16 20:35:08
|
Update of /cvsroot/dbunit/./dbunit/docs In directory usw-pr-cvs1:/tmp/cvs-serv14842/dbunit/docs Added Files: anttask.html Log Message: * Add missing ant doc html... --- NEW FILE: anttask.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><!-- #BeginTemplate "/Templates/main.dwt" --> <head> <meta http-equiv="Content-Style-Type" content="text/css"> <link href="stylesheet.css" rel="stylesheet" type="text/css"> <!-- #BeginEditable "doctitle" --> <title>The Dbunit Framework - Ant Task</title> <!-- #EndEditable --> </head> <body> <table cellspadding = 0 cellspacing = 0 border = 0 width="100%"> <tr height="100"> <td class="logo" width = 200><img src="images/logo.jpg" width=200 height=100></td> <td class="header"></td> </tr> </table> <table cellspadding = 0 cellspacing = 0 border = 0> <tr> <td class="menu" nowrap valign="top" > <p><a href="index.html">Home</a><br> <br> <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> <a href="properties.html">Properties</a><br> <a href="api/index.html">API Reference</a><br> <a href="faq.html">FAQ</a><br> <br> <a href="changes.html">Changes</a><br> <a href="download.html">Download</a><br> <a href="support.html">Support</a><br> <a href="resources.html">Resources</a><br> <br> </p> <div align="center"><a href="http://sourceforge.net"> <img alt="SourceForge Logo" border="0" height="31" width="88" src="http://sourceforge.net/sflogo.php?group_id=47439"> </a></div> <br> <div align="center"><a href="http://www.silphid.com/"><img alt="Silphid Creations" src="images/silphid.gif" border=0></a></div> </td> <td class="body" valign="top"> <!-- #BeginEditable "body" --> <h2>Ant Integration</h2> <h3>Installation</h3> The steps required to add the DbUnit task to your system are: <ol> <li>Add the DbUnit jar to Ant's classpath. </li> <li>Add a <taskdef> element to your build script as follows: <pre class=code><taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask"/></pre> </li> <li>Use the task in the rest of the buildfile. </li> </ol> <h3>Usage </h3> <p>Executes either a single transaction, or a group of transactions, under the DbUnit database testing framework.</p> <h4>Parameters</h4> <table border="1"> <tr> <td><b>Attribute</b></td> <td><b>Description</b></td> <td><b>Required</b></td> </tr> <tr> <td>driver</td> <td>Class name of the jdbc driver</td> <td>Yes</td> </tr> <tr> <td>url</td> <td>Database connection url</td> <td>Yes</td> </tr> <tr> <td>userid</td> <td>Database username</td> <td>Yes</td> </tr> <tr> <td>password</td> <td>Database password</td> <td>Yes</td> </tr> </table> <h4>Parameters specified as nested elements</h4> <table cellspadding = 0 border = 1 > <tr> <td>operation</td> <td> <p>Use nested <operation> elements to specify which DbUnit operation to perform on the particular file. <br> </p> <table border="1"> <tr> <td><b>Attribute</b></td> <td><b>Description</b></td> <td><b>Required</b></td> </tr> <tr> <td>type</td> <td>Type of Database operation to perform. Supported types are<br> UPDATE, INSERT, DELETE, <br> DELETE_ALL, REFRESH, <br> CLEAN_INSERT, MSSQL_INSERT,<br> MSSQL_REFRESH, MSSQL_CLEAN_INSERT.</td> <td>Yes</td> </tr> <tr> <td>src</td> <td>The xml source upon which the operation is to be performed</td> <td>Yes</td> </tr> <tr> <td>flat</td> <td>If true, use <a class="code">FlatXmlDataSet</a> type in the supplied src file. Otherwise use <a class="code">XmlDataSet</a>. Defaults to <a class="code">true</a></td> <td> <p>No</p> </td> </tr> </table> </td> </tr> <tr> <td>composite</td> <td> <p>Use nested <a class="code"><composite></a> operation elements to combine multiple <a class="code"><operation></a>s (on the same file) into a single one.</p> <table border="1"> <tr> <td><b>Attribute</b></td> <td><b>Description</b></td> <td><b>Required</b></td> </tr> <tr> <td>src</td> <td>The xml source upon which the operation is to be performed</td> <td>Yes</td> </tr> <tr> <td>flat</td> <td>If true, use <a class="code">FlatXmlDataSet</a> type in the supplied src file. Otherwise use <a class="code">XmlDataSet</a>. Defaults to <a class="code">true</a></td> <td> <p>No</p> </td> </tr> </table> <h4>Parameters specified as nested elements </h4> <table border="1"> <tr> <td>operation</td> <td>See above definition for details. The src and flat attributes are supplied as attributes to the <a class="code"><composite></a> step and should not be attempted to be overridden by the nested <a class="code"><operation></a> step.</td> </tr> </table> </td> </tr> <tr> <td>export</td> <td> <p>Use nested <a class="code"><export></a> operation elements to export the database to the supplied filename. The default operation is to <a class="code"><export></a> the entire database to the destination filename with the supplied dataset type. You can specify individual tables to<br> <a class="code"><export></a> by nesting them under the <export> step.</p> <table width="100%" border="1"> <tr> <td><b>Attribute</b></td> <td><b>Description</b></td> <td><b>Required</b></td> </tr> <tr> <td>dest</td> <td>The xml destination filename</td> <td>Yes</td> </tr> <tr> <td>flat</td> <td>If true, use <a class="code">FlatXmlDataSet</a> type in the supplied src file. Otherwise use <a class="code">XmlDataSet</a>. Defaults to <a class="code">true</a></td> <td> <p>No</p> </td> </tr> </table> <h4>Parameters specified as nested elements </h4> <table border="1"> <tr> <td>table</td> <td> <p>Use nested <a class=code><table></a> elements to <a class=code><export></a> specific tables. </p> <table border="1"> <tr> <td><b>Attribute</b></td> <td><b>Description</b></td> <td><b>Required</b></td> </tr> <tr> <td>name</td> <td>Name of the database table to export.</td> <td>No</td> </tr> </table> </td> </tr> </table> </td> </tr> </table> <h3>Examples</h3> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <operation type="UPDATE" src="updateFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and executes the UPDATE operation contained within the FlatXmlDataSet file updateFile.xml.</p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <operation type="INSERT" src="insertFile.xml"/><br> <operation type="UPDATE" src="updateFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the INSERT operation contained within the FlatXmlDataSet file insertFile.xml <br> followed by the execution of the UPDATE operation contained within the FlatXmlDataSet file updateFile.xml.</p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <operation type="UPDATE" src="updateFile.xml" flat="false"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and executes the UPDATE operation contained within the XmlDataSet file updateFile.xml.</p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <composite src="compositeFile.xml"><br> <operation type="DELETE"/><br> <operation type="INSERT"/><br> </composite><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the CompositeOperation, DELETE and then UPDATE, contained within the FlatXmlDataSet file updateFile.xml.</p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <composite src="compositeFile.xml" flat="false"><br> <operation type="INSERT"/><br> <operation type="UPDATE"/><br> </composite><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver. It then executes the CompositeOperation, DELETE and then UPDATE, contained within the XmlDataSet file updateFile.xml.</p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <export dest="exportFile.xml"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the database to the given destination file as a FlatXmlDataSet. </p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <export dest="exportNonFlatFile.xml" flat="false"/><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the database to the given destination file as an XmlDataSet. </p> <pre> <dbunit driver="org.hsqldb.jdbcDriver"<br> url="jdbc:hsqldb:."<br> userid="dbunit"<br> password="dbunit"><br> <export dest="exportFile.xml"><br> <table name="FOO"/><br> <table name="BAR"/><br> </export><br> </dbunit></pre> <p> Connects to the database given in url as the dbunit user using the org.hsqldb.jdbcDriver and exports the contents of the provided tables to the given destination file as an XmlDataSet. <br> </p> <!-- #EndEditable --> <hr> <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision: 1.1 $ $Date: 2002/06/16 20:35:02 $</font> </div> </tr> </table> </body> <!-- #EndTemplate --></html> |
From: <mla...@us...> - 2002-06-16 19:21:12
|
Update of /cvsroot/dbunit/dbunit/docs/api In directory usw-pr-cvs1:/tmp/cvs-serv20811/dbunit/docs/api Modified Files: index.html Log Message: * Added Ant html documentation... Index: index.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/api/index.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index.html 5 Jun 2002 21:26:04 -0000 1.12 --- index.html 16 Jun 2002 19:21:09 -0000 1.13 *************** *** 24,27 **** --- 24,28 ---- <a href="../intro.html">Introduction</a><br> <a href="../components.html">Core classes</a><br> + <a href="../anttask.html">Ant Task</a><br> <a href="../howto.html">How-to Guides</a><br> <a href="../bestpractices.html">Best Practices</a><br> *************** *** 51,59 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="../index.html">Home</a> - <a href="../intro.html">Introduction</a> - <a href="../components.html">Core Classes</a> ! - <a href="../howto.html">How-to Guides</a> - <a href="../bestpractices.html">Best ! Practices</a> - <a href="index.html">API Reference</a> - <a href="../faq.html">FAQ</a> ! - <a href="../changes.html">Changes History</a> - <a href="../download.html">Download</a> ! - <a href="../support.html">Support</a> - <a href="../resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 52,62 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="../index.html">Home</a> - <a href="../intro.html">Introduction</a> ! - <a href="../components.html">Core Classes</a> - <a href="../anttask.html">Ant ! Task</a> - <a href="../howto.html">How-to Guides</a> - <a href="../bestpractices.html">Best ! Practices</a> - <a href="../properties.html">Properties</a> - <a href="index.html">API ! Reference</a> - <a href="../faq.html">FAQ</a> - <a href="../changes.html">Changes ! History</a> - <a href="../download.html">Download</a> - <a href="../support.html">Support</a> ! - <a href="../resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> |
From: <mla...@us...> - 2002-06-16 19:21:12
|
Update of /cvsroot/dbunit/dbunit/docs In directory usw-pr-cvs1:/tmp/cvs-serv20811/dbunit/docs Modified Files: bestpractices.html changes.html components.html download.html faq.html howto.html index.html intro.html properties.html resources.html support.html Log Message: * Added Ant html documentation... Index: bestpractices.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/bestpractices.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bestpractices.html 5 Jun 2002 21:26:03 -0000 1.14 --- bestpractices.html 16 Jun 2002 19:21:09 -0000 1.15 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 119,127 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 120,130 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: changes.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/changes.html,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** changes.html 5 Jun 2002 21:26:03 -0000 1.23 --- changes.html 16 Jun 2002 19:21:09 -0000 1.24 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 155,163 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 156,166 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: components.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/components.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** components.html 5 Jun 2002 21:26:03 -0000 1.15 --- components.html 16 Jun 2002 19:21:09 -0000 1.16 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 316,324 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 317,327 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: download.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/download.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** download.html 5 Jun 2002 21:26:03 -0000 1.17 --- download.html 16 Jun 2002 19:21:09 -0000 1.18 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 55,63 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 56,66 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: faq.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/faq.html,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** faq.html 5 Jun 2002 21:26:03 -0000 1.16 --- faq.html 16 Jun 2002 19:21:09 -0000 1.17 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 98,106 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 99,109 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: howto.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/howto.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** howto.html 5 Jun 2002 21:26:03 -0000 1.17 --- howto.html 16 Jun 2002 19:21:09 -0000 1.18 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 281,289 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 282,292 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: index.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/index.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** index.html 5 Jun 2002 21:26:03 -0000 1.20 --- index.html 16 Jun 2002 19:21:09 -0000 1.21 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 75,83 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 76,86 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: intro.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/intro.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** intro.html 5 Jun 2002 21:26:03 -0000 1.4 --- intro.html 16 Jun 2002 19:21:09 -0000 1.5 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 133,141 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 134,144 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: properties.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/properties.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** properties.html 5 Jun 2002 21:26:03 -0000 1.1 --- properties.html 16 Jun 2002 19:21:09 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 94,102 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 95,105 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: resources.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/resources.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** resources.html 5 Jun 2002 21:26:02 -0000 1.12 --- resources.html 16 Jun 2002 19:21:09 -0000 1.13 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 71,79 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 72,82 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> Index: support.html =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/support.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** support.html 5 Jun 2002 21:26:03 -0000 1.11 --- support.html 16 Jun 2002 19:21:09 -0000 1.12 *************** *** 24,27 **** --- 24,28 ---- <a href="intro.html">Introduction</a><br> <a href="components.html">Core classes</a><br> + <a href="anttask.html">Ant Task</a><br> <a href="howto.html">How-to Guides</a><br> <a href="bestpractices.html">Best Practices</a><br> *************** *** 55,63 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> - <a href="components.html">Core Classes</a> ! - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="api/index.html">API Reference</a> - <a href="faq.html">FAQ</a> ! - <a href="changes.html">Changes History</a> - <a href="download.html">Download</a> ! - <a href="support.html">Support</a> - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 56,66 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="index.html">Home</a> - <a href="intro.html">Introduction</a> ! - <a href="components.html">Core Classes</a> - <a href="anttask.html">Ant ! Task</a> - <a href="howto.html">How-to Guides</a> - <a href="bestpractices.html">Best ! Practices</a> - <a href="properties.html">Properties</a> - <a href="api/index.html">API ! Reference</a> - <a href="faq.html">FAQ</a> - <a href="changes.html">Changes ! History</a> - <a href="download.html">Download</a> - <a href="support.html">Support</a> ! - <a href="resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> |
From: <mla...@us...> - 2002-06-16 19:21:11
|
Update of /cvsroot/dbunit/dbunit/docs/Templates In directory usw-pr-cvs1:/tmp/cvs-serv20811/dbunit/docs/Templates Modified Files: main.dwt Log Message: * Added Ant html documentation... Index: main.dwt =================================================================== RCS file: /cvsroot/dbunit/dbunit/docs/Templates/main.dwt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** main.dwt 5 Jun 2002 21:26:04 -0000 1.12 --- main.dwt 16 Jun 2002 19:21:09 -0000 1.13 *************** *** 23,26 **** --- 23,27 ---- <a href="../intro.html">Introduction</a><br> <a href="../components.html">Core classes</a><br> + <a href="../anttask.html">Ant Task</a><br> <a href="../howto.html">How-to Guides</a><br> <a href="../bestpractices.html">Best Practices</a><br> *************** *** 48,56 **** <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="../index.html">Home</a> - <a href="../intro.html">Introduction</a> - <a href="../components.html">Core Classes</a> ! - <a href="../howto.html">How-to Guides</a> - <a href="../bestpractices.html">Best ! Practices</a> - <a href="../api/index.html">API Reference</a> - <a href="../faq.html">FAQ</a> ! - <a href="../changes.html">Changes History</a> - <a href="../download.html">Download</a> ! - <a href="../support.html">Support</a> - <a href="../resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> --- 49,59 ---- <div align="center"> <p><font size="2">Copyright ©2002, Manuel Laflamme, All Rights Reserved</font></p> ! <p><font size="1"><a href="../index.html">Home</a> - <a href="../intro.html">Introduction</a> ! - <a href="../components.html">Core Classes</a> - <a href="../anttask.html">Ant ! Task</a> - <a href="../howto.html">How-to Guides</a> - <a href="../bestpractices.html">Best ! Practices</a> - <a href="../properties.html">Properties</a> - <a href="../api/index.html">API ! Reference</a> - <a href="../faq.html">FAQ</a> - <a href="../changes.html">Changes ! History</a> - <a href="../download.html">Download</a> - <a href="../support.html">Support</a> ! - <a href="../resources.html">Resources</a></font></p> <font size="1">$Revision$ $Date$</font> </div> </tr> |
From: <mla...@us...> - 2002-06-16 19:21:11
|
Update of /cvsroot/dbunit/dbunit In directory usw-pr-cvs1:/tmp/cvs-serv20811/dbunit Modified Files: dbunit.ipr Log Message: * Added Ant html documentation... Index: dbunit.ipr =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** dbunit.ipr 13 Jun 2002 17:24:53 -0000 1.43 --- dbunit.ipr 16 Jun 2002 19:21:08 -0000 1.44 *************** *** 290,298 **** <component class="com.intellij.ide.desktop.IdeDocumentManager"> <recent_files> - <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" column="25" line="1" /> - <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AllTests.java" column="40" line="36" /> - <file_info url="file://$PROJECT_DIR$/src/test/org/apache/tools/ant/taskdefs/TaskdefsTest.java" column="40" line="144" /> - <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/DatabaseEnvironment.java" column="45" line="53" /> - <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AbstractDatabaseTest.java" column="22" line="34" /> <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/AbstractDatabaseConnectionTest.java" column="22" line="31" /> <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" column="50" line="35" /> --- 290,293 ---- *************** *** 301,317 **** <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" column="52" line="82" /> <file_info url="file://$PROJECT_DIR$/profile.properties" column="56" line="50" /> - <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" column="33" line="47" /> <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/HypersonicEnvironment.java" column="0" line="0" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/OracleEnvironment.java" column="28" line="27" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/AbstractBatchOperationTest.java" column="46" line="2" /> </recent_files> <open_files> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" column="33" line="47" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/OracleEnvironment.java" column="28" line="27" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/AbstractBatchOperationTest.java" column="46" line="2" /> ! <active_file url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/AbstractBatchOperationTest.java" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/HypersonicEnvironment.java" column="0" line="0" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" column="52" line="82" /> ! <file_info url="file://$PROJECT_DIR$/profile.properties" column="56" line="50" /> </open_files> </component> --- 296,316 ---- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" column="52" line="82" /> <file_info url="file://$PROJECT_DIR$/profile.properties" column="56" line="50" /> <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/HypersonicEnvironment.java" column="0" line="0" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/OracleEnvironment.java" column="26" line="27" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" column="33" line="47" /> ! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/AbstractBatchOperationTest.java" column="2" line="2" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Composite.java" column="11" line="41" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" column="13" line="41" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Export.java" column="13" line="46" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Operation.java" column="13" line="45" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Table.java" column="13" line="31" /> </recent_files> <open_files> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" column="13" line="41" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Export.java" column="13" line="46" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Operation.java" column="13" line="45" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Table.java" column="13" line="31" /> ! <active_file url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Table.java" /> ! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Composite.java" column="11" line="41" /> </open_files> </component> *************** *** 325,336 **** <navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" /> <navigator id="ProjectNavigator" flattenPackages="false" showMembers="false"> - <expanded_node type="directory" url="file://$PROJECT_DIR$" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> </navigator> <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true"> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/operation" /> </navigator> </component> --- 324,333 ---- <navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" /> <navigator id="ProjectNavigator" flattenPackages="false" showMembers="false"> <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$" /> </navigator> <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true"> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> </navigator> </component> |