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: <de...@us...> - 2005-05-06 21:04:16
|
Update of /cvsroot/dbunit/dbunit/src/csv/orders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31706/src/csv/orders Modified Files: table-ordering.txt Added Files: orders.jar Log Message: [ 1114490 ] Support CSV files from a URL (e.g. jar file) + CSV fixes --- NEW FILE: orders.jar --- (This appears to be a binary file; contents omitted.) Index: table-ordering.txt =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/csv/orders/table-ordering.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** table-ordering.txt 29 Sep 2004 07:05:50 -0000 1.1 --- table-ordering.txt 6 May 2005 21:04:06 -0000 1.2 *************** *** 1,3 **** orders ! order-row --- 1,3 ---- orders ! orders_row |
|
From: <de...@us...> - 2005-05-06 21:04:15
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31706/src/java/org/dbunit/ant Modified Files: Export.java Log Message: [ 1114490 ] Support CSV files from a URL (e.g. jar file) + CSV fixes Index: Export.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Export.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Export.java 29 Sep 2004 07:05:50 -0000 1.17 --- Export.java 6 May 2005 21:04:06 -0000 1.18 *************** *** 22,30 **** package org.dbunit.ant; import org.apache.tools.ant.Project; import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; - import org.dbunit.dataset.csv.CsvDataSet; import org.dbunit.dataset.csv.CsvDataSetWriter; import org.dbunit.dataset.xml.FlatDtdDataSet; --- 22,37 ---- package org.dbunit.ant; + import java.io.File; + import java.io.FileOutputStream; + import java.io.IOException; + import java.io.OutputStream; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.List; + import org.apache.tools.ant.Project; import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.csv.CsvDataSetWriter; import org.dbunit.dataset.xml.FlatDtdDataSet; *************** *** 32,43 **** import org.dbunit.dataset.xml.XmlDataSet; - import java.io.File; - import java.io.FileOutputStream; - import java.io.IOException; - import java.io.OutputStream; - import java.util.*; - import java.util.ArrayList; - import java.util.List; - /** * The <code>Export</code> class is the step that facilitates exporting --- 39,42 ---- *************** *** 145,149 **** if (_format.equals(FORMAT_CSV)) { ! CsvDataSet.write(dataset, _dest); } else --- 144,148 ---- if (_format.equals(FORMAT_CSV)) { ! CsvDataSetWriter.write(dataset, _dest); } else |
|
From: <de...@us...> - 2005-05-06 21:04:15
|
Update of /cvsroot/dbunit/dbunit/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31706/xdocs Modified Files: changes.xml Log Message: [ 1114490 ] Support CSV files from a URL (e.g. jar file) + CSV fixes Index: changes.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/xdocs/changes.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** changes.xml 6 May 2005 20:44:48 -0000 1.14 --- changes.xml 6 May 2005 21:04:05 -0000 1.15 *************** *** 9,12 **** --- 9,13 ---- <body> <release version="2.2-dev" date="IN CVS" description=""> + <action dev="dep4b" type="add" due-to="Dion Gillard" issue-id="1114490">Support CSV files from a URL (e.g. jar file) + CSV fixes</action> <action dev="dep4b" type="fix">Fix the driver in classpath/driver not in classpath to always work regardless of configured driver.</action> <action dev="dep4b" type="fix" due-to="Dion Gillard" issue-id="1114487">Typo in test class AbstractDataSetTest</action> |
|
From: <de...@us...> - 2005-05-06 21:04:14
|
Update of /cvsroot/dbunit/dbunit/src/csv/accounts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31706/src/csv/accounts Added Files: table-ordering.txt accounts.csv Log Message: [ 1114490 ] Support CSV files from a URL (e.g. jar file) + CSV fixes --- NEW FILE: table-ordering.txt --- accounts --- NEW FILE: accounts.csv --- ACCTID, DESCRIPTION " 123", "The first Order" " 2", "The second Order" " 3spaces", "The so called \"third\" Order" " -4", "The fourth order" " 5 ", "null" |
|
From: <de...@us...> - 2005-05-06 21:04:05
|
Update of /cvsroot/dbunit/dbunit/src/csv/accounts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31641/src/csv/accounts Log Message: Directory /cvsroot/dbunit/dbunit/src/csv/accounts added to the repository |
|
From: <de...@us...> - 2005-05-06 20:45:14
|
Update of /cvsroot/dbunit/dbunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27538 Modified Files: project.xml Log Message: Fix the driver in classpath/driver not in classpath regardless of what driver is currenlty being used. Index: project.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/project.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** project.xml 30 Jul 2004 15:52:51 -0000 1.20 --- project.xml 6 May 2005 20:44:48 -0000 1.21 *************** *** 89,94 **** <name>David Eric Pugh</name> <id>dep4b</id> ! <email>ep...@up...</email> ! <organization>Upstate</organization> <roles> <role>Java Developer</role> --- 89,94 ---- <name>David Eric Pugh</name> <id>dep4b</id> ! <email>ep...@op...</email> ! <organization>OpenSource Connections</organization> <roles> <role>Java Developer</role> *************** *** 215,224 **** <version>1.12.0</version> </dependency> ! <!-- ! <dependency> ! <id>mm-mysql</id> ! <version>2.0.13-bin</version> ! </dependency> ! --> </dependencies> --- 215,219 ---- <version>1.12.0</version> </dependency> ! </dependencies> |
|
From: <de...@us...> - 2005-05-06 20:44:57
|
Update of /cvsroot/dbunit/dbunit/src/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27538/src/xml Modified Files: antTestBuildFile.xml Log Message: Fix the driver in classpath/driver not in classpath regardless of what driver is currenlty being used. Index: antTestBuildFile.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/antTestBuildFile.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** antTestBuildFile.xml 29 Sep 2004 07:05:51 -0000 1.11 --- antTestBuildFile.xml 6 May 2005 20:44:48 -0000 1.12 *************** *** 347,351 **** <target name="test-classpath"> ! <dbunit driver="org.gjt.mm.mysql.Driver" url="jdbc:mysql://localhost:3306/dbunit" userid="root" --- 347,351 ---- <target name="test-classpath"> ! <dbunit driver="${dbunit.profile.driverClass}" url="jdbc:mysql://localhost:3306/dbunit" userid="root" *************** *** 359,363 **** <target name="test-drivernotinclasspath"> ! <dbunit driver="org.gjt.mm.mysql.Driver" url="jdbc:mysql://localhost:3306/dbunit" userid="root" --- 359,363 ---- <target name="test-drivernotinclasspath"> ! <dbunit driver="org.dbunit.imaginary.Driver" url="jdbc:mysql://localhost:3306/dbunit" userid="root" |
|
From: <de...@us...> - 2005-05-06 20:44:57
|
Update of /cvsroot/dbunit/dbunit/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27538/xdocs Modified Files: changes.xml Log Message: Fix the driver in classpath/driver not in classpath regardless of what driver is currenlty being used. Index: changes.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/xdocs/changes.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** changes.xml 30 Jul 2004 15:52:50 -0000 1.13 --- changes.xml 6 May 2005 20:44:48 -0000 1.14 *************** *** 9,12 **** --- 9,14 ---- <body> <release version="2.2-dev" date="IN CVS" description=""> + <action dev="dep4b" type="fix">Fix the driver in classpath/driver not in classpath to always work regardless of configured driver.</action> + <action dev="dep4b" type="fix" due-to="Dion Gillard" issue-id="1114487">Typo in test class AbstractDataSetTest</action> <action dev="dep4b" type="add" due-to="Klas Axell">new HsqldbDataTypeFactory for working with booleans in HsqlDB.</action> </release> |
|
From: <de...@us...> - 2005-04-15 02:14:42
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6398/src/test/org/dbunit/dataset Modified Files: AbstractDataSetTest.java Log Message: Typo. Bug 1114487. Thanks Dion! Index: AbstractDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AbstractDataSetTest.java 22 Jan 2004 02:54:21 -0000 1.22 --- AbstractDataSetTest.java 15 Apr 2005 02:14:29 -0000 1.23 *************** *** 202,206 **** { IDataSet dataSet = createDataSet(); ! assertTrue("Should not be same intance", dataSet.getTables() != dataSet.getTables()); } --- 202,206 ---- { IDataSet dataSet = createDataSet(); ! assertTrue("Should not be same instance", dataSet.getTables() != dataSet.getTables()); } |
|
From: <de...@us...> - 2004-11-07 19:48:30
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7202/src/test/org/dbunit/dataset/xml Modified Files: FlatXmlWriterTest.java Log Message: Import cleanup Index: FlatXmlWriterTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatXmlWriterTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FlatXmlWriterTest.java 30 Mar 2004 19:13:02 -0000 1.6 --- FlatXmlWriterTest.java 7 Nov 2004 19:48:18 -0000 1.7 *************** *** 22,36 **** package org.dbunit.dataset.xml; import junit.framework.TestCase; import org.dbunit.dataset.Column; import org.dbunit.dataset.DefaultDataSet; import org.dbunit.dataset.DefaultTable; import org.dbunit.dataset.datatype.DataType; - import org.dbunit.database.IDatabaseConnection; - - import java.io.StringWriter; - import java.io.File; - import java.io.FileWriter; - import java.io.FileOutputStream; /** --- 22,33 ---- package org.dbunit.dataset.xml; + import java.io.StringWriter; + import junit.framework.TestCase; + import org.dbunit.dataset.Column; import org.dbunit.dataset.DefaultDataSet; import org.dbunit.dataset.DefaultTable; import org.dbunit.dataset.datatype.DataType; /** |
|
From: <fsp...@us...> - 2004-09-29 07:06:03
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/java/org/dbunit/ant Modified Files: AbstractStep.java DbUnitTask.java Export.java Added Files: QuerySet.java Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) --- NEW FILE: QuerySet.java --- /* * * The DbUnit Database Testing Framework * Copyright (C)2002-2004, DbUnit.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ package org.dbunit.ant; import java.util.*; import java.util.ArrayList; import java.util.List; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.FilterSet; /** * This element is a container for Queries. It facilitates reuse * through references. Using Ant 1.6 and greater, references can be * defined in a single build file and <i>import</i>ed into many others. * An example of where this is useful follows: * <p> * In our database * we have INDIVIDUALS which must have an associated NAME_INFO and * at least one IND_ADDRESS. The developer creating a dataset for * his/her tests probably won't know all the details of what relationships are * expected, and if he did, its an error prone and repetitive task * to create the correct SQL for entities in each dataset. * Missing a related table, not only creates invalid data for your tests, * but also is likely to cause DBUnit setUp() failures due to foreign key * constraint errors. * (ex. If a previous test had inserted INDIVIDUALS * and NAME_INFO and my test tries to delete only the INDIVIDUALS, the * NAME_INFO.IND_ID constraint would prevent it) * <p> * Usage: * * <pre> * <!-- ======== Define the reusable reference ========== --> * * <queryset id="individuals"> * <query name="INDIVIDUALS" sql=" * SELECT * FROM APS_DATA.INDIVIDUALS WHERE IND_ID IN (@subQuery@)"/> * * <query name="NAME_INFO" sql=" * SELECT B.* FROM APS_DATA.INDIVIDUALS A, APS_DATA.NAME_INFO B * WHERE A.IND_ID IN (@subQuery@) * AND B.IND_ID = A.IND_ID"/> * * <query name="IND_ADDRESSES" sql=" * SELECT B.* FROM APS_DATA.INDIVIDUALS A, APS_DATA.IND_ADDRESSES B * WHERE A.IND_ID IN (@subQuery@) * AND B.IND_ID = A.IND_ID"/> * </queryset> * * <!-- ========= Use the reference ====================== --> * * <dbunit dest="@{destDir}" driver="${jdbcDriver}" * url="${jdbcURL}" userid="${jdbcUser}" password="${jdbcPassword}"> * <export dest="someDir"> * <queryset refid="individuals"> * <filterset> * <filter token="subQuery" value=" * SELECT IND_ID FROM APS_DATA.INDIVIDUALS WHERE USER_NAME = 'UNKNOWN'"/> * </filterset> * </queryset> * * <queryset> * <query name="MAN_EVENT_TYPE" * sql="SELECT * FROM MANUSCRIPTS.MAN_EVENT_TYPE"/> * <query name="JOURNAL" sql="SELECT * FROM MANUSCRIPTS.JOURNAL"/> * </queryset> * </export> * </dbunit> * * </pre> * * @author Lenny Marks le...@ap... * @version $Revision: 1.1 $ * @since Sep. 13 2004 */ public class QuerySet { private String id; private String refid; private List queries = new ArrayList(); private List filterSets = new ArrayList(); private static String ERR_MSG = "Cannot specify 'id' and 'refid' attributes together in queryset."; public QuerySet() { super(); } public void addQuery(Query query) { queries.add(query); } public void addFilterSet(FilterSet filterSet) { filterSets.add(filterSet); } public String getId() { return id; } public String getRefid() { return refid; } public void setId(String string) { if(refid != null) throw new BuildException(ERR_MSG); id = string; } public void setRefid(String string) { if(id != null) throw new BuildException(ERR_MSG); refid = string; } protected List getQueries() { Iterator i = queries.iterator(); while(i.hasNext()) { Query query = (Query)i.next(); replaceTokens(query); } return queries; } private void replaceTokens(Query query) { Iterator i = filterSets.iterator(); while(i.hasNext()) { FilterSet filterSet = (FilterSet)i.next(); query.setSql(filterSet.replaceTokens(query.getSql())); } } public void copyQueriesFrom(QuerySet referenced) { Iterator i = referenced.queries.iterator(); while(i.hasNext()) { addQuery((Query)i.next()); } } } Index: AbstractStep.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/AbstractStep.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractStep.java 6 Apr 2004 06:28:51 -0000 1.2 --- AbstractStep.java 29 Sep 2004 07:05:50 -0000 1.3 *************** *** 21,48 **** package org.dbunit.ant; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.CachedDataSet; import org.dbunit.dataset.csv.CsvProducer; - import org.dbunit.dataset.xml.XmlProducer; - import org.dbunit.dataset.xml.FlatXmlProducer; - import org.dbunit.dataset.xml.FlatDtdProducer; import org.dbunit.dataset.stream.IDataSetProducer; import org.dbunit.dataset.stream.StreamingDataSet; ! import org.dbunit.database.IDatabaseConnection; ! import org.dbunit.database.IResultSetTableFactory; ! import org.dbunit.database.ForwardOnlyResultSetTableFactory; ! import org.dbunit.database.CachedResultSetTableFactory; ! import org.dbunit.database.DatabaseConfig; ! import org.dbunit.database.QueryDataSet; ! import org.dbunit.DatabaseUnitException; ! import org.xml.sax.InputSource; - import java.util.List; - import java.util.Iterator; - import java.sql.SQLException; - import java.io.File; - import java.io.IOException; - /** * @author Manuel Laflamme --- 21,39 ---- package org.dbunit.ant; ! import java.io.File; ! import java.io.IOException; ! import java.sql.SQLException; ! import java.util.*; ! ! import org.apache.tools.ant.Task; ! import org.dbunit.DatabaseUnitException; ! import org.dbunit.database.*; ! import org.dbunit.dataset.*; import org.dbunit.dataset.csv.CsvProducer; import org.dbunit.dataset.stream.IDataSetProducer; import org.dbunit.dataset.stream.StreamingDataSet; ! import org.dbunit.dataset.xml.*; import org.xml.sax.InputSource; /** * @author Manuel Laflamme *************** *** 57,60 **** --- 48,54 ---- public static final String FORMAT_CSV = "csv"; + // Needed a path to Project for logging and references. + private Task parentTask; + protected IDataSet getDatabaseDataSet(IDatabaseConnection connection, List tables, boolean forwardonly) throws DatabaseUnitException *************** *** 82,102 **** } ! QueryDataSet queryDataset = new QueryDataSet(connection); for (Iterator it = tables.iterator(); it.hasNext();) { Object item = it.next(); ! if (item instanceof Query) { Query queryItem = (Query)item; ! queryDataset.addTable(queryItem.getName(), queryItem.getSql()); } else { Table tableItem = (Table)item; ! queryDataset.addTable(tableItem.getName()); } } ! return queryDataset; } catch (SQLException e) --- 76,110 ---- } ! List queryDataSets = new ArrayList(); ! ! QueryDataSet queryDataSet = new QueryDataSet(connection); ! for (Iterator it = tables.iterator(); it.hasNext();) { Object item = it.next(); ! if(item instanceof QuerySet) { ! if(queryDataSet.getTableNames().length > 0) ! queryDataSets.add(queryDataSet); ! queryDataSets.add ! (getQueryDataSetForQuerySet(connection, (QuerySet)item)); ! queryDataSet = new QueryDataSet(connection); ! } ! else if (item instanceof Query) { Query queryItem = (Query)item; ! queryDataSet.addTable(queryItem.getName(), queryItem.getSql()); } else { Table tableItem = (Table)item; ! queryDataSet.addTable(tableItem.getName()); } } + + if(queryDataSet.getTableNames().length > 0) + queryDataSets.add(queryDataSet); ! IDataSet[] dataSetsArray = new IDataSet[queryDataSets.size()]; ! return new CompositeDataSet((IDataSet[])queryDataSets.toArray(dataSetsArray)); } catch (SQLException e) *************** *** 106,110 **** } ! protected IDataSet getSrcDataSet(File src, String format, boolean forwardonly) throws DatabaseUnitException { --- 114,119 ---- } ! ! protected IDataSet getSrcDataSet(File src, String format, boolean forwardonly) throws DatabaseUnitException { *************** *** 144,146 **** --- 153,193 ---- } } + + private QueryDataSet getQueryDataSetForQuerySet + (IDatabaseConnection connection, QuerySet querySet) throws SQLException { + + //incorporate queries from referenced queryset + String refid = querySet.getRefid(); + if(refid != null) { + QuerySet referenced = (QuerySet) + getParentTask().getProject().getReference(refid); + querySet.copyQueriesFrom(referenced); + } + + QueryDataSet partialDataSet = new QueryDataSet(connection); + + Iterator queriesIter = querySet.getQueries().iterator(); + while(queriesIter.hasNext()) { + Query query = (Query)queriesIter.next(); + partialDataSet.addTable(query.getName(), query.getSql()); + } + + return partialDataSet; + + } + + + public Task getParentTask() { + return parentTask; + } + + public void setParentTask(Task task) { + parentTask = task; + } + + public void log(String msg, int level) { + if(parentTask != null) + parentTask.log(msg, level); + } + } Index: DbUnitTask.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/DbUnitTask.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DbUnitTask.java 4 Apr 2004 04:57:19 -0000 1.13 --- DbUnitTask.java 29 Sep 2004 07:05:50 -0000 1.14 *************** *** 253,256 **** --- 253,257 ---- public void addExport(Export export) { + export.setParentTask(this); steps.add(export); } Index: Export.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Export.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Export.java 6 Apr 2004 06:28:51 -0000 1.16 --- Export.java 29 Sep 2004 07:05:50 -0000 1.17 *************** *** 22,28 **** --- 22,30 ---- package org.dbunit.ant; + import org.apache.tools.ant.Project; import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; + import org.dbunit.dataset.csv.CsvDataSet; import org.dbunit.dataset.csv.CsvDataSetWriter; import org.dbunit.dataset.xml.FlatDtdDataSet; *************** *** 34,37 **** --- 36,40 ---- import java.io.IOException; import java.io.OutputStream; + import java.util.*; import java.util.ArrayList; import java.util.List; *************** *** 111,115 **** } ! public String getDoctype() { return _doctype; --- 114,123 ---- } ! public void addQuerySet(QuerySet querySet) { ! _tables.add(querySet); ! } ! ! ! public String getDoctype() { return _doctype; *************** *** 130,139 **** } ! IDataSet dataset = getDatabaseDataSet(connection, _tables, true); // Write the dataset if (_format.equals(FORMAT_CSV)) { ! CsvDataSetWriter.write(dataset, _dest); } else --- 138,149 ---- } ! IDataSet dataset = getDatabaseDataSet(connection, _tables, false); + log("dataset tables: " + Arrays.asList(dataset.getTableNames()), Project.MSG_VERBOSE); + // Write the dataset if (_format.equals(FORMAT_CSV)) { ! CsvDataSet.write(dataset, _dest); } else *************** *** 155,159 **** { FlatDtdDataSet.write(dataset, out); ! } } finally --- 165,170 ---- { FlatDtdDataSet.write(dataset, out); ! } ! } finally *************** *** 162,165 **** --- 173,177 ---- } } + } catch (IOException e) |
|
From: <fsp...@us...> - 2004-09-29 07:06:02
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/hsqldb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/test/org/dbunit/ext/hsqldb Modified Files: HsqldbDataTypeFactoryTest.java Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) Index: HsqldbDataTypeFactoryTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/hsqldb/HsqldbDataTypeFactoryTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HsqldbDataTypeFactoryTest.java 30 Jul 2004 15:52:50 -0000 1.1 --- HsqldbDataTypeFactoryTest.java 29 Sep 2004 07:05:51 -0000 1.2 *************** *** 44,48 **** public void testCreateBooleanDataType() throws Exception { ! int sqlType = Types.BOOLEAN; String sqlTypeName = "BOOLEAN"; --- 44,48 ---- public void testCreateBooleanDataType() throws Exception { ! int sqlType = Types.BIT; String sqlTypeName = "BOOLEAN"; |
|
From: <fsp...@us...> - 2004-09-29 07:06:02
|
Update of /cvsroot/dbunit/dbunit/src/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/xml Modified Files: antTestBuildFile.xml Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) Index: antTestBuildFile.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/antTestBuildFile.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** antTestBuildFile.xml 4 Apr 2004 14:25:42 -0000 1.10 --- antTestBuildFile.xml 29 Sep 2004 07:05:51 -0000 1.11 *************** *** 11,16 **** <property name="exportCsv" value="src/xml/antExportCsv"/> ! <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask"/> ! <target name="all" depends="no-driver, no-db-url, no-userid, no-password"/> --- 11,17 ---- <property name="exportCsv" value="src/xml/antExportCsv"/> ! <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" loaderref="dbunit"/> ! <typedef name="queryset" classname="org.dbunit.ant.QuerySet" loaderref="dbunit"/> ! <target name="all" depends="no-driver, no-db-url, no-userid, no-password"/> *************** *** 236,247 **** <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" ! userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> <export dest="${exportCsv}" format="csv"/> <compare src="${exportCsv}" format="csv"/> </dbunit> <delete dir="${exportCsv}"/> </target> <target name="invalid-export-format"> <dbunit driver="${dbunit.profile.driverClass}" --- 237,309 ---- <dbunit driver="${dbunit.profile.driverClass}" url="${dbunit.profile.connectionUrl}" ! userid="${dbunit.profile.user}" password="${dbunit.profile.password}"> <export dest="${exportCsv}" format="csv"/> <compare src="${exportCsv}" format="csv"/> </dbunit> + <delete dir="${exportCsv}" failonerror="false" /> + </target> + + <target name="test-export-with-queryset" depends="test-type-clean-insert"> + + <dbunit driver="${dbunit.profile.driverClass}" + url="${dbunit.profile.connectionUrl}" + userid="${dbunit.profile.user}" + password="${dbunit.profile.password}"> + + <export dest="${exportCsv}" format="csv"> + <query name="SECOND_TABLE" sql="SELECT * FROM SECOND_TABLE"/> + <queryset> + <query name="TEST_TABLE" + sql="SELECT * FROM TEST_TABLE WHERE COLUMN0 = 'row 0 col 0'"/> + </queryset> + <queryset> + <query name="PK_TABLE" sql="SELECT * FROM PK_TABLE"/> + <query name="TEST_TABLE" + sql="SELECT * FROM TEST_TABLE WHERE COLUMN0 = 'row 1 col 0'"/> + </queryset> + <table name="EMPTY_TABLE"/> + </export> + </dbunit> <delete dir="${exportCsv}"/> </target> + <target name="invalid-queryset"> + <dbunit driver="${dbunit.profile.driverClass}" + url="${dbunit.profile.connectionUrl}" + userid="${dbunit.profile.user}" + password="${dbunit.profile.password}"> + <export dest="${exporDataSet}" format="flat"> + <queryset id="someid" refid="someid"/> + </export> + </dbunit> + <delete file="${exportDataSet}"/> + </target> + + <target name="test-queryset-reference"> + + <queryset id="queryset-id"> + <query name="TEST_TABLE" + sql="SELECT * FROM TEST_TABLE WHERE COLUMN0 = '@colValue@'"/> + <query name="SECOND_TABLE" + sql="SELECT B.* FROM TEST_TABLE A, SECOND_TABLE B WHERE A.COLUMN0 = '@colValue@' AND B.COLUMN0 = A.COLUMN0"/> + </queryset> + + <dbunit driver="${dbunit.profile.driverClass}" + url="${dbunit.profile.connectionUrl}" + userid="${dbunit.profile.user}" + password="${dbunit.profile.password}"> + <export dest="${exportDataSet}" format="flat"> + <queryset refid="queryset-id"> + <filterset> + <filter token="colValue" value="row0 col0"/> + </filterset> + </queryset> + </export> + </dbunit> + <delete file="${exportDataSet}"/> + </target> + + <target name="invalid-export-format"> <dbunit driver="${dbunit.profile.driverClass}" |
|
From: <fsp...@us...> - 2004-09-29 07:06:02
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/csv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/test/org/dbunit/dataset/csv Modified Files: AllTests.java CsvProducerTest.java Added Files: CsvDataSetTest.java Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) --- NEW FILE: CsvDataSetTest.java --- /* * * The DbUnit Database Testing Framework * Copyright (C)2002-2004, DbUnit.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ package org.dbunit.dataset.csv; import org.dbunit.Assertion; import org.dbunit.dataset.*; import org.dbunit.dataset.AbstractDataSetTest; import org.dbunit.dataset.DataSetUtils; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.ITable; import org.dbunit.dataset.filter.ITableFilter; import org.dbunit.dataset.xml.FlatXmlDataSet; import java.io.*; import java.util.ArrayList; import java.util.List; import junit.framework.TestCase; /** * @author Lenny Marks (le...@ap...) * @version $Revision: 1.1 $ * @since Sep 12, 2004 */ public class CsvDataSetTest extends TestCase { protected static final File DATASET_DIR = new File("src/csv/orders"); public CsvDataSetTest(String s) { super(s); } public void testNullColumns() throws DataSetException { File csvDir = DATASET_DIR; CsvDataSet dataSet = new CsvDataSet(csvDir); ITable table = dataSet.getTable("orders"); assertNull(table.getValue(4, "description")); } public void testWrite() throws Exception { IDataSet expectedDataSet = new CsvDataSet(DATASET_DIR).getOrdered(); File tempDir = createTmpDir(); try { //modified this test from FlatXmlDataSetTest CsvDataSet.write(expectedDataSet, tempDir); File tableOrderingFile = new File(tempDir, CsvDataSet.TABLE_ORDERING_FILE); assertTrue(tableOrderingFile.exists()); IDataSet actualDataSet = new CsvDataSet(tempDir).getOrdered(); //verify table count assertEquals("table count", expectedDataSet.getTableNames().length, actualDataSet.getTableNames().length); //verify each table ITable[] expected = DataSetUtils.getTables(expectedDataSet); ITable[] actual = DataSetUtils.getTables(actualDataSet); 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 { deleteDir(tempDir); } assertFalse(tempDir.exists()); } private File createTmpDir() throws IOException { File tmpFile = File.createTempFile("CsvDataSetTest", "-csv"); String fullPath = tmpFile.getAbsolutePath(); tmpFile.delete(); File tmpDir = new File(fullPath); if(!tmpDir.mkdir()) { throw new IOException("Failed to create tmpDir: " + fullPath); } return tmpDir; } private boolean deleteDir(File dir) { if(!dir.exists()) { return false; } File[] files = dir.listFiles(); for(int i = 0; i < files.length; i++) { if(files[i].isDirectory()) { deleteDir(files[i]); } else { files[i].delete(); } } return dir.delete(); } } Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/csv/AllTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AllTests.java 6 Apr 2004 06:28:52 -0000 1.2 --- AllTests.java 29 Sep 2004 07:05:51 -0000 1.3 *************** *** 41,44 **** --- 41,47 ---- suite.addTest(new TestSuite(CsvParserTest.class)); suite.addTest(new TestSuite(CsvProducerTest.class)); + suite.addTest(new TestSuite(CsvDataSetWriterTest.class)); + suite.addTest(new TestSuite(CsvDataSetTest.class)); + return suite; } Index: CsvProducerTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/csv/CsvProducerTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CsvProducerTest.java 6 Apr 2004 06:51:53 -0000 1.4 --- CsvProducerTest.java 29 Sep 2004 07:05:51 -0000 1.5 *************** *** 49,53 **** private String password; private IDatabaseConnection connection; ! private static final int ORDERS_ROWS_NUMBER = 4; private static final int ORDERS_ROW_ROWS_NUMBER = 3; private static final String THE_DIRECTORY = "src/csv/orders"; --- 49,53 ---- private String password; private IDatabaseConnection connection; ! private static final int ORDERS_ROWS_NUMBER = 5; private static final int ORDERS_ROW_ROWS_NUMBER = 3; private static final String THE_DIRECTORY = "src/csv/orders"; |
|
From: <fsp...@us...> - 2004-09-29 07:06:02
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/csv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/java/org/dbunit/dataset/csv Modified Files: CsvDataSetWriter.java Added Files: CsvDataSet.java Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) --- NEW FILE: CsvDataSet.java --- package org.dbunit.dataset.csv; import java.io.*; import java.io.File; import java.io.FileWriter; import java.util.*; import java.util.ArrayList; import java.util.Comparator; import org.dbunit.dataset.*; import org.dbunit.dataset.CachedDataSet; import org.dbunit.dataset.DataSetException; /** * This class constructs an IDataSet given a directory containing CSV * files. It handles translations of "null"(the string), into null. * * @author Lenny Marks (le...@ap...) * */ public class CsvDataSet extends CachedDataSet { public static final String TABLE_ORDERING_FILE = "table-ordering.txt"; private File dir; public CsvDataSet(File dir) throws DataSetException { super(new CsvProducer(dir)); this.dir = dir; } /** * Return an IDataSet ordered using table-orderings.txt in this * CsvDataSets directory. * */ public IDataSet getOrdered() throws DataSetException, IOException { File tableOrderingFile = new File(dir, TABLE_ORDERING_FILE); String[] tableNames = getTableNames(); Arrays.sort(tableNames, new TableComparator(tableOrderingFile)); return new FilteredDataSet(tableNames, this); } public void row(Object[] values) throws DataSetException { Object[] newValues = new Object[values.length]; for(int i = 0; i < values.length; i++) { newValues[i] = values[i].equals(CsvDataSetWriter.NULL) ? null : values[i]; } super.row(newValues); } /** * Write out the <i>dataSet</i> to CSV files in <i>dir</i>. Also * generate table-orderings.txt from the ordering in the <i>dataSet</i>. * */ public static void write(IDataSet dataSet, File dir) throws DataSetException, IOException { CsvDataSetWriter.write(dataSet, dir); generateTableOrderingFile(dataSet, dir); } private static void generateTableOrderingFile(IDataSet dataSet, File dest) throws IOException, DataSetException { File outFile = new File(dest, TABLE_ORDERING_FILE); PrintWriter writer = new PrintWriter(new FileWriter(outFile)); String[] tableNames = dataSet.getTableNames(); for(int i = 0; i < tableNames.length; i++) { writer.print(tableNames[i] + "\n"); } writer.close(); } private static class TableComparator implements Comparator { private List orderedNames = new ArrayList(); public TableComparator(File tableOrderingFile) throws IOException { BufferedReader reader = new BufferedReader(new FileReader(tableOrderingFile)); String line = null; while((line = reader.readLine()) != null) { orderedNames.add(line.trim()); } reader.close(); } public int compare(Object o1, Object o2) { Integer o1Int = new Integer(orderedNames.indexOf(o1)); Integer o2Int = new Integer(orderedNames.indexOf(o2)); return o1Int.compareTo(o2Int); } } } Index: CsvDataSetWriter.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/csv/CsvDataSetWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CsvDataSetWriter.java 6 Apr 2004 06:51:52 -0000 1.3 --- CsvDataSetWriter.java 29 Sep 2004 07:05:50 -0000 1.4 *************** *** 43,47 **** */ ! private static final String NULL = "null"; private static final String NONE = "none"; private static final String FIELD_SEPARATOR = ", "; --- 43,47 ---- */ ! public static final String NULL = "null"; private static final String NONE = "none"; private static final String FIELD_SEPARATOR = ", "; |
|
From: <fsp...@us...> - 2004-09-29 07:06:02
|
Update of /cvsroot/dbunit/dbunit/src/csv/orders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/csv/orders Modified Files: orders.csv Added Files: table-ordering.txt Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) --- NEW FILE: table-ordering.txt --- orders order-row Index: orders.csv =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/csv/orders/orders.csv,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** orders.csv 15 Mar 2004 16:44:22 -0000 1.1 --- orders.csv 29 Sep 2004 07:05:50 -0000 1.2 *************** *** 5,6 **** --- 5,7 ---- 3, "The so called \"third\" Order" 4, "The fourth order" + 5, "null" |
|
From: <fsp...@us...> - 2004-09-29 07:06:02
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/test/org/dbunit/ant Modified Files: DbUnitTaskTest.java Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) Index: DbUnitTaskTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DbUnitTaskTest.java 6 Apr 2004 06:51:52 -0000 1.17 --- DbUnitTaskTest.java 29 Sep 2004 07:05:51 -0000 1.18 *************** *** 182,186 **** + tables, tables.size() == 0); } ! public void testExportPartial() { --- 182,186 ---- + tables, tables.size() == 0); } ! public void testExportPartial() { *************** *** 203,207 **** assertEquals("format", "flat", export.getFormat()); } ! public void testExportFlatWithDocytpe() { --- 203,207 ---- assertEquals("format", "flat", export.getFormat()); } ! public void testExportFlatWithDocytpe() { *************** *** 221,224 **** --- 221,232 ---- } + 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 testExportDtd() { *************** *** 230,243 **** } - /* - 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() { --- 238,241 ---- *************** *** 264,269 **** } ! public void testExportQueryMixed() ! { String targetName = "test-export-query-mixed"; Export export = (Export)getFirstStepFromTarget(targetName); --- 262,330 ---- } ! public void testExportWithQuerySet() { ! String targetName = "test-export-with-queryset"; ! Export export = (Export)getFirstStepFromTarget(targetName); ! assertEquals("format", "csv", export.getFormat()); ! ! List queries = export.getTables(); ! ! assertEquals("query count", 1, getQueryCount(queries)); ! assertEquals("table count", 1, getTableCount(queries)); ! assertEquals("queryset count", 2, getQuerySetCount(queries)); ! ! Query secondTable = (Query)queries.get(0); ! assertEquals("name", "SECOND_TABLE", secondTable.getName()); ! assertEquals("sql", "SELECT * FROM SECOND_TABLE", secondTable.getSql()); ! ! QuerySet queryset1 = (QuerySet)queries.get(1); ! ! Query testTable = (Query)queryset1.getQueries().get(0); ! ! assertEquals("name", "TEST_TABLE", testTable.getName()); ! ! QuerySet queryset2 = (QuerySet)queries.get(2); ! ! Query pkTable = (Query)queryset2.getQueries().get(0); ! Query testTable2 = (Query)queryset2.getQueries().get(1); ! ! assertEquals("name", "PK_TABLE", pkTable.getName()); ! assertEquals("name", "TEST_TABLE", testTable2.getName()); ! ! Table emptyTable = (Table)queries.get(3); ! ! assertEquals("name", "EMPTY_TABLE", emptyTable.getName()); ! } ! ! public void testWithBadQuerySet() { ! expectBuildException("invalid-queryset", ! "Cannot specify 'id' and 'refid' attributes together in queryset."); ! } ! ! public void testWithReferenceQuerySet() { ! String targetName = "test-queryset-reference"; ! ! Export export = (Export)getFirstStepFromTarget(targetName); ! ! List tables = export.getTables(); ! ! assertEquals("total count", 1, tables.size()); ! ! QuerySet queryset = (QuerySet)tables.get(0); ! Query testTable = (Query)queryset.getQueries().get(0); ! Query secondTable = (Query)queryset.getQueries().get(1); ! ! assertEquals("name", "TEST_TABLE", testTable.getName()); ! assertEquals("sql", "SELECT * FROM TEST_TABLE WHERE COLUMN0 = 'row0 col0'", ! testTable.getSql()); ! ! assertEquals("name", "SECOND_TABLE", secondTable.getName()); ! assertEquals("sql", ! "SELECT B.* FROM TEST_TABLE A, SECOND_TABLE B " + ! "WHERE A.COLUMN0 = 'row0 col0' AND B.COLUMN0 = A.COLUMN0", ! secondTable.getSql()); ! ! } ! ! public void testExportQueryMixed() { String targetName = "test-export-query-mixed"; Export export = (Export)getFirstStepFromTarget(targetName); *************** *** 340,345 **** } } ! ! protected void assertOperationType(String failMessage, String targetName, DatabaseOperation expected) { --- 401,405 ---- } } ! protected void assertOperationType(String failMessage, String targetName, DatabaseOperation expected) { *************** *** 377,380 **** --- 437,451 ---- } + protected int getQuerySetCount(List tables) { + int count = 0; + for (Iterator it = tables.iterator(); it.hasNext();) { + if (it.next() instanceof QuerySet) { + count++; + } + } + + return count; + } + protected DbUnitTaskStep getFirstStepFromTarget(String targetName) { *************** *** 398,402 **** executeTarget(targetName); Target target = (Target)targets.get(targetName); ! DbUnitTask task = (DbUnitTask)target.getTasks()[0]; return task; } --- 469,482 ---- executeTarget(targetName); Target target = (Target)targets.get(targetName); ! ! DbUnitTask task = null; ! ! Object[] tasks = target.getTasks(); ! for(int i = 0; i < tasks.length; i++) { ! if(tasks[i] instanceof DbUnitTask) { ! task = (DbUnitTask)tasks[i]; ! } ! } ! return task; } |
|
From: <fsp...@us...> - 2004-09-29 07:06:01
|
Update of /cvsroot/dbunit/dbunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955 Modified Files: dbunit.ipr dbunit.iws Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) Index: dbunit.ipr =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** dbunit.ipr 8 Sep 2004 13:21:53 -0000 1.58 --- dbunit.ipr 29 Sep 2004 07:05:49 -0000 1.59 *************** *** 117,121 **** <option name="OUTPUT_DIRECTORY" /> </component> - <component name="WebReferencesManager" /> </project> --- 117,120 ---- Index: dbunit.iws =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.iws,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dbunit.iws 8 Sep 2004 13:21:53 -0000 1.11 --- dbunit.iws 29 Sep 2004 07:05:49 -0000 1.12 *************** *** 1,87 **** <?xml version="1.0" encoding="UTF-8"?> <project version="3" relativePaths="false"> - <component name="WebReferencesConfigurable"> - <property name="CUSTOM_MAP_LOOKUP" type="list" /> - <property name="INTERFACE_POSTFIX" value="" type="string" /> - <property name="electric.home" value="/electric" type="string" /> - <property name="INTERFACE_PREFIX" value="I" type="string" /> - <property name="THROW_EXCEPTIONS" value="false" type="boolean" /> - <property name="ENABLED" value="false" type="boolean" /> - </component> <component name="FileEditorManager"> <history> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.82437277" horizontal-scroll-proportion="0.59800667" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="37" column="61" vertical-scroll-proportion="0.88709676" horizontal-scroll-proportion="0.8106312" /> ! <source-position-entry url="jar://C:/Documents and Settings/Utente/.maven/repository/ant/jars/ant-1.5.3-1.jar!/org/apache/tools/ant/taskdefs/Delete.class" line="170" column="0" vertical-scroll-proportion="0.66386557" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="230" column="14" vertical-scroll-proportion="0.46057346" horizontal-scroll-proportion="0.18855219" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/DatabaseTestCase.java" line="33" column="22" vertical-scroll-proportion="0.34408602" horizontal-scroll-proportion="0.2962963" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" line="388" column="27" vertical-scroll-proportion="0.6075269" horizontal-scroll-proportion="0.36363637" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype/DataType.java" line="33" column="22" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.2962963" /> ! <source-position-entry url="jar://C:/java/jdk1.3.1_08/src.jar!/src/java/sql/Types.java" line="0" column="0" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java" line="35" column="10" vertical-scroll-proportion="0.24731183" horizontal-scroll-proportion="0.13289036"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/AllTests.java" line="44" column="8" vertical-scroll-proportion="0.76344085" horizontal-scroll-proportion="0.10631229" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DefaultTable.java" line="139" column="18" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.24242425" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlWriterTest.java" line="65" column="17" vertical-scroll-proportion="0.25089607" horizontal-scroll-proportion="0.22895622" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" line="65" column="13" vertical-scroll-proportion="0.82437277" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlWriter.java" line="65" column="13" vertical-scroll-proportion="0.21505377" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java" line="26" column="20" vertical-scroll-proportion="0.71684587" horizontal-scroll-proportion="0.26578072"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> </history> <open-files> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java" line="35" column="10" vertical-scroll-proportion="0.24731183" horizontal-scroll-proportion="0.13289036"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java" line="26" column="20" vertical-scroll-proportion="0.71684587" horizontal-scroll-proportion="0.26578072" selected="true"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlWriter.java" line="65" column="13" vertical-scroll-proportion="0.21505377" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" line="65" column="13" vertical-scroll-proportion="0.82437277" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlWriterTest.java" line="65" column="17" vertical-scroll-proportion="0.25089607" horizontal-scroll-proportion="0.22895622" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DefaultTable.java" line="139" column="18" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.24242425" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/AllTests.java" line="44" column="8" vertical-scroll-proportion="0.76344085" horizontal-scroll-proportion="0.10631229" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype/DataType.java" line="33" column="22" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.2962963" /> </open-files> </component> <component name="ToolWindowManager"> <frame x="-4" y="-4" width="1032" height="747" extended-state="6" /> ! <editor active="true" /> <layout> <window_info id="SQL" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> <window_info id="Deep Find" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> ! <window_info id="Java Bean" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33029383" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" /> ! <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.295846" order="0" /> ! <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.61661345" order="1" x="18" y="290" width="865" height="442" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> ! <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="5" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> ! <window_info id="Duplications" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> ! <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> ! <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32972136" order="2" /> ! <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" /> ! <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="3" /> ! <window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> ! <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" /> ! <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> </layout> </component> <component name="Debugger"> ! <line_breakpoints /> <exception_breakpoints> <breakpoint_any> --- 1,91 ---- <?xml version="1.0" encoding="UTF-8"?> <project version="3" relativePaths="false"> <component name="FileEditorManager"> <history> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/CsvProducer.java" line="107" column="9" vertical-scroll-proportion="0.3111511" horizontal-scroll-proportion="0.11302983" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/QuerySet.java" line="119" column="33" vertical-scroll-proportion="0.9938838" horizontal-scroll-proportion="0.4144427" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/hsqldb/HsqldbDataTypeFactoryTest.java" line="45" column="31" vertical-scroll-proportion="0.42446044" horizontal-scroll-proportion="0.38449612" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/hsqldb/HsqldbDataTypeFactory.java" line="35" column="32" vertical-scroll-proportion="0.46043167" horizontal-scroll-proportion="0.39689922" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Operation.java" line="168" column="0" vertical-scroll-proportion="0.32930514" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/AbstractStep.java" line="42" column="52" vertical-scroll-proportion="0.112021856" horizontal-scroll-proportion="0.6530612" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Export.java" line="180" column="0" vertical-scroll-proportion="1.3251367" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="jar://C:/java/jdk1.3.1_08/src.jar!/src/java/lang/reflect/InvocationTargetException.java" line="0" column="0" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="51" column="39" vertical-scroll-proportion="0.28688523" horizontal-scroll-proportion="0.48979592" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/tools/ant/taskdefs/TaskdefsTest.java" line="65" column="22" vertical-scroll-proportion="0.5054645" horizontal-scroll-proportion="0.27629513" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" line="0" column="0" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/xml/antTestBuildFile.xml" line="243" column="49" vertical-scroll-proportion="0.32786885" horizontal-scroll-proportion="0.61538464" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/CsvDataSetTest.java" line="71" column="66" vertical-scroll-proportion="0.23770492" horizontal-scroll-proportion="0.7237049" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/CsvDataSet.java" line="35" column="25" vertical-scroll-proportion="0.510929" horizontal-scroll-proportion="0.31007752" /> </history> <open-files> ! <source-position-entry url="file://$PROJECT_DIR$/src/xml/antTestBuildFile.xml" line="243" column="49" vertical-scroll-proportion="0.32786885" horizontal-scroll-proportion="0.61538464" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/CsvDataSetTest.java" line="71" column="66" vertical-scroll-proportion="0.23770492" horizontal-scroll-proportion="0.7237049" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" line="0" column="0" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/tools/ant/taskdefs/TaskdefsTest.java" line="65" column="22" vertical-scroll-proportion="0.5054645" horizontal-scroll-proportion="0.27629513" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Export.java" line="180" column="0" vertical-scroll-proportion="1.3251367" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/CsvDataSet.java" line="35" column="25" vertical-scroll-proportion="0.510929" horizontal-scroll-proportion="0.31007752" selected="true" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/AbstractStep.java" line="42" column="52" vertical-scroll-proportion="0.112021856" horizontal-scroll-proportion="0.6530612" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="51" column="39" vertical-scroll-proportion="0.28688523" horizontal-scroll-proportion="0.48979592" /> </open-files> </component> <component name="ToolWindowManager"> <frame x="-4" y="-4" width="1032" height="747" extended-state="6" /> ! <editor active="false" /> <layout> <window_info id="SQL" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> <window_info id="Deep Find" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> ! <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3301282" order="2" /> ! <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" /> ! <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> ! <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> ! <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25379172" order="0" /> ! <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.6640867" order="3" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> ! <window_info id="Find" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.29647437" order="1" x="18" y="290" width="865" height="442" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> ! <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="5" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> + <window_info id="Java Bean" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33029383" order="3" /> <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> + <window_info id="Duplications" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" /> ! <window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> </layout> </component> <component name="Debugger"> ! <line_breakpoints> ! <breakpoint url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="223"> ! <option name="ENABLED" value="true" /> ! <option name="SUSPEND_VM" value="true" /> ! <option name="COUNT_FILTER_ENABLED" value="false" /> ! <option name="COUNT_FILTER" value="0" /> ! <option name="CONDITION_ENABLED" value="false" /> ! <option name="CONDITION" /> ! <option name="LOG_ENABLED" value="false" /> ! <option name="LOG_EXPRESSION_ENABLED" value="false" /> ! <option name="LOG_MESSAGE" /> ! <option name="CLASS_FILTERS_ENABLED" value="false" /> ! <option name="INVERSE_CLASS_FILLTERS" value="false" /> ! <option name="SUSPEND_POLICY" value="SuspendAll" /> ! </breakpoint> ! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" line="265"> ! <option name="ENABLED" value="true" /> ! <option name="SUSPEND_VM" value="true" /> ! <option name="COUNT_FILTER_ENABLED" value="false" /> ! <option name="COUNT_FILTER" value="0" /> ! <option name="CONDITION_ENABLED" value="false" /> ! <option name="CONDITION" /> ! <option name="LOG_ENABLED" value="false" /> ! <option name="LOG_EXPRESSION_ENABLED" value="false" /> ! <option name="LOG_MESSAGE" /> ! <option name="CLASS_FILTERS_ENABLED" value="false" /> ! <option name="INVERSE_CLASS_FILLTERS" value="false" /> ! <option name="SUSPEND_POLICY" value="SuspendAll" /> ! </breakpoint> ! </line_breakpoints> <exception_breakpoints> <breakpoint_any> *************** *** 282,298 **** <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" /> <view id="ProjectPane"> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/ext" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> <expanded_node type="directory" url="file://$PROJECT_DIR$" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/mssql" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/ext" /> - <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/ant" /> </view> <view id="SourcepathPane" /> --- 286,290 ---- *************** *** 442,445 **** --- 434,446 ---- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> </configuration> + <configuration name="DbUnitTaskTest" type="JUnit" default="false" selected="false"> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" value="org.dbunit.ant.DbUnitTaskTest" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + </configuration> </component> <component name="BookmarkManager" /> *************** *** 450,453 **** --- 451,455 ---- </component> <component name="PropertiesComponent"> + <property name="GoToClass.includeJavaFiles" value="false" /> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="GoToClass.includeLibraries" value="false" /> *************** *** 607,688 **** <option name="ACTIVE_VCS_NAME" value="" /> </component> ! <component name="HibernateTools"> ! <HIBERNATE_HOME value="" /> ! <DB_CLASSPATH value="" /> ! <projectMode value="true" /> ! <HIBERNATE_VERSION value="1" /> ! <SCHEMA_EXPORT> ! <EXPORT_TOOL value="true" /> ! <ONLY_DROP value="false" /> ! <CONNECTION_NAME value="NONE" /> ! <NOT_EXPORT value="false" /> ! <FORMAT value="false" /> ! <DELIMITER value="false" /> ! <CREATE_DDL_FILE value="false" /> ! <DELIMITER_STRING value="" /> ! <DDL_FILE_NAME value="" /> ! </SCHEMA_EXPORT> ! <MAP_GENERATOR> ! <MODIFY_UID value="false" /> ! <SET_UID value="false" /> ! <ADD_UID value="false" /> ! <DEPTH value="false" /> ! <SELECT_MODE value="false" /> ! <CREATE_MAP value="true" /> ! <ABSTRACT_CLASS value="false" /> ! <UID value="" /> ! <DEPTH_VALUE value="" /> ! <SELECT_STRING value="" /> ! <MAP_NAME value="" /> ! <ABSTRACT_CLASS_NAME value="" /> ! </MAP_GENERATOR> ! <CODE_GENERATOR> ! <OUT_DIR value="" /> ! </CODE_GENERATOR> ! <REVERSE_GENERATOR> ! <PACKAGE_NAME value="" /> ! <BASE_CLASS_NAME value="" /> ! <OPT_HIBERNATE_TYPE value="false" /> ! <SINGLE_MAP_FILE value="false" /> ! <OUT_TO_SRC value="true" /> ! <ID_NAME value="" /> ! <ID_TYPE value="" /> ! <MAPPING_FILE value="" /> ! <CONNECTION_NAME value="NONE" /> ! </REVERSE_GENERATOR> ! </component> ! <component name="ideajad"> ! <property name="annotate" value="false" /> ! <property name="annotateFully" value="false" /> ! <property name="braces" value="false" /> ! <property name="clear" value="false" /> ! <property name="confirmNavigationTriggeredDecompile" value="false" /> ! <property name="dead" value="false" /> ! <property name="defaultInitializers" value="false" /> ! <property name="dissassemblerOnly" value="false" /> ! <property name="fieldsFirst" value="false" /> ! <property name="fileExtension" value="java" /> ! <property name="fullyQualifiedNames" value="false" /> ! <property name="indentation" value="4" /> ! <property name="intRadix" value="10" /> ! <property name="lineNumbersAsComments" value="false" /> ! <property name="longRadix" value="10" /> ! <property name="maxStringLength" value="64" /> ! <property name="nocast" value="false" /> ! <property name="noclass" value="false" /> ! <property name="nocode" value="false" /> ! <property name="noconv" value="false" /> ! <property name="noctor" value="false" /> ! <property name="nodos" value="false" /> ! <property name="nofd" value="false" /> ! <property name="noinner" value="false" /> ! <property name="nolvt" value="false" /> ! <property name="nonlb" value="true" /> ! <property name="outputDirectory" value="" /> ! <property name="readonly" value="false" /> ! <property name="safe" value="false" /> ! <property name="spaceAfterKeyword" value="false" /> ! <property name="splitStringsAtNewline" value="false" /> ! <property name="useTabs" value="false" /> </component> <component name="JavaSig" /> --- 609,620 ---- <option name="ACTIVE_VCS_NAME" value="" /> </component> ! <component name="dashboard.Configurable"> ! <option name="showingStartFixConfirmationMessage" value="true" /> ! <option name="showingPopUpsOnFixEvent" value="true" /> ! <option name="userName" value="fede" /> ! <option name="resultsURL" value="" /> ! <option name="browserPath" value="" /> ! <option name="multicastHost" value="236.1.2.3" /> ! <option name="multicastPort" value="3274" /> </component> <component name="JavaSig" /> *************** *** 697,703 **** <resizeColumns toHeader="true" toContent="true" /> </component> - <component name="SamePlugin.Configuration"> - <option name="minimumSizeOfFragment" value="10" /> - </component> <component name="StarteamConfiguration"> <option name="SERVER" value="" /> --- 629,632 ---- |
|
From: <fsp...@us...> - 2004-09-29 07:06:01
|
Update of /cvsroot/dbunit/dbunit/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/lib Added Files: .cvsignore Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) --- NEW FILE: .cvsignore --- db2jcc.jar db2java.jar |
|
From: <fsp...@us...> - 2004-09-29 07:06:00
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/hsqldb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23955/src/java/org/dbunit/ext/hsqldb Modified Files: HsqldbDataTypeFactory.java Log Message: CSV DATASET Added/completed support for null values ('null') in csv datasets. Added support for table ordering for cvs dataset: now if you have a file containing one table name for each line, there is the option to get a DataSet orderd accordingly to that file (use CsvDataSet.getOrderded()); the name of the file is for now hardcoded (sorry): 'table-ordering.txt'. QUERIES Added support for reusable queries: useful when you want to export group of related records in related tables and the relation between them could be templated, i.e. when you have foreign keys (or something similar). Patch by Lenny (http://sourceforge.net/mailarchive/forum.php?thread_id=5574127&forum_id=9162) Index: HsqldbDataTypeFactory.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/hsqldb/HsqldbDataTypeFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HsqldbDataTypeFactory.java 30 Jul 2004 15:52:50 -0000 1.1 --- HsqldbDataTypeFactory.java 29 Sep 2004 07:05:50 -0000 1.2 *************** *** 36,40 **** public DataType createDataType(int sqlType, String sqlTypeName) throws DataTypeException { ! if (sqlType == Types.BOOLEAN) { return DataType.BOOLEAN; --- 36,40 ---- public DataType createDataType(int sqlType, String sqlTypeName) throws DataTypeException { ! if (sqlTypeName.equals("BOOLEAN")) { return DataType.BOOLEAN; |
|
From: <fsp...@us...> - 2004-09-10 12:12:27
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21426/src/test/org/dbunit/ext/mssql Modified Files: MsSqlDataTypeFactoryTest.java Log Message: - MsSqlDataTypeFactoryTest: use MsSqlDataTypeFactory constants Index: MsSqlDataTypeFactoryTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MsSqlDataTypeFactoryTest.java 8 Sep 2004 13:21:54 -0000 1.1 --- MsSqlDataTypeFactoryTest.java 10 Sep 2004 12:11:55 -0000 1.2 *************** *** 27,31 **** public void testCreateCharDataType() throws Exception { ! int sqlType = -8; String sqlTypeName = "nchar"; --- 27,31 ---- public void testCreateCharDataType() throws Exception { ! int sqlType = MsSqlDataTypeFactory.NCHAR; String sqlTypeName = "nchar"; *************** *** 37,41 **** public void testCreateVarcharDataType() throws Exception { ! int sqlType = -9; String sqlTypeName = "nvarchar"; --- 37,41 ---- public void testCreateVarcharDataType() throws Exception { ! int sqlType = MsSqlDataTypeFactory.NVARCHAR; String sqlTypeName = "nvarchar"; *************** *** 47,51 **** public void testCreateLongVarcharDataType() throws Exception { ! int sqlType = -10; String sqlTypeName = "ntext"; --- 47,51 ---- public void testCreateLongVarcharDataType() throws Exception { ! int sqlType = MsSqlDataTypeFactory.NTEXT; String sqlTypeName = "ntext"; |
|
From: <fsp...@us...> - 2004-09-08 13:22:03
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22851/src/test/org/dbunit/ext/mssql Modified Files: AllTests.java Added Files: MsSqlDataTypeFactoryTest.java Log Message: - added support for NTEXT, NVARCHAR, NCHAR Sql Server data types. Hint provided by Klas (http://sourceforge.net/mailarchive/forum.php?thread_id=5532581&forum_id=815) --- NEW FILE: MsSqlDataTypeFactoryTest.java --- package org.dbunit.ext.mssql; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.IDataTypeFactory; import junit.framework.TestCase; /** * Created By: fede * Date: 8-set-2004 * Time: 15.08.55 * * Last Checkin: $Author: fspinazzi $ * Date: $Date: 2004/09/08 13:21:54 $ * Revision: $Revision: 1.1 $ */ public class MsSqlDataTypeFactoryTest extends TestCase { public MsSqlDataTypeFactoryTest(String s) { super(s); } public IDataTypeFactory createFactory() throws Exception { return new MsSqlDataTypeFactory(); } public void testCreateCharDataType() throws Exception { int sqlType = -8; String sqlTypeName = "nchar"; DataType expected = DataType.CHAR; DataType actual = createFactory().createDataType(sqlType, sqlTypeName); assertEquals("type", expected, actual); } public void testCreateVarcharDataType() throws Exception { int sqlType = -9; String sqlTypeName = "nvarchar"; DataType expected = DataType.VARCHAR; DataType actual = createFactory().createDataType(sqlType, sqlTypeName); assertEquals("type", expected, actual); } public void testCreateLongVarcharDataType() throws Exception { int sqlType = -10; String sqlTypeName = "ntext"; DataType expected = DataType.LONGVARCHAR; DataType actual = createFactory().createDataType(sqlType, sqlTypeName); assertEquals("type", expected, actual); }} Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql/AllTests.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AllTests.java 15 Mar 2004 16:44:21 -0000 1.3 --- AllTests.java 8 Sep 2004 13:21:54 -0000 1.4 *************** *** 42,45 **** --- 42,46 ---- suite.addTest(new TestSuite(InsertIdentityOperationTest.class)); } + suite.addTest(new TestSuite(MsSqlDataTypeFactoryTest.class)); return suite; |
|
From: <fsp...@us...> - 2004-09-08 13:22:03
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22851/src/java/org/dbunit/ext/mssql Modified Files: MsSqlDataTypeFactory.java Log Message: - added support for NTEXT, NVARCHAR, NCHAR Sql Server data types. Hint provided by Klas (http://sourceforge.net/mailarchive/forum.php?thread_id=5532581&forum_id=815) Index: MsSqlDataTypeFactory.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MsSqlDataTypeFactory.java 22 Jan 2004 02:54:19 -0000 1.2 --- MsSqlDataTypeFactory.java 8 Sep 2004 13:21:54 -0000 1.3 *************** *** 34,51 **** public class MsSqlDataTypeFactory extends DefaultDataTypeFactory { public DataType createDataType(int sqlType, String sqlTypeName) throws DataTypeException { // TODO : Process MS SQL Server custom datatype here ! // if (sqlType == custom1) ! // { ! // return CUSTOM1; ! // } ! // ! // if (sqlType == custom2) ! // { ! // return CUSTOM2; ! // } ! ! return super.createDataType(sqlType, sqlTypeName); } } --- 34,50 ---- public class MsSqlDataTypeFactory extends DefaultDataTypeFactory { + public static final int NCHAR = -8; + public static final int NVARCHAR = -9; + public static final int NTEXT = -10; + public DataType createDataType(int sqlType, String sqlTypeName) throws DataTypeException { // TODO : Process MS SQL Server custom datatype here ! switch(sqlType) { ! case NCHAR: return DataType.CHAR; // nchar ! case NVARCHAR: return DataType.VARCHAR; // nvarchar ! case NTEXT: return DataType.LONGVARCHAR; // ntext ! default: return super.createDataType(sqlType, sqlTypeName); ! } } } |
|
From: <fsp...@us...> - 2004-09-08 13:22:03
|
Update of /cvsroot/dbunit/dbunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22851 Modified Files: .cvsignore dbunit.ipr dbunit.iws Log Message: - added support for NTEXT, NVARCHAR, NCHAR Sql Server data types. Hint provided by Klas (http://sourceforge.net/mailarchive/forum.php?thread_id=5532581&forum_id=815) Index: .cvsignore =================================================================== RCS file: /cvsroot/dbunit/dbunit/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 26 Jan 2004 19:46:16 -0000 1.2 --- .cvsignore 8 Sep 2004 13:21:53 -0000 1.3 *************** *** 6,7 **** --- 6,9 ---- .project spy.* + tmp + idea \ No newline at end of file Index: dbunit.ipr =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** dbunit.ipr 6 Apr 2004 06:28:51 -0000 1.57 --- dbunit.ipr 8 Sep 2004 13:21:53 -0000 1.58 *************** *** 117,120 **** --- 117,121 ---- <option name="OUTPUT_DIRECTORY" /> </component> + <component name="WebReferencesManager" /> </project> Index: dbunit.iws =================================================================== RCS file: /cvsroot/dbunit/dbunit/dbunit.iws,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dbunit.iws 6 Apr 2004 06:51:52 -0000 1.10 --- dbunit.iws 8 Sep 2004 13:21:53 -0000 1.11 *************** *** 1,23 **** <?xml version="1.0" encoding="UTF-8"?> <project version="3" relativePaths="false"> <component name="FileEditorManager"> <history> ! <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="214" column="0" vertical-scroll-proportion="0.17721519" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/xml/antTestBuildFile.xml" line="10" column="56" vertical-scroll-proportion="-0.73006135" horizontal-scroll-proportion="0.7606112" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.91922003" horizontal-scroll-proportion="0.14253898" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.48997772" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.37416482" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.40089086" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="37" column="61" vertical-scroll-proportion="0.80779946" horizontal-scroll-proportion="0.54342985" /> <source-position-entry url="jar://C:/Documents and Settings/Utente/.maven/repository/ant/jars/ant-1.5.3-1.jar!/org/apache/tools/ant/taskdefs/Delete.class" line="170" column="0" vertical-scroll-proportion="0.66386557" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="239" column="0" vertical-scroll-proportion="0.7214485" horizontal-scroll-proportion="0.0" /> </history> <open-files> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="37" column="61" vertical-scroll-proportion="0.80779946" horizontal-scroll-proportion="0.54342985" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="239" column="0" vertical-scroll-proportion="0.7214485" horizontal-scroll-proportion="0.0" selected="true" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.91922003" horizontal-scroll-proportion="0.14253898" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.48997772" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.37416482" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.40089086" /> </open-files> </component> --- 1,55 ---- <?xml version="1.0" encoding="UTF-8"?> <project version="3" relativePaths="false"> + <component name="WebReferencesConfigurable"> + <property name="CUSTOM_MAP_LOOKUP" type="list" /> + <property name="INTERFACE_POSTFIX" value="" type="string" /> + <property name="electric.home" value="/electric" type="string" /> + <property name="INTERFACE_PREFIX" value="I" type="string" /> + <property name="THROW_EXCEPTIONS" value="false" type="boolean" /> + <property name="ENABLED" value="false" type="boolean" /> + </component> <component name="FileEditorManager"> <history> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.82437277" horizontal-scroll-proportion="0.59800667" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="37" column="61" vertical-scroll-proportion="0.88709676" horizontal-scroll-proportion="0.8106312" /> <source-position-entry url="jar://C:/Documents and Settings/Utente/.maven/repository/ant/jars/ant-1.5.3-1.jar!/org/apache/tools/ant/taskdefs/Delete.class" line="170" column="0" vertical-scroll-proportion="0.66386557" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="230" column="14" vertical-scroll-proportion="0.46057346" horizontal-scroll-proportion="0.18855219" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/DatabaseTestCase.java" line="33" column="22" vertical-scroll-proportion="0.34408602" horizontal-scroll-proportion="0.2962963" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/DbUnitTask.java" line="388" column="27" vertical-scroll-proportion="0.6075269" horizontal-scroll-proportion="0.36363637" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype/DataType.java" line="33" column="22" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.2962963" /> ! <source-position-entry url="jar://C:/java/jdk1.3.1_08/src.jar!/src/java/sql/Types.java" line="0" column="0" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.0" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java" line="35" column="10" vertical-scroll-proportion="0.24731183" horizontal-scroll-proportion="0.13289036"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/AllTests.java" line="44" column="8" vertical-scroll-proportion="0.76344085" horizontal-scroll-proportion="0.10631229" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DefaultTable.java" line="139" column="18" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.24242425" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlWriterTest.java" line="65" column="17" vertical-scroll-proportion="0.25089607" horizontal-scroll-proportion="0.22895622" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" line="65" column="13" vertical-scroll-proportion="0.82437277" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlWriter.java" line="65" column="13" vertical-scroll-proportion="0.21505377" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java" line="26" column="20" vertical-scroll-proportion="0.71684587" horizontal-scroll-proportion="0.26578072"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> </history> <open-files> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java" line="35" column="10" vertical-scroll-proportion="0.24731183" horizontal-scroll-proportion="0.13289036"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java" line="26" column="20" vertical-scroll-proportion="0.71684587" horizontal-scroll-proportion="0.26578072" selected="true"> ! <folding> ! <element signature="imports" expanded="true" /> ! </folding> ! </source-position-entry> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlWriter.java" line="65" column="13" vertical-scroll-proportion="0.21505377" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java" line="65" column="13" vertical-scroll-proportion="0.82437277" horizontal-scroll-proportion="0.17508417" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatXmlWriterTest.java" line="65" column="17" vertical-scroll-proportion="0.25089607" horizontal-scroll-proportion="0.22895622" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DefaultTable.java" line="139" column="18" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.24242425" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql/AllTests.java" line="44" column="8" vertical-scroll-proportion="0.76344085" horizontal-scroll-proportion="0.10631229" /> ! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype/DataType.java" line="33" column="22" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.2962963" /> </open-files> </component> *************** *** 28,51 **** <window_info id="SQL" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> <window_info id="Deep Find" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> ! <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3301282" order="2" /> ! <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" /> ! <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> ! <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> ! <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2992922" order="0" /> ! <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="3" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.61698717" order="1" x="18" y="290" width="865" height="442" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="5" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> - <window_info id="Java Bean" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33029383" order="3" /> <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> - <window_info id="Duplications" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" /> ! <window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> </layout> </component> --- 60,83 ---- <window_info id="SQL" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> <window_info id="Deep Find" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> ! <window_info id="Java Bean" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33029383" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" /> ! <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.295846" order="0" /> ! <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.61661345" order="1" x="18" y="290" width="865" height="442" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="5" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> + <window_info id="Duplications" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32972136" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="3" /> + <window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" /> ! <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" /> </layout> </component> *************** *** 250,265 **** <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" /> <view id="ProjectPane"> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> ! <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/org/dbunit/dataset/csv" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> <expanded_node type="directory" url="file://$PROJECT_DIR$" /> </view> <view id="SourcepathPane" /> --- 282,298 ---- <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" /> <view id="ProjectPane"> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/ext" /> ! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/ext/mssql" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src" /> <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" /> <expanded_node type="directory" url="file://$PROJECT_DIR$" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/ext/mssql" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/ext" /> + <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/ant" /> </view> <view id="SourcepathPane" /> *************** *** 574,585 **** <option name="ACTIVE_VCS_NAME" value="" /> </component> ! <component name="dashboard.Configurable"> ! <option name="showingStartFixConfirmationMessage" value="true" /> ! <option name="showingPopUpsOnFixEvent" value="true" /> ! <option name="userName" value="fede" /> ! <option name="resultsURL" value="" /> ! <option name="browserPath" value="" /> ! <option name="multicastHost" value="236.1.2.3" /> ! <option name="multicastPort" value="3274" /> </component> <component name="JavaSig" /> --- 607,688 ---- <option name="ACTIVE_VCS_NAME" value="" /> </component> ! <component name="HibernateTools"> ! <HIBERNATE_HOME value="" /> ! <DB_CLASSPATH value="" /> ! <projectMode value="true" /> ! <HIBERNATE_VERSION value="1" /> ! <SCHEMA_EXPORT> ! <EXPORT_TOOL value="true" /> ! <ONLY_DROP value="false" /> ! <CONNECTION_NAME value="NONE" /> ! <NOT_EXPORT value="false" /> ! <FORMAT value="false" /> ! <DELIMITER value="false" /> ! <CREATE_DDL_FILE value="false" /> ! <DELIMITER_STRING value="" /> ! <DDL_FILE_NAME value="" /> ! </SCHEMA_EXPORT> ! <MAP_GENERATOR> ! <MODIFY_UID value="false" /> ! <SET_UID value="false" /> ! <ADD_UID value="false" /> ! <DEPTH value="false" /> ! <SELECT_MODE value="false" /> ! <CREATE_MAP value="true" /> ! <ABSTRACT_CLASS value="false" /> ! <UID value="" /> ! <DEPTH_VALUE value="" /> ! <SELECT_STRING value="" /> ! <MAP_NAME value="" /> ! <ABSTRACT_CLASS_NAME value="" /> ! </MAP_GENERATOR> ! <CODE_GENERATOR> ! <OUT_DIR value="" /> ! </CODE_GENERATOR> ! <REVERSE_GENERATOR> ! <PACKAGE_NAME value="" /> ! <BASE_CLASS_NAME value="" /> ! <OPT_HIBERNATE_TYPE value="false" /> ! <SINGLE_MAP_FILE value="false" /> ! <OUT_TO_SRC value="true" /> ! <ID_NAME value="" /> ! <ID_TYPE value="" /> ! <MAPPING_FILE value="" /> ! <CONNECTION_NAME value="NONE" /> ! </REVERSE_GENERATOR> ! </component> ! <component name="ideajad"> ! <property name="annotate" value="false" /> ! <property name="annotateFully" value="false" /> ! <property name="braces" value="false" /> ! <property name="clear" value="false" /> ! <property name="confirmNavigationTriggeredDecompile" value="false" /> ! <property name="dead" value="false" /> ! <property name="defaultInitializers" value="false" /> ! <property name="dissassemblerOnly" value="false" /> ! <property name="fieldsFirst" value="false" /> ! <property name="fileExtension" value="java" /> ! <property name="fullyQualifiedNames" value="false" /> ! <property name="indentation" value="4" /> ! <property name="intRadix" value="10" /> ! <property name="lineNumbersAsComments" value="false" /> ! <property name="longRadix" value="10" /> ! <property name="maxStringLength" value="64" /> ! <property name="nocast" value="false" /> ! <property name="noclass" value="false" /> ! <property name="nocode" value="false" /> ! <property name="noconv" value="false" /> ! <property name="noctor" value="false" /> ! <property name="nodos" value="false" /> ! <property name="nofd" value="false" /> ! <property name="noinner" value="false" /> ! <property name="nolvt" value="false" /> ! <property name="nonlb" value="true" /> ! <property name="outputDirectory" value="" /> ! <property name="readonly" value="false" /> ! <property name="safe" value="false" /> ! <property name="spaceAfterKeyword" value="false" /> ! <property name="splitStringsAtNewline" value="false" /> ! <property name="useTabs" value="false" /> </component> <component name="JavaSig" /> *************** *** 594,597 **** --- 697,703 ---- <resizeColumns toHeader="true" toContent="true" /> </component> + <component name="SamePlugin.Configuration"> + <option name="minimumSizeOfFragment" value="10" /> + </component> <component name="StarteamConfiguration"> <option name="SERVER" value="" /> |
|
From: <de...@us...> - 2004-07-30 15:55:22
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2876/src/java/org/dbunit/ant Modified Files: Compare.java Log Message: Import statement cleanup. Thanks Eclipse! Index: Compare.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Compare.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Compare.java 30 May 2004 23:42:00 -0000 1.2 --- Compare.java 30 Jul 2004 15:55:10 -0000 1.3 *************** *** 25,34 **** import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; - import org.dbunit.dataset.CompositeTable; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.ITable; import org.dbunit.dataset.SortedTable; import org.dbunit.dataset.ITableMetaData; - import org.dbunit.dataset.FilteredTableMetaData; import org.dbunit.dataset.filter.DefaultColumnFilter; --- 25,32 ---- |
