Menu
▾
▴
dbunit-commit
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...> - 2004-03-30 18:12:59
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21070/src/java/org/dbunit/dataset/xml Modified Files: FlatXmlWriter.java Log Message: Added ability to add DOCTYPE declaration when writing a flat Xml dataset. Index: FlatXmlWriter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlWriter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FlatXmlWriter.java 22 Jan 2004 02:54:19 -0000 1.5 --- FlatXmlWriter.java 30 Mar 2004 18:01:19 -0000 1.6 *************** *** 47,50 **** --- 47,51 ---- private int _activeRowCount; private boolean _includeEmptyTable = false; + private String _systemId = null; public FlatXmlWriter(Writer writer) *************** *** 65,68 **** --- 66,74 ---- } + public void setDocType(String systemId) + { + _systemId = systemId; + } + public void write(IDataSet dataSet) throws DataSetException { *************** *** 80,83 **** --- 86,90 ---- { _xmlWriter.writeDeclaration(); + _xmlWriter.writeDoctype(_systemId, null); _xmlWriter.writeElement(DATASET); } |
|
From: <mla...@us...> - 2004-03-30 18:12:59
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21070/src/test/org/dbunit/dataset/xml Modified Files: FlatXmlWriterTest.java Log Message: Added ability to add DOCTYPE declaration when writing a flat Xml dataset. Index: FlatXmlWriterTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatXmlWriterTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FlatXmlWriterTest.java 15 Mar 2004 16:44:21 -0000 1.4 --- FlatXmlWriterTest.java 30 Mar 2004 18:01:19 -0000 1.5 *************** *** 72,75 **** --- 72,103 ---- xmlWriter.write(new DefaultDataSet(table1, table2)); + String actualOutput = stringWriter.toString(); + assertEquals("output", expectedOutput, actualOutput); + } + + public void testWriteWithDocType() throws Exception + { + String expectedOutput = + "<!DOCTYPE dataset SYSTEM \"dataset.dtd\">\n" + + "<dataset>\n" + + " <TABLE1 COL0=\"v1\" COL1=\"v2\"/>\n" + + "</dataset>\n"; + + String col0 = "COL0"; + String col1 = "COL1"; + Column[] columns = new Column[]{ + new Column(col0, DataType.UNKNOWN), + new Column(col1, DataType.UNKNOWN) + }; + + DefaultTable table1 = new DefaultTable("TABLE1", columns); + table1.addRow(); + table1.setValue(0, col0, "v1"); + table1.setValue(0, col1, "v2"); + + StringWriter stringWriter = new StringWriter(); + FlatXmlWriter xmlWriter = new FlatXmlWriter(stringWriter); + xmlWriter.setDocType("dataset.dtd"); + xmlWriter.write(new DefaultDataSet(table1)); String actualOutput = stringWriter.toString(); |
|
From: <mla...@us...> - 2004-03-30 17:45:01
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15630/src/java/org/dbunit/dataset/xml Modified Files: FlatXmlDataSet.java Log Message: #925585: Fixed constructors taking InputStream/Reader for loading DTD. Index: FlatXmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** FlatXmlDataSet.java 15 Mar 2004 16:44:18 -0000 1.26 --- FlatXmlDataSet.java 30 Mar 2004 17:33:15 -0000 1.27 *************** *** 135,141 **** throws IOException, DataSetException { ! super(new FlatXmlProducer( ! new InputSource(xmlReader), ! new DtdEntityResolver(dtdReader))); } --- 135,139 ---- throws IOException, DataSetException { ! this(xmlReader, new FlatDtdDataSet(dtdReader)); } *************** *** 188,194 **** throws IOException, DataSetException { ! super(new FlatXmlProducer( ! new InputSource(xmlStream), ! new DtdEntityResolver(dtdStream))); } --- 186,190 ---- throws IOException, DataSetException { ! this(xmlStream, new FlatDtdDataSet(dtdStream)); } *************** *** 245,275 **** FlatDtdDataSet.write(dataSet, out); } - - private static class DtdEntityResolver implements EntityResolver - { - InputSource _dtdSource; - - public DtdEntityResolver(InputSource dtdSource) - { - _dtdSource = dtdSource; - } - - public DtdEntityResolver(Reader dtdReader) - { - this(new InputSource(dtdReader)); - } - - public DtdEntityResolver(InputStream dtdStream) - { - this(new InputSource(dtdStream)); - } - - public InputSource resolveEntity(String publicId, String systemId) - throws SAXException, IOException - { - return _dtdSource; - } - - } } --- 241,244 ---- |
|
From: <mla...@us...> - 2004-03-29 01:11:29
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20898/src/test/org/dbunit/operation Modified Files: InsertOperationTest.java Log Message: Do not ignore null values anymore in INSERT statements but. Now ignore <none/> values from XmlDataSet. FlatXmlDataSet must use the ReplacementDataSet to achieve the same behaviour. Index: InsertOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/InsertOperationTest.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** InsertOperationTest.java 15 Mar 2004 16:44:21 -0000 1.25 --- InsertOperationTest.java 29 Mar 2004 01:00:05 -0000 1.26 *************** *** 151,155 **** } ! public void testExecuteIgnoreNull() throws Exception { String schemaName = "schema"; --- 151,155 ---- } ! public void testExecuteIgnoreNone() throws Exception { String schemaName = "schema"; *************** *** 166,173 **** List valueList = new ArrayList(); valueList.add(new Object[]{"toto", "1234", Boolean.FALSE}); ! valueList.add(new Object[]{null, new Double("123.45"), "true"}); valueList.add(new Object[]{"qwerty1", "1", Boolean.TRUE}); valueList.add(new Object[]{"qwerty2", "2", Boolean.FALSE}); ! valueList.add(new Object[]{null, null, Boolean.FALSE}); Column[] columns = new Column[]{ new Column("c1", DataType.VARCHAR), --- 166,173 ---- List valueList = new ArrayList(); valueList.add(new Object[]{"toto", "1234", Boolean.FALSE}); ! valueList.add(new Object[]{ITable.NO_VALUE, new Double("123.45"), "true"}); valueList.add(new Object[]{"qwerty1", "1", Boolean.TRUE}); valueList.add(new Object[]{"qwerty2", "2", Boolean.FALSE}); ! valueList.add(new Object[]{ITable.NO_VALUE, ITable.NO_VALUE, Boolean.FALSE}); Column[] columns = new Column[]{ new Column("c1", DataType.VARCHAR), *************** *** 203,206 **** --- 203,260 ---- } + // public void testExecuteNullAsNone() throws Exception + // { + // String schemaName = "schema"; + // String tableName = "table"; + // String[] expected = { + // "insert into schema.table (c1, c2, c3) values ('toto', 1234, 'false')", + // "insert into schema.table (c2, c3) values (123.45, 'true')", + // "insert into schema.table (c1, c2, c3) values ('qwerty1', 1, 'true')", + // "insert into schema.table (c1, c2, c3) values ('qwerty2', 2, 'false')", + // "insert into schema.table (c3) values ('false')", + // }; + // + // // setup table + // List valueList = new ArrayList(); + // valueList.add(new Object[]{"toto", "1234", Boolean.FALSE}); + // valueList.add(new Object[]{null, new Double("123.45"), "true"}); + // valueList.add(new Object[]{"qwerty1", "1", Boolean.TRUE}); + // valueList.add(new Object[]{"qwerty2", "2", Boolean.FALSE}); + // valueList.add(new Object[]{null, null, Boolean.FALSE}); + // 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(table); + // + // // setup mock objects + // MockBatchStatement statement = new MockBatchStatement(); + // statement.addExpectedBatchStrings(expected); + // statement.setExpectedExecuteBatchCalls(4); + // statement.setExpectedClearBatchCalls(4); + // statement.setExpectedCloseCalls(4); + // + // MockStatementFactory factory = new MockStatementFactory(); + // factory.setExpectedCreatePreparedStatementCalls(4); + // factory.setupStatement(statement); + // + // MockDatabaseConnection connection = new MockDatabaseConnection(); + // connection.setupDataSet(dataSet); + // connection.setupSchema(schemaName); + // connection.setupStatementFactory(factory); + // connection.setExpectedCloseCalls(0); + // DatabaseConfig config = connection.getConfig(); + // config.setFeature(DatabaseConfig.FEATURE_NULL_AS_NONE, true); + // + // // execute operation + // new InsertOperation().execute(connection, dataSet); + // + // statement.verify(); + // factory.verify(); + // connection.verify(); + // } + public void testExecuteWithEscapedNames() throws Exception { |
|
From: <mla...@us...> - 2004-03-29 01:11:29
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20898/src/java/org/dbunit/operation Modified Files: AbstractBatchOperation.java InsertOperation.java RefreshOperation.java Log Message: Do not ignore null values anymore in INSERT statements but. Now ignore <none/> values from XmlDataSet. FlatXmlDataSet must use the ReplacementDataSet to achieve the same behaviour. Index: AbstractBatchOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** AbstractBatchOperation.java 15 Mar 2004 16:44:18 -0000 1.26 --- AbstractBatchOperation.java 29 Mar 2004 00:59:54 -0000 1.27 *************** *** 80,84 **** * a column to ignore. */ ! BigInteger getIngnoreMapping(ITable table, int row) throws DataSetException { --- 80,84 ---- * a column to ignore. */ ! BigInteger getIgnoreMapping(ITable table, int row) throws DataSetException { *************** *** 151,155 **** } ! ignoreMapping = getIngnoreMapping(table, row); operationData = getOperationData(metaData, ignoreMapping, connection); statement = factory.createPreparedBatchStatement( --- 151,155 ---- } ! ignoreMapping = getIgnoreMapping(table, row); operationData = getOperationData(metaData, ignoreMapping, connection); statement = factory.createPreparedBatchStatement( Index: InsertOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/InsertOperation.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** InsertOperation.java 22 Jan 2004 02:54:19 -0000 1.15 --- InsertOperation.java 29 Mar 2004 00:59:55 -0000 1.16 *************** *** 93,97 **** } ! protected BigInteger getIngnoreMapping(ITable table, int row) throws DataSetException { Column[] columns = table.getTableMetaData().getColumns(); --- 93,97 ---- } ! protected BigInteger getIgnoreMapping(ITable table, int row) throws DataSetException { Column[] columns = table.getTableMetaData().getColumns(); *************** *** 103,107 **** { Object value = table.getValue(row, columns[i].getColumnName()); ! if (value == null) { result[result.length - (i / 8) - 1] |= (1 << (i % 8)); --- 103,107 ---- { Object value = table.getValue(row, columns[i].getColumnName()); ! if (value == ITable.NO_VALUE) { result[result.length - (i / 8) - 1] |= (1 << (i % 8)); *************** *** 120,124 **** boolean bit = ignoreMapping.testBit(i); Object value = table.getValue(row, columns[i].getColumnName()); ! if ((bit && value != null) || (!bit && value == null)) { return false; --- 120,124 ---- boolean bit = ignoreMapping.testBit(i); Object value = table.getValue(row, columns[i].getColumnName()); ! if ((bit && value != ITable.NO_VALUE) || (!bit && value == ITable.NO_VALUE)) { return false; Index: RefreshOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** RefreshOperation.java 15 Mar 2004 16:44:19 -0000 1.33 --- RefreshOperation.java 29 Mar 2004 01:00:05 -0000 1.34 *************** *** 200,204 **** } ! _ignoreMapping = _insertOperation.getIngnoreMapping(table, row); _operationData = _insertOperation.getOperationData(_metaData, _ignoreMapping, _connection); --- 200,204 ---- } ! _ignoreMapping = _insertOperation.getIgnoreMapping(table, row); _operationData = _insertOperation.getOperationData(_metaData, _ignoreMapping, _connection); |
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/operation Modified Files: AbstractBatchOperation.java AbstractOperation.java DeleteOperation.java RefreshOperation.java UpdateOperation.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: AbstractBatchOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** AbstractBatchOperation.java 10 Feb 2004 01:58:50 -0000 1.25 --- AbstractBatchOperation.java 15 Mar 2004 16:44:18 -0000 1.26 *************** *** 27,37 **** import org.dbunit.database.statement.IPreparedBatchStatement; import org.dbunit.database.statement.IStatementFactory; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.RowOutOfBoundsException; import java.math.BigInteger; --- 27,31 ---- import org.dbunit.database.statement.IPreparedBatchStatement; import org.dbunit.database.statement.IStatementFactory; ! import org.dbunit.dataset.*; import java.math.BigInteger; Index: AbstractOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractOperation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AbstractOperation.java 3 Feb 2004 01:27:11 -0000 1.3 --- AbstractOperation.java 15 Mar 2004 16:44:19 -0000 1.4 *************** *** 21,37 **** package org.dbunit.operation; import org.dbunit.database.DatabaseConfig; import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.NoSuchColumnException; ! import org.dbunit.dataset.DefaultTableMetaData; ! import org.dbunit.DatabaseUnitException; import java.sql.SQLException; - import java.util.List; import java.util.ArrayList; /** --- 21,32 ---- package org.dbunit.operation; + import org.dbunit.DatabaseUnitException; import org.dbunit.database.DatabaseConfig; import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.*; import java.sql.SQLException; import java.util.ArrayList; + import java.util.List; /** Index: DeleteOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DeleteOperation.java 22 Jan 2004 02:54:19 -0000 1.16 --- DeleteOperation.java 15 Mar 2004 16:44:19 -0000 1.17 *************** *** 24,33 **** import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoPrimaryKeyException; import java.math.BigInteger; --- 24,28 ---- import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.*; import java.math.BigInteger; Index: RefreshOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** RefreshOperation.java 3 Feb 2004 01:27:11 -0000 1.32 --- RefreshOperation.java 15 Mar 2004 16:44:19 -0000 1.33 *************** *** 26,37 **** import org.dbunit.database.statement.IPreparedBatchStatement; import org.dbunit.database.statement.SimplePreparedStatement; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoPrimaryKeyException; ! import org.dbunit.dataset.RowOutOfBoundsException; import org.dbunit.dataset.datatype.DataType; --- 26,30 ---- import org.dbunit.database.statement.IPreparedBatchStatement; import org.dbunit.database.statement.SimplePreparedStatement; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; Index: UpdateOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/UpdateOperation.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** UpdateOperation.java 22 Jan 2004 02:54:20 -0000 1.12 --- UpdateOperation.java 15 Mar 2004 16:44:19 -0000 1.13 *************** *** 23,31 **** import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoPrimaryKeyException; import java.math.BigInteger; --- 23,27 ---- import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.*; import java.math.BigInteger; |
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/dataset/xml Modified Files: FlatDtdDataSet.java FlatDtdProducer.java FlatXmlDataSet.java FlatXmlProducer.java XmlDataSet.java XmlDataSetWriter.java XmlProducer.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: FlatDtdDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FlatDtdDataSet.java 22 Jan 2004 02:54:19 -0000 1.11 --- FlatDtdDataSet.java 15 Mar 2004 16:44:18 -0000 1.12 *************** *** 22,50 **** package org.dbunit.dataset.xml; ! import org.dbunit.dataset.AbstractDataSet; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DefaultTable; ! import org.dbunit.dataset.DefaultTableIterator; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoSuchTableException; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; - import org.xml.sax.InputSource; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.OutputStream; ! import java.io.OutputStreamWriter; ! import java.io.Reader; ! import java.io.Writer; ! import java.util.ArrayList; ! import java.util.Arrays; ! import java.util.HashMap; ! import java.util.List; ! import java.util.Map; /** --- 22,32 ---- package org.dbunit.dataset.xml; ! import org.dbunit.dataset.*; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; import org.xml.sax.InputSource; ! import java.io.*; ! import java.util.*; /** Index: FlatDtdProducer.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdProducer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FlatDtdProducer.java 22 Jan 2004 02:54:19 -0000 1.4 --- FlatDtdProducer.java 15 Mar 2004 16:44:18 -0000 1.5 *************** *** 28,38 **** import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; ! ! import org.xml.sax.EntityResolver; ! import org.xml.sax.InputSource; ! import org.xml.sax.SAXException; ! import org.xml.sax.SAXNotRecognizedException; ! import org.xml.sax.SAXNotSupportedException; ! import org.xml.sax.XMLReader; import org.xml.sax.ext.DeclHandler; import org.xml.sax.ext.LexicalHandler; --- 28,32 ---- import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; ! import org.xml.sax.*; import org.xml.sax.ext.DeclHandler; import org.xml.sax.ext.LexicalHandler; *************** *** 43,51 **** import java.io.IOException; import java.io.StringReader; ! import java.util.HashMap; ! import java.util.LinkedList; ! import java.util.List; ! import java.util.Map; ! import java.util.StringTokenizer; /** --- 37,41 ---- import java.io.IOException; import java.io.StringReader; ! import java.util.*; /** Index: FlatXmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** FlatXmlDataSet.java 22 Jan 2004 02:54:19 -0000 1.25 --- FlatXmlDataSet.java 15 Mar 2004 16:44:18 -0000 1.26 *************** *** 25,40 **** import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.IDataSet; - import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; ! import java.io.File; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.OutputStream; ! import java.io.OutputStreamWriter; ! import java.io.Reader; ! import java.io.Writer; /** --- 25,33 ---- import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.IDataSet; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; ! import java.io.*; /** Index: FlatXmlProducer.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlProducer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FlatXmlProducer.java 22 Jan 2004 02:54:19 -0000 1.6 --- FlatXmlProducer.java 15 Mar 2004 16:44:18 -0000 1.7 *************** *** 21,41 **** package org.dbunit.dataset.xml; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DefaultTableMetaData; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.stream.DefaultConsumer; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; ! ! import org.xml.sax.Attributes; ! import org.xml.sax.ContentHandler; ! import org.xml.sax.EntityResolver; ! import org.xml.sax.InputSource; ! import org.xml.sax.SAXException; ! import org.xml.sax.SAXParseException; ! import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; --- 21,30 ---- package org.dbunit.dataset.xml; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.stream.DefaultConsumer; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; ! import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; Index: XmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlDataSet.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** XmlDataSet.java 22 Jan 2004 02:54:19 -0000 1.19 --- XmlDataSet.java 15 Mar 2004 16:44:18 -0000 1.20 *************** *** 25,37 **** import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.IDataSet; - import org.xml.sax.InputSource; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.OutputStream; ! import java.io.OutputStreamWriter; ! import java.io.Reader; ! import java.io.Writer; /** --- 25,31 ---- import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.IDataSet; import org.xml.sax.InputSource; ! import java.io.*; /** Index: XmlDataSetWriter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlDataSetWriter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XmlDataSetWriter.java 22 Jan 2004 02:54:19 -0000 1.4 --- XmlDataSetWriter.java 15 Mar 2004 16:44:18 -0000 1.5 *************** *** 21,29 **** package org.dbunit.dataset.xml; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; --- 21,25 ---- package org.dbunit.dataset.xml; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; Index: XmlProducer.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlProducer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** XmlProducer.java 22 Jan 2004 02:54:19 -0000 1.5 --- XmlProducer.java 15 Mar 2004 16:44:18 -0000 1.6 *************** *** 21,41 **** package org.dbunit.dataset.xml; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DefaultTableMetaData; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.stream.DefaultConsumer; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; ! ! import org.xml.sax.Attributes; ! import org.xml.sax.ContentHandler; ! import org.xml.sax.ErrorHandler; ! import org.xml.sax.InputSource; ! import org.xml.sax.SAXException; ! import org.xml.sax.SAXParseException; ! import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; --- 21,30 ---- package org.dbunit.dataset.xml; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.stream.DefaultConsumer; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.dataset.stream.IDataSetProducer; ! import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; |
|
From: <fsp...@us...> - 2004-03-15 16:54:10
|
Update of /cvsroot/dbunit/dbunit/src/test/org/apache/tools/ant/taskdefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/apache/tools/ant/taskdefs Modified Files: TaskdefsTest.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: TaskdefsTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/apache/tools/ant/taskdefs/TaskdefsTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TaskdefsTest.java 22 Jan 2004 02:54:20 -0000 1.5 --- TaskdefsTest.java 15 Mar 2004 16:44:19 -0000 1.6 *************** *** 56,64 **** import junit.framework.TestCase; ! import org.apache.tools.ant.BuildEvent; ! import org.apache.tools.ant.BuildException; ! import org.apache.tools.ant.BuildListener; ! import org.apache.tools.ant.Project; ! import org.apache.tools.ant.ProjectHelper; import java.io.File; --- 56,60 ---- import junit.framework.TestCase; ! import org.apache.tools.ant.*; import java.io.File; |
|
From: <fsp...@us...> - 2004-03-15 16:54:09
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/dbunit/dataset/datatype Modified Files: BytesDataTypeTest.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: BytesDataTypeTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/BytesDataTypeTest.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** BytesDataTypeTest.java 24 Feb 2004 15:37:45 -0000 1.11 --- BytesDataTypeTest.java 15 Mar 2004 16:44:20 -0000 1.12 *************** *** 23,33 **** import org.dbunit.database.ExtendedMockSingleRowResultSet; - import org.dbunit.util.FileAsserts; import org.dbunit.dataset.ITable; import java.sql.Types; import java.util.Arrays; - import java.io.File; - import java.io.ByteArrayInputStream; /** --- 23,33 ---- import org.dbunit.database.ExtendedMockSingleRowResultSet; import org.dbunit.dataset.ITable; + import org.dbunit.util.FileAsserts; + import java.io.ByteArrayInputStream; + import java.io.File; import java.sql.Types; import java.util.Arrays; /** |
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/dbunit/dataset Modified Files: AllTests.java CachedDataSetTest.java ColumnTest.java DataSetUtilsTest.java DefaultTableMetaDataTest.java LowerCaseTableMetaDataTest.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AllTests.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** AllTests.java 22 Jan 2004 02:54:21 -0000 1.21 --- AllTests.java 15 Mar 2004 16:44:20 -0000 1.22 *************** *** 39,42 **** --- 39,43 ---- suite.addTest(org.dbunit.dataset.stream.AllTests.suite()); suite.addTest(org.dbunit.dataset.xml.AllTests.suite()); + suite.addTest(org.dbunit.dataset.csv.AllTests.suite()); suite.addTest(new TestSuite(CaseInsensitiveDataSetTest.class)); suite.addTest(new TestSuite(CaseInsensitiveTableTest.class)); Index: CachedDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CachedDataSetTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CachedDataSetTest.java 22 Jan 2004 02:54:21 -0000 1.3 --- CachedDataSetTest.java 15 Mar 2004 16:44:20 -0000 1.4 *************** *** 23,27 **** import org.dbunit.dataset.xml.FlatXmlDataSet; import org.dbunit.dataset.xml.FlatXmlProducer; - import org.xml.sax.InputSource; --- 23,26 ---- Index: ColumnTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/ColumnTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ColumnTest.java 22 Jan 2004 02:54:21 -0000 1.8 --- ColumnTest.java 15 Mar 2004 16:44:20 -0000 1.9 *************** *** 22,28 **** package org.dbunit.dataset; - import org.dbunit.dataset.datatype.DataType; - import junit.framework.TestCase; import java.sql.DatabaseMetaData; --- 22,27 ---- package org.dbunit.dataset; import junit.framework.TestCase; + import org.dbunit.dataset.datatype.DataType; import java.sql.DatabaseMetaData; Index: DataSetUtilsTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DataSetUtilsTest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DataSetUtilsTest.java 22 Jan 2004 02:54:21 -0000 1.15 --- DataSetUtilsTest.java 15 Mar 2004 16:44:20 -0000 1.16 *************** *** 22,28 **** package org.dbunit.dataset; - import org.dbunit.dataset.datatype.DataType; - import junit.framework.TestCase; import java.sql.Time; --- 22,27 ---- package org.dbunit.dataset; import junit.framework.TestCase; + import org.dbunit.dataset.datatype.DataType; import java.sql.Time; Index: DefaultTableMetaDataTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DefaultTableMetaDataTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DefaultTableMetaDataTest.java 22 Jan 2004 02:54:21 -0000 1.8 --- DefaultTableMetaDataTest.java 15 Mar 2004 16:44:20 -0000 1.9 *************** *** 22,28 **** package org.dbunit.dataset; - import org.dbunit.dataset.datatype.DataType; - import junit.framework.TestCase; /** --- 22,27 ---- package org.dbunit.dataset; import junit.framework.TestCase; + import org.dbunit.dataset.datatype.DataType; /** Index: LowerCaseTableMetaDataTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/LowerCaseTableMetaDataTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LowerCaseTableMetaDataTest.java 22 Jan 2004 02:54:21 -0000 1.2 --- LowerCaseTableMetaDataTest.java 15 Mar 2004 16:44:20 -0000 1.3 *************** *** 22,28 **** package org.dbunit.dataset; - import org.dbunit.dataset.datatype.DataType; - import junit.framework.TestCase; /** --- 22,27 ---- package org.dbunit.dataset; import junit.framework.TestCase; + import org.dbunit.dataset.datatype.DataType; /** |
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/dataset/datatype Modified Files: BytesDataType.java StringDataType.java TimeDataType.java TimestampDataType.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: BytesDataType.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/BytesDataType.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BytesDataType.java 24 Feb 2004 15:37:45 -0000 1.15 --- BytesDataType.java 15 Mar 2004 16:44:17 -0000 1.16 *************** *** 22,41 **** package org.dbunit.dataset.datatype; - import org.dbunit.util.Base64; import org.dbunit.dataset.ITable; import java.sql.Blob; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - import java.io.ByteArrayOutputStream; - import java.io.IOException; - import java.io.InputStream; - import java.io.FileNotFoundException; - import java.io.FileInputStream; - import java.io.File; - import java.io.BufferedInputStream; - import java.net.MalformedURLException; - import java.net.URL; /** --- 22,35 ---- package org.dbunit.dataset.datatype; import org.dbunit.dataset.ITable; + import org.dbunit.util.Base64; + import java.io.*; + import java.net.MalformedURLException; + import java.net.URL; import java.sql.Blob; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; /** Index: StringDataType.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/StringDataType.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** StringDataType.java 22 Feb 2004 23:27:20 -0000 1.21 --- StringDataType.java 15 Mar 2004 16:44:17 -0000 1.22 *************** *** 22,33 **** package org.dbunit.dataset.datatype; - import org.dbunit.util.Base64; import org.dbunit.dataset.ITable; ! import java.sql.Blob; ! import java.sql.Clob; ! import java.sql.PreparedStatement; ! import java.sql.ResultSet; ! import java.sql.SQLException; /** --- 22,29 ---- package org.dbunit.dataset.datatype; import org.dbunit.dataset.ITable; + import org.dbunit.util.Base64; ! import java.sql.*; /** Index: TimeDataType.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TimeDataType.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TimeDataType.java 22 Feb 2004 23:27:20 -0000 1.12 --- TimeDataType.java 15 Mar 2004 16:44:17 -0000 1.13 *************** *** 24,32 **** import org.dbunit.dataset.ITable; ! import java.sql.PreparedStatement; ! import java.sql.ResultSet; ! import java.sql.SQLException; ! import java.sql.Time; ! import java.sql.Types; /** --- 24,28 ---- import org.dbunit.dataset.ITable; ! import java.sql.*; /** Index: TimestampDataType.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TimestampDataType.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TimestampDataType.java 22 Feb 2004 23:27:20 -0000 1.13 --- TimestampDataType.java 15 Mar 2004 16:44:17 -0000 1.14 *************** *** 24,32 **** import org.dbunit.dataset.ITable; ! import java.sql.PreparedStatement; ! import java.sql.ResultSet; ! import java.sql.SQLException; ! import java.sql.Timestamp; ! import java.sql.Types; /** --- 24,28 ---- import org.dbunit.dataset.ITable; ! import java.sql.*; /** |
|
From: <fsp...@us...> - 2004-03-15 16:54:08
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/statement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/dbunit/database/statement Modified Files: BatchStatementDecoratorTest.java MockStatementFactory.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: BatchStatementDecoratorTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/statement/BatchStatementDecoratorTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BatchStatementDecoratorTest.java 22 Jan 2004 02:54:21 -0000 1.6 --- BatchStatementDecoratorTest.java 15 Mar 2004 16:44:20 -0000 1.7 *************** *** 22,28 **** package org.dbunit.database.statement; - import org.dbunit.dataset.datatype.DataType; - import junit.framework.TestCase; /** --- 22,27 ---- package org.dbunit.database.statement; import junit.framework.TestCase; + import org.dbunit.dataset.datatype.DataType; /** Index: MockStatementFactory.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/statement/MockStatementFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MockStatementFactory.java 22 Jan 2004 02:54:21 -0000 1.5 --- MockStatementFactory.java 15 Mar 2004 16:44:20 -0000 1.6 *************** *** 22,29 **** package org.dbunit.database.statement; - import org.dbunit.database.IDatabaseConnection; - import com.mockobjects.ExpectationCounter; import com.mockobjects.Verifiable; import java.sql.SQLException; --- 22,28 ---- package org.dbunit.database.statement; import com.mockobjects.ExpectationCounter; import com.mockobjects.Verifiable; + import org.dbunit.database.IDatabaseConnection; import java.sql.SQLException; |
|
From: <fsp...@us...> - 2004-03-15 16:54:08
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/stream In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/dataset/stream Modified Files: DataSetProducerAdapter.java StreamingDataSet.java StreamingIterator.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: DataSetProducerAdapter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/stream/DataSetProducerAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DataSetProducerAdapter.java 22 Jan 2004 02:54:19 -0000 1.2 --- DataSetProducerAdapter.java 15 Mar 2004 16:44:18 -0000 1.3 *************** *** 21,31 **** package org.dbunit.dataset.stream; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.RowOutOfBoundsException; --- 21,25 ---- package org.dbunit.dataset.stream; ! import org.dbunit.dataset.*; Index: StreamingDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/stream/StreamingDataSet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StreamingDataSet.java 22 Jan 2004 02:54:19 -0000 1.3 --- StreamingDataSet.java 15 Mar 2004 16:44:18 -0000 1.4 *************** *** 21,29 **** package org.dbunit.dataset.stream; ! import org.dbunit.dataset.AbstractDataSet; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; /** --- 21,25 ---- package org.dbunit.dataset.stream; ! import org.dbunit.dataset.*; /** Index: StreamingIterator.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/stream/StreamingIterator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StreamingIterator.java 22 Jan 2004 02:54:19 -0000 1.2 --- StreamingIterator.java 15 Mar 2004 16:44:18 -0000 1.3 *************** *** 22,31 **** import org.dbunit.DatabaseUnitRuntimeException; ! import org.dbunit.dataset.AbstractTable; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.RowOutOfBoundsException; import org.dbunit.util.concurrent.BoundedBuffer; import org.dbunit.util.concurrent.Channel; --- 22,26 ---- import org.dbunit.DatabaseUnitRuntimeException; ! import org.dbunit.dataset.*; import org.dbunit.util.concurrent.BoundedBuffer; import org.dbunit.util.concurrent.Channel; |
|
From: <fsp...@us...> - 2004-03-15 16:54:08
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/dataset/filter Modified Files: AbstractTableFilter.java SequenceTableFilter.java SequenceTableIterator.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: AbstractTableFilter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/AbstractTableFilter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AbstractTableFilter.java 22 Jan 2004 02:54:18 -0000 1.3 --- AbstractTableFilter.java 15 Mar 2004 16:44:17 -0000 1.4 *************** *** 21,29 **** package org.dbunit.dataset.filter; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; import java.util.ArrayList; --- 21,25 ---- package org.dbunit.dataset.filter; ! import org.dbunit.dataset.*; import java.util.ArrayList; Index: SequenceTableFilter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/SequenceTableFilter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SequenceTableFilter.java 23 Jan 2004 07:12:49 -0000 1.4 --- SequenceTableFilter.java 15 Mar 2004 16:44:17 -0000 1.5 *************** *** 22,31 **** import org.dbunit.database.AmbiguousTableNameException; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoSuchTableException; import java.util.ArrayList; --- 22,26 ---- import org.dbunit.database.AmbiguousTableNameException; ! import org.dbunit.dataset.*; import java.util.ArrayList; Index: SequenceTableIterator.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/SequenceTableIterator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SequenceTableIterator.java 22 Jan 2004 02:54:18 -0000 1.3 --- SequenceTableIterator.java 15 Mar 2004 16:44:17 -0000 1.4 *************** *** 21,29 **** package org.dbunit.dataset.filter; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; /** --- 21,25 ---- package org.dbunit.dataset.filter; ! import org.dbunit.dataset.*; /** |
|
From: <fsp...@us...> - 2004-03-15 16:54:08
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/dbunit/ant Modified Files: AllTests.java DbUnitTaskTest.java Added Files: ExportTest.java Log Message: - added support for Comma Separated Values files - reorganized imports --- NEW FILE: ExportTest.java --- package org.dbunit.ant; import junit.framework.TestCase; /** * Created By: fede * Date: 11-mar-2004 * Time: 10.54.02 * * Last Checkin: $Author: fspinazzi $ * Date: $Date: 2004/03/15 16:44:20 $ * Revision: $Revision: 1.1 $ */ public class ExportTest extends TestCase { Export export = new Export(); public void testAcceptCsvFormat () { export.setFormat("csv"); assertTrue(true); } } Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/AllTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AllTests.java 22 Jan 2004 02:54:20 -0000 1.2 --- AllTests.java 15 Mar 2004 16:44:20 -0000 1.3 *************** *** 35,38 **** --- 35,39 ---- TestSuite suite = new TestSuite(); suite.addTest(new TestSuite(DbUnitTaskTest.class)); + suite.addTest(new TestSuite(ExportTest.class)); return suite; Index: DbUnitTaskTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DbUnitTaskTest.java 22 Jan 2004 02:54:20 -0000 1.13 --- DbUnitTaskTest.java 15 Mar 2004 16:44:20 -0000 1.14 *************** *** 22,25 **** --- 22,30 ---- package org.dbunit.ant; + import junit.framework.Test; + import junit.framework.TestSuite; + import org.apache.tools.ant.BuildException; + import org.apache.tools.ant.Target; + import org.apache.tools.ant.taskdefs.TaskdefsTest; import org.dbunit.DatabaseEnvironment; import org.dbunit.database.DatabaseConfig; *************** *** 30,39 **** import org.dbunit.operation.DatabaseOperation; - import junit.framework.Test; - import junit.framework.TestSuite; - import org.apache.tools.ant.BuildException; - import org.apache.tools.ant.Target; - import org.apache.tools.ant.taskdefs.TaskdefsTest; - import java.io.File; import java.sql.SQLException; --- 35,38 ---- *************** *** 258,261 **** --- 257,268 ---- } + public void testExportCsv () { + String targetName = "test-export-format-csv"; + Export export = (Export)getFirstStepFromTarget(targetName); + assertTrue("Should have been a csv format, " + + "but was: " + export.getFormat(), + export.getFormat().equalsIgnoreCase("csv")); + } + public void testInvalidExportFormat() { |
|
From: <fsp...@us...> - 2004-03-15 16:54:07
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/dbunit Modified Files: AssertionTest.java Main.java OracleEnvironment.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: AssertionTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/AssertionTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AssertionTest.java 22 Jan 2004 02:54:20 -0000 1.10 --- AssertionTest.java 15 Mar 2004 16:44:19 -0000 1.11 *************** *** 22,39 **** package org.dbunit; - import org.dbunit.dataset.Column; - import org.dbunit.dataset.CompositeDataSet; - import org.dbunit.dataset.CompositeTable; - import org.dbunit.dataset.DataSetUtils; - import org.dbunit.dataset.DefaultDataSet; - import org.dbunit.dataset.DefaultTable; - import org.dbunit.dataset.FilteredDataSet; - import org.dbunit.dataset.IDataSet; - import org.dbunit.dataset.ITable; - import org.dbunit.dataset.datatype.DataType; - import org.dbunit.dataset.xml.FlatXmlDataSet; - import junit.framework.AssertionFailedError; import junit.framework.TestCase; import java.io.FileReader; --- 22,30 ---- package org.dbunit; import junit.framework.AssertionFailedError; import junit.framework.TestCase; + import org.dbunit.dataset.*; + import org.dbunit.dataset.datatype.DataType; + import org.dbunit.dataset.xml.FlatXmlDataSet; import java.io.FileReader; Index: Main.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/Main.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Main.java 22 Jan 2004 02:54:20 -0000 1.35 --- Main.java 15 Mar 2004 16:44:19 -0000 1.36 *************** *** 32,51 **** import org.dbunit.dataset.stream.MockDataSetProducer; import org.dbunit.dataset.stream.StreamingDataSet; ! import org.dbunit.dataset.xml.FlatXmlDataSet; ! import org.dbunit.dataset.xml.FlatXmlProducer; ! import org.dbunit.dataset.xml.FlatXmlWriter; ! import org.dbunit.dataset.xml.XmlDataSet; ! import org.dbunit.dataset.xml.XmlDataSetWriter; ! import org.xml.sax.InputSource; ! import java.io.FileOutputStream; ! import java.io.FileReader; ! import java.io.FileWriter; ! import java.io.IOException; ! import java.io.OutputStream; ! import java.io.OutputStreamWriter; ! import java.io.Reader; ! import java.io.Writer; import java.sql.Connection; --- 32,39 ---- import org.dbunit.dataset.stream.MockDataSetProducer; import org.dbunit.dataset.stream.StreamingDataSet; ! import org.dbunit.dataset.xml.*; import org.xml.sax.InputSource; ! import java.io.*; import java.sql.Connection; Index: OracleEnvironment.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/OracleEnvironment.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OracleEnvironment.java 22 Jan 2004 02:54:20 -0000 1.5 --- OracleEnvironment.java 15 Mar 2004 16:44:19 -0000 1.6 *************** *** 22,30 **** package org.dbunit; ! import org.dbunit.dataset.CompositeDataSet; ! import org.dbunit.dataset.DefaultDataSet; ! import org.dbunit.dataset.DefaultTable; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; /** --- 22,26 ---- package org.dbunit; ! import org.dbunit.dataset.*; /** |
|
From: <fsp...@us...> - 2004-03-15 16:54:07
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/test/org/dbunit/database Modified Files: AllTests.java DatabaseDataSetTest.java DatabaseTableMetaDataTest.java ForwardOnlyResultSetTableTest.java MockDatabaseConnection.java MockResultSetTable.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/AllTests.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AllTests.java 22 Jan 2004 02:54:20 -0000 1.13 --- AllTests.java 15 Mar 2004 16:44:20 -0000 1.14 *************** *** 22,30 **** package org.dbunit.database; - import org.dbunit.DatabaseEnvironment; - import org.dbunit.TestFeature; - import junit.framework.Test; import junit.framework.TestSuite; /** --- 22,29 ---- package org.dbunit.database; import junit.framework.Test; import junit.framework.TestSuite; + import org.dbunit.DatabaseEnvironment; + import org.dbunit.TestFeature; /** Index: DatabaseDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** DatabaseDataSetTest.java 22 Jan 2004 02:54:21 -0000 1.23 --- DatabaseDataSetTest.java 15 Mar 2004 16:44:20 -0000 1.24 *************** *** 23,32 **** import org.dbunit.DatabaseEnvironment; ! import org.dbunit.dataset.AbstractDataSetTest; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.DefaultTableMetaData; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.DataType; --- 23,27 ---- import org.dbunit.DatabaseEnvironment; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; Index: DatabaseTableMetaDataTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DatabaseTableMetaDataTest.java 22 Jan 2004 02:54:21 -0000 1.19 --- DatabaseTableMetaDataTest.java 15 Mar 2004 16:44:20 -0000 1.20 *************** *** 23,31 **** import org.dbunit.AbstractDatabaseTest; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoColumnsFoundException; import org.dbunit.dataset.datatype.DataType; --- 23,27 ---- import org.dbunit.AbstractDatabaseTest; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; Index: ForwardOnlyResultSetTableTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/ForwardOnlyResultSetTableTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ForwardOnlyResultSetTableTest.java 22 Jan 2004 02:54:21 -0000 1.3 --- ForwardOnlyResultSetTableTest.java 15 Mar 2004 16:44:20 -0000 1.4 *************** *** 21,34 **** package org.dbunit.database; import org.dbunit.DatabaseEnvironment; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.ForwardOnlyTableTest; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.MockTableMetaData; ! import org.dbunit.dataset.RowOutOfBoundsException; import org.dbunit.operation.DatabaseOperation; - import com.mockobjects.sql.MockMultiRowResultSet; - /** * @author Manuel Laflamme --- 21,29 ---- package org.dbunit.database; + import com.mockobjects.sql.MockMultiRowResultSet; import org.dbunit.DatabaseEnvironment; ! import org.dbunit.dataset.*; import org.dbunit.operation.DatabaseOperation; /** * @author Manuel Laflamme Index: MockDatabaseConnection.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/MockDatabaseConnection.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MockDatabaseConnection.java 22 Jan 2004 02:54:21 -0000 1.9 --- MockDatabaseConnection.java 15 Mar 2004 16:44:20 -0000 1.10 *************** *** 22,34 **** package org.dbunit.database; - import org.dbunit.database.statement.IStatementFactory; - import org.dbunit.dataset.DataSetException; - import org.dbunit.dataset.DefaultDataSet; - import org.dbunit.dataset.FilteredDataSet; - import org.dbunit.dataset.IDataSet; - import org.dbunit.dataset.ITable; - import com.mockobjects.ExpectationCounter; import com.mockobjects.Verifiable; import java.sql.Connection; --- 22,29 ---- package org.dbunit.database; import com.mockobjects.ExpectationCounter; import com.mockobjects.Verifiable; + import org.dbunit.database.statement.IStatementFactory; + import org.dbunit.dataset.*; import java.sql.Connection; Index: MockResultSetTable.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/MockResultSetTable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MockResultSetTable.java 22 Jan 2004 02:54:21 -0000 1.2 --- MockResultSetTable.java 15 Mar 2004 16:44:20 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- package org.dbunit.database; + import com.mockobjects.ExpectationCounter; + import com.mockobjects.Verifiable; import org.dbunit.dataset.Column; import org.dbunit.dataset.DataSetException; *************** *** 26,32 **** import org.dbunit.dataset.ITableMetaData; - import com.mockobjects.ExpectationCounter; - import com.mockobjects.Verifiable; - /** * @author Manuel Laflamme --- 28,31 ---- |
|
From: <fsp...@us...> - 2004-03-15 16:53:59
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/database Modified Files: AbstractDatabaseConnection.java DatabaseDataSet.java DatabaseSequenceFilter.java DatabaseTableIterator.java DatabaseTableMetaData.java QueryTableIterator.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: AbstractDatabaseConnection.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/AbstractDatabaseConnection.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AbstractDatabaseConnection.java 25 Feb 2004 19:08:15 -0000 1.19 --- AbstractDatabaseConnection.java 15 Mar 2004 16:44:16 -0000 1.20 *************** *** 23,31 **** import org.dbunit.database.statement.IStatementFactory; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.FilteredDataSet; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.IDataTypeFactory; --- 23,27 ---- import org.dbunit.database.statement.IStatementFactory; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.IDataTypeFactory; Index: DatabaseDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** DatabaseDataSet.java 22 Jan 2004 02:54:17 -0000 1.27 --- DatabaseDataSet.java 15 Mar 2004 16:44:16 -0000 1.28 *************** *** 22,33 **** package org.dbunit.database; ! import org.dbunit.dataset.AbstractDataSet; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoSuchTableException; import java.sql.Connection; --- 22,26 ---- package org.dbunit.database; ! import org.dbunit.dataset.*; import java.sql.Connection; *************** *** 35,43 **** import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.ArrayList; ! import java.util.HashMap; ! import java.util.Iterator; ! import java.util.List; ! import java.util.Map; /** --- 28,32 ---- import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.*; /** Index: DatabaseSequenceFilter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseSequenceFilter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DatabaseSequenceFilter.java 8 Mar 2004 22:02:21 -0000 1.5 --- DatabaseSequenceFilter.java 15 Mar 2004 16:44:16 -0000 1.6 *************** *** 28,37 **** import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.Arrays; ! import java.util.Comparator; ! import java.util.HashMap; ! import java.util.HashSet; ! import java.util.Map; ! import java.util.Set; /** --- 28,32 ---- import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.*; /** Index: DatabaseTableIterator.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseTableIterator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DatabaseTableIterator.java 22 Jan 2004 02:54:18 -0000 1.3 --- DatabaseTableIterator.java 15 Mar 2004 16:44:16 -0000 1.4 *************** *** 21,29 **** package org.dbunit.database; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; /** --- 21,25 ---- package org.dbunit.database; ! import org.dbunit.dataset.*; /** Index: DatabaseTableMetaData.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseTableMetaData.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DatabaseTableMetaData.java 25 Feb 2004 19:08:15 -0000 1.19 --- DatabaseTableMetaData.java 15 Mar 2004 16:44:16 -0000 1.20 *************** *** 22,39 **** package org.dbunit.database; ! import org.dbunit.dataset.AbstractTableMetaData; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.NoColumnsFoundException; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.DefaultTableMetaData; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.IDataTypeFactory; ! import java.sql.Connection; ! import java.sql.DatabaseMetaData; ! import java.sql.ResultSet; ! import java.sql.SQLException; ! import java.sql.ResultSetMetaData; import java.util.ArrayList; import java.util.Arrays; --- 22,30 ---- package org.dbunit.database; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.IDataTypeFactory; ! import java.sql.*; import java.util.ArrayList; import java.util.Arrays; Index: QueryTableIterator.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/QueryTableIterator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** QueryTableIterator.java 22 Jan 2004 02:54:18 -0000 1.3 --- QueryTableIterator.java 15 Mar 2004 16:44:16 -0000 1.4 *************** *** 21,29 **** package org.dbunit.database; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; import java.sql.SQLException; --- 21,25 ---- package org.dbunit.database; ! import org.dbunit.dataset.*; import java.sql.SQLException; |
|
From: <fsp...@us...> - 2004-03-15 16:53:59
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/util Modified Files: FileAsserts.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: FileAsserts.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/util/FileAsserts.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileAsserts.java 22 Jan 2004 02:54:20 -0000 1.3 --- FileAsserts.java 15 Mar 2004 16:44:19 -0000 1.4 *************** *** 26,35 **** import junit.framework.Assert; ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; public class FileAsserts --- 26,30 ---- import junit.framework.Assert; ! import java.io.*; public class FileAsserts |
|
From: <fsp...@us...> - 2004-03-15 16:53:58
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/ext/mssql Modified Files: InsertIdentityOperation.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: InsertIdentityOperation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssql/InsertIdentityOperation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InsertIdentityOperation.java 22 Jan 2004 02:54:19 -0000 1.2 --- InsertIdentityOperation.java 15 Mar 2004 16:44:18 -0000 1.3 *************** *** 24,34 **** import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DefaultDataSet; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.operation.AbstractOperation; import org.dbunit.operation.CompositeOperation; --- 24,28 ---- import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.dataset.*; import org.dbunit.operation.AbstractOperation; import org.dbunit.operation.CompositeOperation; |
|
From: <fsp...@us...> - 2004-03-15 16:53:58
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/ant Modified Files: DbUnitTask.java Export.java Operation.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: DbUnitTask.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/DbUnitTask.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DbUnitTask.java 22 Jan 2004 02:54:17 -0000 1.11 --- DbUnitTask.java 15 Mar 2004 16:44:16 -0000 1.12 *************** *** 22,32 **** package org.dbunit.ant; - import org.dbunit.DatabaseUnitException; - import org.dbunit.database.DatabaseConfig; - import org.dbunit.database.DatabaseConnection; - import org.dbunit.database.ForwardOnlyResultSetTableFactory; - import org.dbunit.database.IDatabaseConnection; - import org.dbunit.dataset.datatype.IDataTypeFactory; - import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; --- 22,25 ---- *************** *** 35,38 **** --- 28,37 ---- import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; + import org.dbunit.DatabaseUnitException; + import org.dbunit.database.DatabaseConfig; + import org.dbunit.database.DatabaseConnection; + import org.dbunit.database.ForwardOnlyResultSetTableFactory; + import org.dbunit.database.IDatabaseConnection; + import org.dbunit.dataset.datatype.IDataTypeFactory; import java.sql.Connection; Index: Export.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Export.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Export.java 22 Jan 2004 02:54:17 -0000 1.12 --- Export.java 15 Mar 2004 16:44:16 -0000 1.13 *************** *** 26,29 **** --- 26,30 ---- import org.dbunit.database.QueryDataSet; import org.dbunit.dataset.IDataSet; + import org.dbunit.dataset.csv.CSVDataSetWriter; import org.dbunit.dataset.xml.FlatDtdDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; *************** *** 53,59 **** public class Export implements DbUnitTaskStep { ! private static final String FORMAT_FLAT = "flat"; ! private static final String FORMAT_XML = "xml"; ! private static final String FORMAT_DTD = "dtd"; private File _dest; --- 54,61 ---- public class Export implements DbUnitTaskStep { ! public static final String FORMAT_FLAT = "flat"; ! public static final String FORMAT_XML = "xml"; ! public static final String FORMAT_DTD = "dtd"; ! public static final String FORMAT_CSV = "csv"; private File _dest; *************** *** 94,98 **** if (format.equalsIgnoreCase(FORMAT_FLAT) || format.equalsIgnoreCase(FORMAT_XML) ! || format.equalsIgnoreCase(FORMAT_DTD)) { _format = format; --- 96,101 ---- if (format.equalsIgnoreCase(FORMAT_FLAT) || format.equalsIgnoreCase(FORMAT_XML) ! || format.equalsIgnoreCase(FORMAT_DTD) ! || format.equalsIgnoreCase(FORMAT_CSV)) { _format = format; *************** *** 152,176 **** // Write the dataset ! OutputStream out = new FileOutputStream(_dest); ! try ! { ! if (_format.equalsIgnoreCase(FORMAT_FLAT)) ! { ! FlatXmlDataSet.write(dataset, out); ! } ! else if (_format.equalsIgnoreCase(FORMAT_XML)) { ! XmlDataSet.write(dataset, out); } ! else if (_format.equalsIgnoreCase(FORMAT_DTD)) { ! FlatDtdDataSet.write(dataset, out); } } - finally - { - out.close(); - } - } catch (IOException e) --- 155,182 ---- // Write the dataset ! if (_format.equals(FORMAT_CSV)) { ! CSVDataSetWriter.write(dataset, _dest); ! } else { ! OutputStream out = new FileOutputStream(_dest); ! try { ! if (_format.equalsIgnoreCase(FORMAT_FLAT)) ! { ! FlatXmlDataSet.write(dataset, out); ! } ! else if (_format.equalsIgnoreCase(FORMAT_XML)) ! { ! XmlDataSet.write(dataset, out); ! } ! else if (_format.equalsIgnoreCase(FORMAT_DTD)) ! { ! FlatDtdDataSet.write(dataset, out); ! } } ! finally { ! out.close(); } } } catch (IOException e) Index: Operation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Operation.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Operation.java 22 Jan 2004 02:54:17 -0000 1.11 --- Operation.java 15 Mar 2004 16:44:16 -0000 1.12 *************** *** 26,29 **** --- 26,30 ---- import org.dbunit.dataset.CachedDataSet; import org.dbunit.dataset.IDataSet; + import org.dbunit.dataset.csv.CSVProducer; import org.dbunit.dataset.stream.IDataSetProducer; import org.dbunit.dataset.stream.StreamingDataSet; *************** *** 32,36 **** import org.dbunit.ext.mssql.InsertIdentityOperation; import org.dbunit.operation.DatabaseOperation; - import org.xml.sax.InputSource; --- 33,36 ---- *************** *** 52,56 **** public class Operation implements DbUnitTaskStep { ! private static final String DEFAULT_FORMAT = "flat"; protected String type = "CLEAN_INSERT"; --- 52,56 ---- public class Operation implements DbUnitTaskStep { ! private static final String DEFAULT_FORMAT = Export.FORMAT_FLAT; protected String type = "CLEAN_INSERT"; *************** *** 161,166 **** public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml")) { this.format = format; --- 161,168 ---- public void setFormat(String format) { ! if (format.equalsIgnoreCase(Export.FORMAT_FLAT) ! || format.equalsIgnoreCase(Export.FORMAT_XML) ! || format.equalsIgnoreCase(Export.FORMAT_CSV) ! ) { this.format = format; *************** *** 168,172 **** else { ! throw new IllegalArgumentException("Type must be either 'flat'(default) or 'xml' but was: " + format); } } --- 170,174 ---- else { ! throw new IllegalArgumentException("Type must be either 'flat'(default) csv or 'xml' but was: " + format); } } *************** *** 192,199 **** IDataSetProducer producer = null; ! if (format.equalsIgnoreCase("xml")) { producer = new XmlProducer(new InputSource(src.toURL().toString())); } else { --- 194,204 ---- IDataSetProducer producer = null; ! if (format.equalsIgnoreCase(Export.FORMAT_XML)) { producer = new XmlProducer(new InputSource(src.toURL().toString())); } + else if (format.equalsIgnoreCase(Export.FORMAT_CSV)) { + producer = new CSVProducer(src); + } else { |
|
From: <fsp...@us...> - 2004-03-15 16:53:58
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/dataset/excel Modified Files: XlsDataSet.java XlsTable.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: XlsDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel/XlsDataSet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XlsDataSet.java 22 Jan 2004 02:54:18 -0000 1.4 --- XlsDataSet.java 15 Mar 2004 16:44:17 -0000 1.5 *************** *** 19,42 **** package org.dbunit.dataset.excel; - import org.dbunit.dataset.AbstractDataSet; - import org.dbunit.dataset.Column; - import org.dbunit.dataset.DataSetException; - import org.dbunit.dataset.DefaultTableIterator; - import org.dbunit.dataset.IDataSet; - import org.dbunit.dataset.ITable; - import org.dbunit.dataset.ITableIterator; - import org.dbunit.dataset.ITableMetaData; - import org.dbunit.dataset.datatype.DataType; - import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.OutputStream; /** --- 19,30 ---- package org.dbunit.dataset.excel; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; + import org.dbunit.dataset.*; + import org.dbunit.dataset.datatype.DataType; ! import java.io.*; /** Index: XlsTable.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel/XlsTable.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XlsTable.java 22 Jan 2004 02:54:18 -0000 1.3 --- XlsTable.java 15 Mar 2004 16:44:17 -0000 1.4 *************** *** 21,36 **** package org.dbunit.dataset.excel; - import org.dbunit.dataset.AbstractTable; - import org.dbunit.dataset.Column; - import org.dbunit.dataset.DataSetException; - import org.dbunit.dataset.DefaultTableMetaData; - import org.dbunit.dataset.ITableMetaData; - import org.dbunit.dataset.datatype.DataType; - import org.dbunit.dataset.datatype.DataTypeException; - import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import java.math.BigDecimal; --- 21,31 ---- package org.dbunit.dataset.excel; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; + import org.dbunit.dataset.*; + import org.dbunit.dataset.datatype.DataType; + import org.dbunit.dataset.datatype.DataTypeException; import java.math.BigDecimal; |
|
From: <fsp...@us...> - 2004-03-15 16:53:58
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/statement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit/database/statement Modified Files: PreparedBatchStatement.java SimplePreparedStatement.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: PreparedBatchStatement.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/statement/PreparedBatchStatement.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PreparedBatchStatement.java 22 Feb 2004 23:26:59 -0000 1.12 --- PreparedBatchStatement.java 15 Mar 2004 16:44:17 -0000 1.13 *************** *** 22,28 **** package org.dbunit.database.statement; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; - import org.dbunit.dataset.ITable; import java.sql.Connection; --- 22,28 ---- package org.dbunit.database.statement; + import org.dbunit.dataset.ITable; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; import java.sql.Connection; Index: SimplePreparedStatement.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/statement/SimplePreparedStatement.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SimplePreparedStatement.java 22 Feb 2004 23:27:19 -0000 1.13 --- SimplePreparedStatement.java 15 Mar 2004 16:44:17 -0000 1.14 *************** *** 22,28 **** package org.dbunit.database.statement; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; - import org.dbunit.dataset.ITable; import java.sql.Connection; --- 22,28 ---- package org.dbunit.database.statement; + import org.dbunit.dataset.ITable; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; import java.sql.Connection; |
|
From: <fsp...@us...> - 2004-03-15 16:53:56
|
Update of /cvsroot/dbunit/dbunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533 Modified Files: profile.properties project.properties project.xml Log Message: - added support for Comma Separated Values files - reorganized imports Index: profile.properties =================================================================== RCS file: /cvsroot/dbunit/dbunit/profile.properties,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** profile.properties 15 Jun 2003 15:40:25 -0000 1.25 --- profile.properties 15 Mar 2004 16:44:16 -0000 1.26 *************** *** 7,10 **** --- 7,11 ---- #dbunit.profile = mysql #dbunit.profile = mssql + #dbunit.profile = db2 # dbunit.profile.{profileName}.driverClass = com.acme.driver *************** *** 44,47 **** --- 45,55 ---- dbunit.profile.mssql.unsupportedFeatures = BLOB,CLOB,SCOLLABLE_RESULTSET + dbunit.profile.db2.driverClass = + dbunit.profile.db2.connectionUrl = + dbunit.profile.db2.schema = + dbunit.profile.db2.user = + dbunit.profile.db2.password = + dbunit.profile.db2.unsupportedFeatures = + ## Needed for ant testing until profile.properties is merged dbunit.profile.driverClass = ${dbunit.profile.hypersonic.driverClass} *************** *** 62,63 **** --- 70,77 ---- #dbunit.profile.user = ${dbunit.profile.mssql.user} #dbunit.profile.password = ${dbunit.profile.mssql.password} + + #dbunit.profile.driverClass = ${dbunit.profile.db2.driverClass} + #dbunit.profile.connectionUrl = ${dbunit.profile.db2.connectionUrl} + #dbunit.profile.schema = ${dbunit.profile.db2.schema} + #dbunit.profile.user = ${dbunit.profile.db2.user} + #dbunit.profile.password = ${dbunit.profile.db2.password} Index: project.properties =================================================================== RCS file: /cvsroot/dbunit/dbunit/project.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.properties 10 Oct 2003 09:51:16 -0000 1.4 --- project.properties 15 Mar 2004 16:44:16 -0000 1.5 *************** *** 10,12 **** maven.test.failure.ignore=true ! --- 10,13 ---- maven.test.failure.ignore=true ! #maven.jar.override = on ! #maven.jar.db2driver = ${basedir}/lib/db2jcc.jar Index: project.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/project.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** project.xml 19 Jan 2004 20:07:32 -0000 1.16 --- project.xml 15 Mar 2004 16:44:16 -0000 1.17 *************** *** 99,103 **** <id>fspinazzi</id> <email>f.s...@ma...</email> ! <organization>MH</organization> <roles> <role>Java Developer</role> --- 99,103 ---- <id>fspinazzi</id> <email>f.s...@ma...</email> ! <organization>Master House S.r.l</organization> <roles> <role>Java Developer</role> *************** *** 202,205 **** --- 202,210 ---- <version>0.07</version> </dependency> + <dependency> + <groupId>mockmaker</groupId> + <artifactId>mmmockobjects</artifactId> + <version>1.12.0</version> + </dependency> <!-- <dependency> *************** *** 232,235 **** --- 237,246 ---- </includes> </resource> + <resource> + <directory>${basedir}/src/csv</directory> + <includes> + <include>**/cvs-tests.properties</include> + </includes> + </resource> </resources> </build> |
|
From: <fsp...@us...> - 2004-03-15 16:53:56
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7533/src/java/org/dbunit Modified Files: Assertion.java DatabaseTestCase.java Log Message: - added support for Comma Separated Values files - reorganized imports Index: Assertion.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/Assertion.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Assertion.java 22 Jan 2004 02:54:17 -0000 1.10 --- Assertion.java 15 Mar 2004 16:44:16 -0000 1.11 *************** *** 22,35 **** package org.dbunit; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.UnknownDataType; - import junit.framework.Assert; - import java.util.Arrays; import java.util.Comparator; --- 22,30 ---- package org.dbunit; ! import junit.framework.Assert; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.UnknownDataType; import java.util.Arrays; import java.util.Comparator; Index: DatabaseTestCase.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/DatabaseTestCase.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DatabaseTestCase.java 22 Jan 2004 02:54:17 -0000 1.10 --- DatabaseTestCase.java 15 Mar 2004 16:44:16 -0000 1.11 *************** *** 22,31 **** package org.dbunit; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; import org.dbunit.operation.DatabaseOperation; - import junit.framework.TestCase; - /** * @author Manuel Laflamme --- 22,30 ---- package org.dbunit; + import junit.framework.TestCase; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; import org.dbunit.operation.DatabaseOperation; /** * @author Manuel Laflamme |
