Menu
▾
▴
dbunit-commit
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(7) |
Aug
(37) |
Sep
|
Oct
|
Nov
(1) |
Dec
(22) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(8) |
Feb
(68) |
Mar
(72) |
Apr
(149) |
May
(32) |
Jun
(46) |
Jul
(26) |
Aug
(59) |
Sep
(25) |
Oct
(18) |
Nov
(4) |
Dec
(3) |
| 2004 |
Jan
(90) |
Feb
(19) |
Mar
(38) |
Apr
(41) |
May
(44) |
Jun
(2) |
Jul
(10) |
Aug
|
Sep
(14) |
Oct
|
Nov
(1) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(15) |
Jun
(1) |
Jul
|
Aug
(9) |
Sep
|
Oct
(17) |
Nov
|
Dec
|
| 2006 |
Jan
(1) |
Feb
(16) |
Mar
|
Apr
(1) |
May
(48) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(29) |
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(23) |
Mar
(31) |
Apr
|
May
(26) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
(7) |
Oct
(1) |
Nov
(8) |
Dec
(8) |
| 2009 |
Jan
(5) |
Feb
(9) |
Mar
(1) |
Apr
|
May
(23) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
(9) |
Oct
(28) |
Nov
(18) |
Dec
(8) |
| 2010 |
Jan
(19) |
Feb
(24) |
Mar
(3) |
Apr
|
May
(5) |
Jun
(4) |
Jul
|
Aug
(1) |
Sep
(11) |
Oct
|
Nov
(2) |
Dec
(1) |
| 2011 |
Jan
|
Feb
(7) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(32) |
Oct
(6) |
Nov
|
Dec
|
|
From: <mla...@us...> - 2003-02-14 05:12:32
|
Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv10566/dbunit
Modified Files:
dbunit.iws
Log Message:
Fixed 676822 Misspelled class name
Index: dbunit.iws
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.iws,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dbunit.iws 14 Feb 2003 03:21:59 -0000 1.2
--- dbunit.iws 14 Feb 2003 05:12:29 -0000 1.3
***************
*** 12,21 ****
<component name="FileEditorManager">
<history>
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="60" column="30" vertical-scroll-proportion="0.4979424" horizontal-scroll-proportion="0.32457495" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/DefaultDataSetTest.java" line="52" column="30" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.32457495" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/CompositeDataSetTest.java" line="64" column="30" vertical-scroll-proportion="0.6831276" horizontal-scroll-proportion="0.32457495" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java" line="31" column="71" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.76816076" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/Main.java" line="45" column="56" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.6058733" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/AssertionTest.java" line="46" column="48" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.51931995" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" line="266" column="34" vertical-scroll-proportion="0.3580247" horizontal-scroll-proportion="0.36785161" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/AbstractBatchOperationTest.java" line="46" column="34" vertical-scroll-proportion="0.3580247" horizontal-scroll-proportion="0.36785161" />
--- 12,15 ----
***************
*** 30,42 ****
</source-position-entry>
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlTable.java" line="58" column="60" vertical-scroll-proportion="0.9341637" horizontal-scroll-proportion="0.63106793" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="40" column="22" vertical-scroll-proportion="0.9074733" horizontal-scroll-proportion="0.23439878" />
</history>
<open-files>
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="40" column="22" vertical-scroll-proportion="0.9074733" horizontal-scroll-proportion="0.23439878" selected="true" />
</open-files>
</component>
<component name="ToolWindowManager">
! <frame x="-4" y="-4" width="1032" height="746" extended-state="1" />
! <editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
--- 24,47 ----
</source-position-entry>
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlTable.java" line="58" column="60" vertical-scroll-proportion="0.9341637" horizontal-scroll-proportion="0.63106793" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/NoSuchColumnException.java" line="35" column="18" vertical-scroll-proportion="0.46494466" horizontal-scroll-proportion="0.20192307" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="40" column="22" vertical-scroll-proportion="0.90774906" horizontal-scroll-proportion="0.23557693" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/NoPrimaryKeyException.java" line="29" column="13" vertical-scroll-proportion="0.3321033" horizontal-scroll-proportion="0.14583333" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/NoColumnsFoundException.java" line="1" column="39" vertical-scroll-proportion="-0.6800766" horizontal-scroll-proportion="0.4375" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="182" column="46" vertical-scroll-proportion="2.2398524" horizontal-scroll-proportion="0.51602566" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java" line="117" column="23" vertical-scroll-proportion="0.41143912" horizontal-scroll-proportion="0.25801283" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype/UnknownDataType.java" line="29" column="17" vertical-scroll-proportion="0.9095941" horizontal-scroll-proportion="0.19070514" />
</history>
<open-files>
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="40" column="22" vertical-scroll-proportion="0.90774906" horizontal-scroll-proportion="0.23557693" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="182" column="46" vertical-scroll-proportion="2.2398524" horizontal-scroll-proportion="0.51602566" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java" line="117" column="23" vertical-scroll-proportion="0.41143912" horizontal-scroll-proportion="0.25801283" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype/UnknownDataType.java" line="29" column="17" vertical-scroll-proportion="0.9095941" horizontal-scroll-proportion="0.19070514" selected="true" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/NoPrimaryKeyException.java" line="29" column="13" vertical-scroll-proportion="0.3321033" horizontal-scroll-proportion="0.14583333" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/NoSuchColumnException.java" line="35" column="18" vertical-scroll-proportion="0.46494466" horizontal-scroll-proportion="0.20192307" />
</open-files>
</component>
<component name="ToolWindowManager">
! <frame x="-4" y="-4" width="1032" height="746" extended-state="0" />
! <editor active="false" />
<layout>
<window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
***************
*** 45,49 ****
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<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.25914633" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39935064" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
--- 50,54 ----
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<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="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.29268292" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39935064" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
***************
*** 258,265 ****
<view id="SourcepathPane">
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/junit" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
</view>
<view id="ClasspathPane" />
--- 263,272 ----
<view id="SourcepathPane">
<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/java/org/dbunit/database" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/datatype" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset" />
</view>
<view id="ClasspathPane" />
***************
*** 353,356 ****
--- 360,399 ----
<option name="METHOD_NAME" value="testWriteFromDatabase" />
<option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration name="DatabaseTableMetaDataTest.testGetNoColumns" type="JUnit" default="false" selected="false">
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseTableMetaDataTest" />
+ <option name="METHOD_NAME" value="testGetNoColumns" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration name="DatabaseTableMetaDataTest.testGetNoPrimaryKeys" type="JUnit" default="false" selected="false">
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseTableMetaDataTest" />
+ <option name="METHOD_NAME" value="testGetNoPrimaryKeys" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration name="DatabaseTableMetaDataTest.testGetPrimaryKeys" type="JUnit" default="false" selected="false">
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseTableMetaDataTest" />
+ <option name="METHOD_NAME" value="testGetPrimaryKeys" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration name="DatabaseTableMetaDataTest" type="JUnit" default="false" selected="false">
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseTableMetaDataTest" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
|
|
From: <mla...@us...> - 2003-02-14 05:12:32
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype
In directory sc8-pr-cvs1:/tmp/cvs-serv10566/dbunit/src/java/org/dbunit/dataset/datatype
Modified Files:
DataType.java
Added Files:
UnknownDataType.java
Removed Files:
UnkownDataType.java
Log Message:
Fixed 676822 Misspelled class name
--- NEW FILE: UnknownDataType.java ---
/*
*
* The DbUnit Database Testing Framework
* Copyright (C)2002, Manuel Laflamme
*
* 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.datatype;
import java.sql.Types;
/**
* @author Manuel Laflamme
* @version $Revision: 1.1 $
*/
public class UnknownDataType extends AbstractDataType
{
UnknownDataType()
{
super("UNKNOWN", Types.OTHER, Object.class, false);
}
////////////////////////////////////////////////////////////////////////////
// DataType class
public Object typeCast(Object value) throws TypeCastException
{
return value;
}
}
Index: DataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DataType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DataType.java 13 Jun 2002 17:24:56 -0000 1.15
--- DataType.java 14 Feb 2003 05:12:29 -0000 1.16
***************
*** 31,35 ****
public abstract class DataType
{
! public static final DataType UNKNOWN = new UnkownDataType();
public static final DataType CHAR = new StringDataType(
--- 31,35 ----
public abstract class DataType
{
! public static final DataType UNKNOWN = new UnknownDataType();
public static final DataType CHAR = new StringDataType(
--- UnkownDataType.java DELETED ---
|
|
From: <mla...@us...> - 2003-02-14 05:02:31
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv8067/dbunit/src/java/org/dbunit/database
Modified Files:
DatabaseTableMetaData.java
Log Message:
Fixed 627858 Bad sql generation in DatabaseDataSet.
Index: DatabaseTableMetaData.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseTableMetaData.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DatabaseTableMetaData.java 7 Aug 2002 01:32:12 -0000 1.13
--- DatabaseTableMetaData.java 14 Feb 2003 05:02:28 -0000 1.14
***************
*** 179,182 ****
--- 179,187 ----
}
+ if (columnList.size() == 0)
+ {
+ throw new NoColumnsFoundException(tableName);
+ }
+
_columns = (Column[])columnList.toArray(new Column[0]);
}
|
|
From: <mla...@us...> - 2003-02-14 05:02:31
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv8067/dbunit/src/java/org/dbunit/dataset
Added Files:
NoColumnsFoundException.java
Log Message:
Fixed 627858 Bad sql generation in DatabaseDataSet.
--- NEW FILE: NoColumnsFoundException.java ---
/*
* DataSetException.java Feb 13, 2003
*
* The DbUnit Database Testing Framework
* Copyright (C)2002, Manuel Laflamme
*
* 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;
/**
* @author Manuel Laflamme
* @version $Revision: 1.1 $
*/
public class NoColumnsFoundException extends DataSetException
{
public NoColumnsFoundException()
{
}
public NoColumnsFoundException(String msg)
{
super(msg);
}
public NoColumnsFoundException(String msg, Throwable e)
{
super(msg, e);
}
public NoColumnsFoundException(Throwable e)
{
super(e);
}
}
|
|
From: <mla...@us...> - 2003-02-14 05:02:31
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv8067/dbunit/src/test/org/dbunit/database
Modified Files:
DatabaseTableMetaDataTest.java
Log Message:
Fixed 627858 Bad sql generation in DatabaseDataSet.
Index: DatabaseTableMetaDataTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DatabaseTableMetaDataTest.java 13 Dec 2002 21:44:47 -0000 1.12
--- DatabaseTableMetaDataTest.java 14 Feb 2003 05:02:28 -0000 1.13
***************
*** 75,79 ****
String[] expected = {"PK0", "PK1", "PK2"};
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getPrimaryKeys();
--- 75,79 ----
String[] expected = {"PK0", "PK1", "PK2"};
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getPrimaryKeys();
***************
*** 90,94 ****
String tableName = "TEST_TABLE";
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getPrimaryKeys();
--- 90,94 ----
String tableName = "TEST_TABLE";
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getPrimaryKeys();
***************
*** 96,99 ****
--- 96,124 ----
}
+ public void testGetNoColumns() throws Exception
+ {
+ String tableName = "UNKNOWN_TABLE";
+
+ ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
+ try
+ {
+ metaData.getColumns();
+ fail("Should not be here!");
+ }
+ catch (NoColumnsFoundException e)
+ {
+ }
+
+ // try a second times to ensure error is consistent
+ try
+ {
+ metaData.getColumns();
+ fail("Should not be here!");
+ }
+ catch (NoColumnsFoundException e)
+ {
+ }
+ }
+
public void testColumnIsNullable() throws Exception
{
***************
*** 102,106 ****
String[] nullable = {"NORMAL0", "NORMAL1"};
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getColumns();
--- 127,131 ----
String[] nullable = {"NORMAL0", "NORMAL1"};
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getColumns();
***************
*** 156,160 ****
DataType[] expectedTypes = getExpectedDataTypes();
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getColumns();
--- 181,185 ----
DataType[] expectedTypes = getExpectedDataTypes();
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getColumns();
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/test/org/dbunit/dataset
Modified Files:
CaseInsensitiveDataSetTest.java CaseInsensitiveTableTest.java
CompositeDataSetTest.java DefaultDataSetTest.java
FilteredDataSetTest.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: CaseInsensitiveDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CaseInsensitiveDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.3
--- CaseInsensitiveDataSetTest.java 14 Feb 2003 03:21:59 -0000 1.4
***************
*** 15,18 ****
--- 15,19 ----
import java.io.FileInputStream;
+ import java.io.FileReader;
/**
***************
*** 29,33 ****
protected IDataSet createDataSet() throws Exception
{
! return new CaseInsensitiveDataSet(new XmlDataSet(new FileInputStream(
"src/xml/caseInsensitiveDataSetTest.xml")));
}
--- 30,34 ----
protected IDataSet createDataSet() throws Exception
{
! return new CaseInsensitiveDataSet(new XmlDataSet(new FileReader(
"src/xml/caseInsensitiveDataSetTest.xml")));
}
***************
*** 35,39 ****
protected IDataSet createDuplicateDataSet() throws Exception
{
! return new CaseInsensitiveDataSet(new FlatXmlDataSet(new FileInputStream(
"src/xml/caseInsensitiveDataSetDuplicateTest.xml")));
}
--- 36,40 ----
protected IDataSet createDuplicateDataSet() throws Exception
{
! return new CaseInsensitiveDataSet(new FlatXmlDataSet(new FileReader(
"src/xml/caseInsensitiveDataSetDuplicateTest.xml")));
}
Index: CaseInsensitiveTableTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CaseInsensitiveTableTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CaseInsensitiveTableTest.java 13 Jun 2002 17:25:00 -0000 1.2
--- CaseInsensitiveTableTest.java 14 Feb 2003 03:22:00 -0000 1.3
***************
*** 34,38 ****
protected IDataSet createDataSet() throws Exception
{
! InputStream in = new FileInputStream(
new File("src/xml/caseInsensitiveTableTest.xml"));
return new XmlDataSet(in);
--- 34,38 ----
protected IDataSet createDataSet() throws Exception
{
! Reader in = new FileReader(
new File("src/xml/caseInsensitiveTableTest.xml"));
return new XmlDataSet(in);
Index: CompositeDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CompositeDataSetTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompositeDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.6
--- CompositeDataSetTest.java 14 Feb 2003 03:22:00 -0000 1.7
***************
*** 27,30 ****
--- 27,31 ----
import java.io.FileInputStream;
+ import java.io.FileReader;
/**
***************
*** 42,51 ****
{
IDataSet dataSet1 = new XmlDataSet(
! new FileInputStream("src/xml/compositeDataSetTest1.xml"));
assertTrue("count before combine (1)",
dataSet1.getTableNames().length < getExpectedNames().length);
IDataSet dataSet2 = new XmlDataSet(
! new FileInputStream("src/xml/compositeDataSetTest2.xml"));
assertTrue("count before combine (2)",
dataSet2.getTableNames().length < getExpectedNames().length);
--- 43,52 ----
{
IDataSet dataSet1 = new XmlDataSet(
! new FileReader("src/xml/compositeDataSetTest1.xml"));
assertTrue("count before combine (1)",
dataSet1.getTableNames().length < getExpectedNames().length);
IDataSet dataSet2 = new XmlDataSet(
! new FileReader("src/xml/compositeDataSetTest2.xml"));
assertTrue("count before combine (2)",
dataSet2.getTableNames().length < getExpectedNames().length);
***************
*** 57,66 ****
{
IDataSet dataSet1 = new FlatXmlDataSet(
! new FileInputStream("src/xml/compositeDataSetDuplicateTest1.xml"));
assertTrue("count before combine (1)",
dataSet1.getTableNames().length < getExpectedDuplicateNames().length);
IDataSet dataSet2 = new FlatXmlDataSet(
! new FileInputStream("src/xml/compositeDataSetDuplicateTest2.xml"));
assertTrue("count before combine (2)",
dataSet2.getTableNames().length < getExpectedDuplicateNames().length);
--- 58,67 ----
{
IDataSet dataSet1 = new FlatXmlDataSet(
! new FileReader("src/xml/compositeDataSetDuplicateTest1.xml"));
assertTrue("count before combine (1)",
dataSet1.getTableNames().length < getExpectedDuplicateNames().length);
IDataSet dataSet2 = new FlatXmlDataSet(
! new FileReader("src/xml/compositeDataSetDuplicateTest2.xml"));
assertTrue("count before combine (2)",
dataSet2.getTableNames().length < getExpectedDuplicateNames().length);
Index: DefaultDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DefaultDataSetTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.6
--- DefaultDataSetTest.java 14 Feb 2003 03:22:00 -0000 1.7
***************
*** 26,29 ****
--- 26,30 ----
import java.io.FileInputStream;
+ import java.io.FileReader;
/**
***************
*** 41,45 ****
{
IDataSet dataSet = new XmlDataSet(
! new FileInputStream("src/xml/dataSetTest.xml"));
ITable[] tables = DataSetUtils.getTables(dataSet);
--- 42,46 ----
{
IDataSet dataSet = new XmlDataSet(
! new FileReader("src/xml/dataSetTest.xml"));
ITable[] tables = DataSetUtils.getTables(dataSet);
***************
*** 50,54 ****
{
IDataSet dataSet = new XmlDataSet(
! new FileInputStream("src/xml/xmlDataSetDuplicateTest.xml"));
ITable[] tables = DataSetUtils.getTables(dataSet);
--- 51,55 ----
{
IDataSet dataSet = new XmlDataSet(
! new FileReader("src/xml/xmlDataSetDuplicateTest.xml"));
ITable[] tables = DataSetUtils.getTables(dataSet);
Index: FilteredDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/FilteredDataSetTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FilteredDataSetTest.java 13 Feb 2003 04:32:43 -0000 1.8
--- FilteredDataSetTest.java 14 Feb 2003 03:22:00 -0000 1.9
***************
*** 28,31 ****
--- 28,32 ----
import java.io.FileInputStream;
+ import java.io.FileReader;
/**
***************
*** 43,49 ****
{
IDataSet dataSet1 = new XmlDataSet(
! new FileInputStream("src/xml/dataSetTest.xml"));
IDataSet dataSet2 = new XmlDataSet(
! new FileInputStream("src/xml/filteredDataSetTest.xml"));
IDataSet dataSet = new CompositeDataSet(dataSet1, dataSet2);
--- 44,50 ----
{
IDataSet dataSet1 = new XmlDataSet(
! new FileReader("src/xml/dataSetTest.xml"));
IDataSet dataSet2 = new XmlDataSet(
! new FileReader("src/xml/filteredDataSetTest.xml"));
IDataSet dataSet = new CompositeDataSet(dataSet1, dataSet2);
***************
*** 56,62 ****
{
IDataSet dataSet1 = new XmlDataSet(
! new FileInputStream("src/xml/xmlDataSetDuplicateTest.xml"));
IDataSet dataSet2 = new XmlDataSet(
! new FileInputStream("src/xml/filteredDataSetTest.xml"));
IDataSet dataSet = new CompositeDataSet(dataSet1, dataSet2, false);
--- 57,63 ----
{
IDataSet dataSet1 = new XmlDataSet(
! new FileReader("src/xml/xmlDataSetDuplicateTest.xml"));
IDataSet dataSet2 = new XmlDataSet(
! new FileReader("src/xml/filteredDataSetTest.xml"));
IDataSet dataSet = new CompositeDataSet(dataSet1, dataSet2, false);
|
|
From: <mla...@us...> - 2003-02-14 03:22:32
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/test/org/dbunit
Modified Files:
AssertionTest.java DatabaseEnvironment.java Main.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: AssertionTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/AssertionTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssertionTest.java 4 Jul 2002 21:33:43 -0000 1.6
--- AssertionTest.java 14 Feb 2003 03:21:59 -0000 1.7
***************
*** 27,30 ****
--- 27,31 ----
import java.io.FileInputStream;
+ import java.io.FileReader;
import junit.framework.AssertionFailedError;
***************
*** 44,48 ****
private IDataSet getDataSet() throws Exception
{
! return new FlatXmlDataSet(new FileInputStream(
"src/xml/assertionTest.xml"));
}
--- 45,49 ----
private IDataSet getDataSet() throws Exception
{
! return new FlatXmlDataSet(new FileReader(
"src/xml/assertionTest.xml"));
}
Index: DatabaseEnvironment.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/DatabaseEnvironment.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DatabaseEnvironment.java 13 Dec 2002 21:43:53 -0000 1.11
--- DatabaseEnvironment.java 14 Feb 2003 03:21:59 -0000 1.12
***************
*** 30,33 ****
--- 30,34 ----
import java.io.File;
import java.io.FileInputStream;
+ import java.io.FileReader;
import java.sql.Connection;
import java.sql.DriverManager;
***************
*** 85,89 ****
File file = new File("src/xml/dataSetTest.xml");
! _dataSet = new XmlDataSet(new FileInputStream(file));
}
--- 86,90 ----
File file = new File("src/xml/dataSetTest.xml");
! _dataSet = new XmlDataSet(new FileReader(file));
}
Index: Main.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/Main.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Main.java 4 Aug 2002 01:07:13 -0000 1.24
--- Main.java 14 Feb 2003 03:21:59 -0000 1.25
***************
*** 31,34 ****
--- 31,35 ----
import java.io.FileOutputStream;
import java.io.FileInputStream;
+ import java.io.FileReader;
/**
***************
*** 43,47 ****
IDatabaseConnection connection =
DatabaseEnvironment.getInstance().getConnection();
! IDataSet dataSet = new XmlDataSet(new FileInputStream("dataSetTest.xml"));
DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
--- 44,48 ----
IDatabaseConnection connection =
DatabaseEnvironment.getInstance().getConnection();
! IDataSet dataSet = new XmlDataSet(new FileReader("dataSetTest.xml"));
DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
|
|
From: <mla...@us...> - 2003-02-14 03:22:32
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/java/org/dbunit/dataset/xml
Modified Files:
FlatDtdDataSet.java FlatXmlDataSet.java XmlDataSet.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: FlatDtdDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FlatDtdDataSet.java 13 Feb 2003 04:32:42 -0000 1.4
--- FlatDtdDataSet.java 14 Feb 2003 03:21:59 -0000 1.5
***************
*** 30,36 ****
private final Map _tableMap = new HashMap();
public FlatDtdDataSet(InputStream in) throws IOException
{
! DTDParser dtdParser = new DTDParser(new InputStreamReader(in));
DTD dtd = dtdParser.parse(true);
--- 30,44 ----
private final Map _tableMap = new HashMap();
+ /**
+ * @deprecated Use Reader overload instead
+ */
public FlatDtdDataSet(InputStream in) throws IOException
{
! this(new InputStreamReader(in));
! }
!
! public FlatDtdDataSet(Reader in) throws IOException
! {
! DTDParser dtdParser = new DTDParser(in);
DTD dtd = dtdParser.parse(true);
***************
*** 59,68 ****
/**
! * Write the specified dataset to the specified output as DTD.
*/
public static void write(IDataSet dataSet, OutputStream out)
throws IOException, DataSetException
{
! PrintStream printOut = new PrintStream(out);
String[] tableNames = dataSet.getTableNames();
--- 67,85 ----
/**
! * Write the specified dataset to the specified output stream as DTD.
*/
public static void write(IDataSet dataSet, OutputStream out)
throws IOException, DataSetException
{
! write(dataSet, new OutputStreamWriter(out));
! }
!
! /**
! * Write the specified dataset to the specified writer as DTD.
! */
! public static void write(IDataSet dataSet, Writer out)
! throws IOException, DataSetException
! {
! PrintWriter printOut = new PrintWriter(out);
String[] tableNames = dataSet.getTableNames();
Index: FlatXmlDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FlatXmlDataSet.java 3 Aug 2002 02:26:40 -0000 1.17
--- FlatXmlDataSet.java 14 Feb 2003 03:21:59 -0000 1.18
***************
*** 49,64 ****
* Relative DOCTYPE uri are resolved from the xml file path.
*
! * @param file the xml file
*/
public FlatXmlDataSet(File xmlFile) throws IOException, DataSetException
{
try
{
! Document document = new Document(new FileInputStream(xmlFile));
- // Create metadata from dtd if defined
IDataSet metaDataSet = null;
String dtdUri = getDocTypeUri(document);
! if (dtdUri != null)
{
File dtdFile = new File(dtdUri);
--- 49,78 ----
* Relative DOCTYPE uri are resolved from the xml file path.
*
! * @param xmlFile the xml file
*/
public FlatXmlDataSet(File xmlFile) throws IOException, DataSetException
{
+ this(xmlFile, true);
+ }
+
+ /**
+ * Creates an FlatXmlDataSet object with the specifed xml file.
+ * Relative DOCTYPE uri are resolved from the xml file path.
+ *
+ * @param xmlFile the xml file
+ * @param dtdMetadata if <code>false</code> do not use DTD as metadata
+ */
+ public FlatXmlDataSet(File xmlFile, boolean dtdMetadata)
+ throws IOException, DataSetException
+ {
try
{
! Document document = new Document(new BufferedReader(new FileReader(xmlFile)));
IDataSet metaDataSet = null;
+
+ // Create metadata from dtd if defined
String dtdUri = getDocTypeUri(document);
! if (dtdMetadata && dtdUri != null)
{
File dtdFile = new File(dtdUri);
***************
*** 67,71 ****
dtdFile = new File(xmlFile.getParent(), dtdUri);
}
! metaDataSet = new FlatDtdDataSet(new FileInputStream(dtdFile));
}
--- 81,85 ----
dtdFile = new File(xmlFile.getParent(), dtdUri);
}
! metaDataSet = new FlatDtdDataSet(new FileReader(dtdFile));
}
***************
*** 79,106 ****
/**
! * Creates an FlatXmlDataSet object with the specifed xml input stream.
* Relative DOCTYPE uri are resolved from the current working dicrectory.
*
! * @param stream the xml input stream
*/
! public FlatXmlDataSet(InputStream stream) throws IOException, DataSetException
{
try
{
! Document document = new Document(stream);
// Create metadata from dtd if defined
IDataSet metaDataSet = null;
String dtdUri = getDocTypeUri(document);
! if (dtdUri != null)
{
try
{
URL dtdUrl = new URL(dtdUri);
! metaDataSet = new FlatDtdDataSet(dtdUrl.openStream());
}
catch (MalformedURLException e)
{
! metaDataSet = new FlatDtdDataSet(new FileInputStream(dtdUri));
}
}
--- 93,134 ----
/**
! * Creates an FlatXmlDataSet object with the specifed xml reader.
* Relative DOCTYPE uri are resolved from the current working dicrectory.
*
! * @param xmlReader the xml reader
*/
! public FlatXmlDataSet(Reader xmlReader) throws IOException, DataSetException
! {
! this(xmlReader, true);
! }
!
! /**
! * Creates an FlatXmlDataSet object with the specifed xml reader.
! * Relative DOCTYPE uri are resolved from the current working dicrectory.
! *
! * @param xmlReader the xml reader
! * @param dtdMetadata if <code>false</code> do not use DTD as metadata
! */
! public FlatXmlDataSet(Reader xmlReader, boolean dtdMetadata)
! throws IOException, DataSetException
{
try
{
! Document document = new Document(new BufferedReader(xmlReader));
// Create metadata from dtd if defined
IDataSet metaDataSet = null;
String dtdUri = getDocTypeUri(document);
! if (dtdMetadata && dtdUri != null)
{
try
{
URL dtdUrl = new URL(dtdUri);
! metaDataSet = new FlatDtdDataSet(new InputStreamReader(
! dtdUrl.openStream()));
}
catch (MalformedURLException e)
{
! metaDataSet = new FlatDtdDataSet(new FileReader(dtdUri));
}
}
***************
*** 115,118 ****
--- 143,204 ----
/**
+ * Creates an FlatXmlDataSet object with the specifed xml and dtd readers.
+ *
+ * @param xmlReader the xml reader
+ * @param dtdReader the dtd reader
+ */
+ public FlatXmlDataSet(Reader xmlReader, Reader dtdReader)
+ throws IOException, DataSetException
+ {
+ this(xmlReader, new FlatDtdDataSet(dtdReader));
+ }
+
+ /**
+ * Creates an FlatXmlDataSet object with the specifed xml reader.
+ *
+ * @param xmlReader the xml reader
+ * @param metaDataSet the dataset used as metadata source.
+ */
+ public FlatXmlDataSet(Reader xmlReader, IDataSet metaDataSet)
+ throws IOException, DataSetException
+ {
+ try
+ {
+ _tables = getTables(new Document(new BufferedReader(xmlReader)), metaDataSet);
+ }
+ catch (ParseException e)
+ {
+ throw new DataSetException(e);
+ }
+ }
+
+ /**
+ * Creates an FlatXmlDataSet object with the specifed xml input stream.
+ * Relative DOCTYPE uri are resolved from the current working dicrectory.
+ *
+ * @param xmlStream the xml input stream
+ * @deprecated Use Reader overload instead
+ */
+ public FlatXmlDataSet(InputStream xmlStream) throws IOException, DataSetException
+ {
+ this(xmlStream, true);
+ }
+
+ /**
+ * Creates an FlatXmlDataSet object with the specifed xml input stream.
+ * Relative DOCTYPE uri are resolved from the current working dicrectory.
+ *
+ * @param xmlStream the xml input stream
+ * @param dtdMetadata if <code>false</code> do not use DTD as metadata
+ * @deprecated Use Reader overload instead
+ *
+ */
+ public FlatXmlDataSet(InputStream xmlStream, boolean dtdMetadata)
+ throws IOException, DataSetException
+ {
+ this(new InputStreamReader(xmlStream), dtdMetadata);
+ }
+
+ /**
* Creates an FlatXmlDataSet object with the specifed xml and dtd input
* stream.
***************
*** 120,123 ****
--- 206,210 ----
* @param xmlStream the xml input stream
* @param dtdStream the dtd input stream
+ * @deprecated Use Reader overload instead
*/
public FlatXmlDataSet(InputStream xmlStream, InputStream dtdStream)
***************
*** 132,135 ****
--- 219,223 ----
* @param xmlStream the xml input stream
* @param metaDataSet the dataset used as metadata source.
+ * @deprecated Use Reader overload instead
*/
public FlatXmlDataSet(InputStream xmlStream, IDataSet metaDataSet)
***************
*** 147,153 ****
/**
! * Write the specified dataset to the specified output as xml.
*/
public static void write(IDataSet dataSet, OutputStream out)
throws IOException, DataSetException
{
--- 235,253 ----
/**
! * Write the specified dataset to the specified output stream as xml.
*/
public static void write(IDataSet dataSet, OutputStream out)
+ throws IOException, DataSetException
+ {
+ Document document = buildDocument(dataSet);
+
+ // write xml document
+ document.write(out);
+ }
+
+ /**
+ * Write the specified dataset to the specified writer as xml.
+ */
+ public static void write(IDataSet dataSet, Writer out)
throws IOException, DataSetException
{
Index: XmlDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlDataSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XmlDataSet.java 3 Aug 2002 02:26:40 -0000 1.12
--- XmlDataSet.java 14 Feb 2003 03:21:59 -0000 1.13
***************
*** 45,49 ****
--- 45,67 ----
/**
+ * Creates an XmlDataSet with the specified xml reader.
+ */
+ public XmlDataSet(Reader in) throws DataSetException
+ {
+ try
+ {
+ Document document = new Document(new BufferedReader(in));
+ _tables = getTables(document);
+ }
+ catch (ParseException e)
+ {
+ throw new DataSetException(e);
+ }
+ }
+
+ /**
* Creates an XmlDataSet with the specified xml input stream.
+ *
+ * @deprecated Use Reader overload instead
*/
public XmlDataSet(InputStream in) throws DataSetException
***************
*** 52,66 ****
{
Document document = new Document(in);
! Elements tableElems = document.getElement("dataset").getElements("table");
!
! List tableList = new ArrayList();
! while (tableElems.hasMoreElements())
! {
! Element tableElem = (Element)tableElems.nextElement();
! ITable table = new XmlTable(tableElem);
! tableList.add(table);
! }
!
! _tables = (ITable[])tableList.toArray(new ITable[0]);
}
catch (ParseException e)
--- 70,85 ----
{
Document document = new Document(in);
! _tables = getTables(document);
! // Elements tableElems = document.getElement("dataset").getElements("table");
! //
! // List tableList = new ArrayList();
! // while (tableElems.hasMoreElements())
! // {
! // Element tableElem = (Element)tableElems.nextElement();
! // ITable table = new XmlTable(tableElem);
! // tableList.add(table);
! // }
! //
! // _tables = (ITable[])tableList.toArray(new ITable[0]);
}
catch (ParseException e)
***************
*** 86,92 ****
/**
! * Write the specified dataset to the specified output as xml.
*/
public static void write(IDataSet dataSet, OutputStream out)
throws IOException, DataSetException
{
--- 105,123 ----
/**
! * Write the specified dataset to the specified output stream as xml.
*/
public static void write(IDataSet dataSet, OutputStream out)
+ throws IOException, DataSetException
+ {
+ Document document = buildDocument(dataSet);
+
+ // write xml document
+ document.write(out);
+ }
+
+ /**
+ * Write the specified dataset to the specified writer as xml.
+ */
+ public static void write(IDataSet dataSet, Writer out)
throws IOException, DataSetException
{
|
|
From: <mla...@us...> - 2003-02-14 03:22:32
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/java/org/dbunit/ant
Modified Files:
Operation.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: Operation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Operation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Operation.java 15 Jul 2002 01:00:30 -0000 1.4
--- Operation.java 14 Feb 2003 03:21:59 -0000 1.5
***************
*** 169,177 ****
if (format.equalsIgnoreCase("xml"))
{
! dataset = new XmlDataSet(new FileInputStream(src));
}
else
{
! dataset = new FlatXmlDataSet(new FileInputStream(src));
}
dbOperation.execute(connection, dataset);
--- 169,177 ----
if (format.equalsIgnoreCase("xml"))
{
! dataset = new XmlDataSet(new FileReader(src));
}
else
{
! dataset = new FlatXmlDataSet(src);
}
dbOperation.execute(connection, dataset);
|
|
From: <mla...@us...> - 2003-02-14 03:22:32
|
Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit
Modified Files:
dbunit.ipr dbunit.iws
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: dbunit.ipr
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** dbunit.ipr 13 Feb 2003 04:32:41 -0000 1.51
--- dbunit.ipr 14 Feb 2003 03:21:58 -0000 1.52
***************
*** 82,85 ****
--- 82,94 ----
<maximumHeapSize value="128" />
<viewClosedWhenNoErrors value="false" />
+ <targetFilters>
+ <filter targetName="init" isVisible="false" />
+ <filter targetName="clean" isVisible="false" />
+ <filter targetName="compile" isVisible="false" />
+ <filter targetName="jar" isVisible="false" />
+ <filter targetName="javadoc" isVisible="false" />
+ <filter targetName="test" isVisible="true" />
+ <filter targetName="dist" isVisible="false" />
+ </targetFilters>
</buildFile>
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
Index: dbunit.iws
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.iws,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dbunit.iws 13 Feb 2003 04:32:41 -0000 1.1
--- dbunit.iws 14 Feb 2003 03:21:59 -0000 1.2
***************
*** 12,56 ****
<component name="FileEditorManager">
<history>
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="309" column="15" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.16773163" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java" line="43" column="0" vertical-scroll-proportion="0.47740114" horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="201" column="0" vertical-scroll-proportion="0.17896679" horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/XmlDataSet.java" line="41" column="13" vertical-scroll-proportion="0.3321033" horizontal-scroll-proportion="0.14536741" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" line="70" column="0" vertical-scroll-proportion="0.8256705" horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" line="139" column="47" vertical-scroll-proportion="0.33908045" horizontal-scroll-proportion="0.5280899" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" line="164" column="44" vertical-scroll-proportion="0.22796935" horizontal-scroll-proportion="0.49438202" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/DefaultDataSetTest.java" line="48" column="23" vertical-scroll-proportion="0.33222592" horizontal-scroll-proportion="0.2515625" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/CompositeTable.java" line="67" column="20" vertical-scroll-proportion="0.72509223" horizontal-scroll-proportion="0.21875" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" line="55" column="26" vertical-scroll-proportion="0.7066421" horizontal-scroll-proportion="0.284375" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/AbstractDataSetTest.java" line="374" column="8" vertical-scroll-proportion="0.35823753" horizontal-scroll-proportion="0.08988764" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="74" column="34" vertical-scroll-proportion="0.4386973" horizontal-scroll-proportion="0.38202247" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" line="259" column="4" vertical-scroll-proportion="0.1302682" horizontal-scroll-proportion="0.04494382" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/QueryDataSet.java" line="12" column="23" vertical-scroll-proportion="0.3908046" horizontal-scroll-proportion="0.25842696" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/QueryDataSetTest.java" line="306" column="5" vertical-scroll-proportion="0.50766283" horizontal-scroll-proportion="0.056179777" />
</history>
<open-files>
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/AbstractDataSetTest.java" line="374" column="8" vertical-scroll-proportion="0.35823753" horizontal-scroll-proportion="0.08988764" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="74" column="34" vertical-scroll-proportion="0.4386973" horizontal-scroll-proportion="0.38202247" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" line="259" column="4" vertical-scroll-proportion="0.1302682" horizontal-scroll-proportion="0.04494382" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/QueryDataSet.java" line="12" column="23" vertical-scroll-proportion="0.3908046" horizontal-scroll-proportion="0.25842696" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/QueryDataSetTest.java" line="306" column="5" vertical-scroll-proportion="0.50766283" horizontal-scroll-proportion="0.056179777" selected="true" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" line="139" column="47" vertical-scroll-proportion="0.33908045" horizontal-scroll-proportion="0.5280899" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" line="164" column="44" vertical-scroll-proportion="0.22796935" horizontal-scroll-proportion="0.49438202" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" line="70" column="0" vertical-scroll-proportion="0.8256705" horizontal-scroll-proportion="0.0" />
</open-files>
</component>
<component name="ToolWindowManager">
! <frame x="-4" y="-4" width="1032" height="746" extended-state="6" />
! <editor active="false" />
<layout>
<window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
! <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3538961" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<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="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.29369918" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39935064" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
! <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.38311687" order="1" />
! <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.32954547" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
--- 12,53 ----
<component name="FileEditorManager">
<history>
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="60" column="30" vertical-scroll-proportion="0.4979424" horizontal-scroll-proportion="0.32457495" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/DefaultDataSetTest.java" line="52" column="30" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.32457495" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/CompositeDataSetTest.java" line="64" column="30" vertical-scroll-proportion="0.6831276" horizontal-scroll-proportion="0.32457495" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java" line="31" column="71" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.76816076" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/Main.java" line="45" column="56" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.6058733" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/AssertionTest.java" line="46" column="48" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.51931995" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" line="266" column="34" vertical-scroll-proportion="0.3580247" horizontal-scroll-proportion="0.36785161" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/AbstractBatchOperationTest.java" line="46" column="34" vertical-scroll-proportion="0.3580247" horizontal-scroll-proportion="0.36785161" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/util/Base64.java" line="548" column="51" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.5517774" />
! <source-position-entry url="file://$PROJECT_DIR$/build.xml" line="70" column="0" vertical-scroll-proportion="4.1463413" horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/statement/MockBatchStatement.java" line="32" column="13" vertical-scroll-proportion="0.65313655" horizontal-scroll-proportion="0.13663663" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/FileAsserts.java" line="15" column="63" vertical-scroll-proportion="0.4704797" horizontal-scroll-proportion="0.71359223" />
! <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatDtdDataSetTest.java" line="107" column="12" vertical-scroll-proportion="0.30960855" horizontal-scroll-proportion="0.13592233">
! <folding>
! <element signature="imports" expanded="true" />
! </folding>
! </source-position-entry>
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlTable.java" line="58" column="60" vertical-scroll-proportion="0.9341637" horizontal-scroll-proportion="0.63106793" />
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="40" column="22" vertical-scroll-proportion="0.9074733" horizontal-scroll-proportion="0.23439878" />
</history>
<open-files>
! <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" line="40" column="22" vertical-scroll-proportion="0.9074733" horizontal-scroll-proportion="0.23439878" selected="true" />
</open-files>
</component>
<component name="ToolWindowManager">
! <frame x="-4" y="-4" width="1032" height="746" extended-state="1" />
! <editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
! <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39935064" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<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.25914633" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39935064" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
! <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.41233766" order="1" />
! <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.40584415" order="8" x="20" y="232" width="984" height="274" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
***************
*** 142,146 ****
<component name="ErrorTreeViewConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! <option name="HIDE_WARNINGS" value="false" />
</component>
<component name="DaemonCodeAnalyzer">
--- 139,143 ----
<component name="ErrorTreeViewConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! <option name="HIDE_WARNINGS" value="true" />
</component>
<component name="DaemonCodeAnalyzer">
***************
*** 260,263 ****
--- 257,263 ----
</view>
<view id="SourcepathPane">
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/junit" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
***************
*** 339,342 ****
--- 339,360 ----
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
+ <configuration name="FlatXmlDataSetTest" type="JUnit" default="false" selected="false">
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatXmlDataSetTest" />
+ <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>
+ <configuration name="FlatDtdDataSetTest.testWriteFromDatabase" type="JUnit" default="false" selected="false">
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatDtdDataSetTest" />
+ <option name="METHOD_NAME" value="testWriteFromDatabase" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
</component>
<component name="BookmarkManager" />
***************
*** 423,427 ****
<component name="LvcsConfiguration">
<option name="LOCAL_VCS_ENABLED" value="true" />
! <option name="LOCAL_VCS_PURGING_PERIOD" value="259200000" />
<option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
<option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
--- 441,445 ----
<component name="LvcsConfiguration">
<option name="LOCAL_VCS_ENABLED" value="true" />
! <option name="LOCAL_VCS_PURGING_PERIOD" value="864000000" />
<option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
<option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
|
|
From: <mla...@us...> - 2003-02-14 03:22:05
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/test/org/dbunit/operation
Modified Files:
AbstractBatchOperationTest.java CompositeOperationTest.java
DeleteOperationTest.java InsertOperationTest.java
RefreshOperationTest.java TransactionOperationTest.java
UpdateOperationTest.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: AbstractBatchOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/AbstractBatchOperationTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractBatchOperationTest.java 13 Jun 2002 17:25:01 -0000 1.3
--- AbstractBatchOperationTest.java 14 Feb 2003 03:22:01 -0000 1.4
***************
*** 29,32 ****
--- 29,34 ----
import java.io.FileInputStream;
import java.io.InputStream;
+ import java.io.Reader;
+ import java.io.FileReader;
/**
***************
*** 43,47 ****
public void testGetOperationMetaDataAndMissingColumns() throws Exception
{
! InputStream in = new FileInputStream("src/xml/missingColumnTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
--- 45,49 ----
public void testGetOperationMetaDataAndMissingColumns() throws Exception
{
! Reader in = new FileReader("src/xml/missingColumnTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
***************
*** 95,99 ****
{
String tableName = "PK_TABLE";
! InputStream in = new FileInputStream("src/xml/unknownColumnTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
--- 97,101 ----
{
String tableName = "PK_TABLE";
! Reader in = new FileReader("src/xml/unknownColumnTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
Index: CompositeOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/CompositeOperationTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CompositeOperationTest.java 13 Jun 2002 17:25:01 -0000 1.7
--- CompositeOperationTest.java 14 Feb 2003 03:22:01 -0000 1.8
***************
*** 45,49 ****
String tableName = "PK_TABLE";
String columnName = "PK0";
! InputStream in = new FileInputStream(
new File("src/xml/compositeOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
--- 45,49 ----
String tableName = "PK_TABLE";
String columnName = "PK0";
! Reader in = new FileReader(
new File("src/xml/compositeOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
Index: DeleteOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteOperationTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DeleteOperationTest.java 4 Aug 2002 01:07:13 -0000 1.12
--- DeleteOperationTest.java 14 Feb 2003 03:22:01 -0000 1.13
***************
*** 242,246 ****
String tableName = "PK_TABLE";
String columnName = "PK0";
! InputStream in = new FileInputStream(
new File("src/xml/deleteOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
--- 242,246 ----
String tableName = "PK_TABLE";
String columnName = "PK0";
! Reader in = new FileReader(
new File("src/xml/deleteOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
Index: InsertOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/InsertOperationTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** InsertOperationTest.java 13 Dec 2002 21:46:08 -0000 1.16
--- InsertOperationTest.java 14 Feb 2003 03:22:01 -0000 1.17
***************
*** 230,234 ****
if (DatabaseEnvironment.getInstance() instanceof OracleEnvironment)
{
! InputStream in = new FileInputStream(new File("src/xml/clobInsertTest.xml"));
IDataSet xmlDataSet = new FlatXmlDataSet(in);
--- 230,234 ----
if (DatabaseEnvironment.getInstance() instanceof OracleEnvironment)
{
! Reader in = new FileReader(new File("src/xml/clobInsertTest.xml"));
IDataSet xmlDataSet = new FlatXmlDataSet(in);
***************
*** 250,254 ****
if (DatabaseEnvironment.getInstance() instanceof OracleEnvironment)
{
! InputStream in = new FileInputStream(new File("src/xml/blobInsertTest.xml"));
IDataSet xmlDataSet = new FlatXmlDataSet(in);
--- 250,254 ----
if (DatabaseEnvironment.getInstance() instanceof OracleEnvironment)
{
! Reader in = new FileReader(new File("src/xml/blobInsertTest.xml"));
IDataSet xmlDataSet = new FlatXmlDataSet(in);
***************
*** 265,269 ****
public void testMissingColumns() throws Exception
{
! InputStream in = new FileInputStream("src/xml/missingColumnTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
--- 265,269 ----
public void testMissingColumns() throws Exception
{
! Reader in = new FileReader("src/xml/missingColumnTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
***************
*** 333,337 ****
// this won't work because of the timestamp column.
if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment)){
! InputStream in = new FileInputStream("src/xml/insertOperationTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
--- 333,337 ----
// this won't work because of the timestamp column.
if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment)){
! Reader in = new FileReader("src/xml/insertOperationTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
Index: RefreshOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/RefreshOperationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RefreshOperationTest.java 3 Aug 2002 02:26:40 -0000 1.9
--- RefreshOperationTest.java 14 Feb 2003 03:22:01 -0000 1.10
***************
*** 32,35 ****
--- 32,36 ----
import java.io.FileInputStream;
+ import java.io.FileReader;
import java.util.ArrayList;
***************
*** 52,56 ****
IDataSet xmlDataSet = new FlatXmlDataSet(
! new FileInputStream("src/xml/refreshOperationTest.xml"));
// verify table before
--- 53,57 ----
IDataSet xmlDataSet = new FlatXmlDataSet(
! new FileReader("src/xml/refreshOperationTest.xml"));
// verify table before
***************
*** 66,70 ****
// verify table after
IDataSet expectedDataSet = new FlatXmlDataSet(
! new FileInputStream("src/xml/refreshOperationTestExpected.xml"));
for (int i = 0; i < tableNames.length; i++)
--- 67,71 ----
// verify table after
IDataSet expectedDataSet = new FlatXmlDataSet(
! new FileReader("src/xml/refreshOperationTestExpected.xml"));
for (int i = 0; i < tableNames.length; i++)
***************
*** 82,86 ****
IDataSet xmlDataSet = new FlatXmlDataSet(
! new FileInputStream("src/xml/refreshOperationDuplicateTest.xml"));
assertEquals("table count", xmlDataSet.getTableNames().length, 4);
--- 83,87 ----
IDataSet xmlDataSet = new FlatXmlDataSet(
! new FileReader("src/xml/refreshOperationDuplicateTest.xml"));
assertEquals("table count", xmlDataSet.getTableNames().length, 4);
***************
*** 97,101 ****
// verify table after
IDataSet expectedDataSet = new FlatXmlDataSet(
! new FileInputStream("src/xml/refreshOperationTestExpected.xml"));
for (int i = 0; i < tableNames.length; i++)
--- 98,102 ----
// verify table after
IDataSet expectedDataSet = new FlatXmlDataSet(
! new FileReader("src/xml/refreshOperationTestExpected.xml"));
for (int i = 0; i < tableNames.length; i++)
Index: TransactionOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/TransactionOperationTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TransactionOperationTest.java 13 Jun 2002 17:25:01 -0000 1.6
--- TransactionOperationTest.java 14 Feb 2003 03:22:02 -0000 1.7
***************
*** 47,51 ****
{
String tableName = "TEST_TABLE";
! InputStream in = new FileInputStream(
new File("src/xml/transactionOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
--- 47,51 ----
{
String tableName = "TEST_TABLE";
! Reader in = new FileReader(
new File("src/xml/transactionOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
***************
*** 70,74 ****
{
String tableName = "TEST_TABLE";
! InputStream in = new FileInputStream(
new File("src/xml/transactionOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
--- 70,74 ----
{
String tableName = "TEST_TABLE";
! Reader in = new FileReader(
new File("src/xml/transactionOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
***************
*** 106,110 ****
{
String tableName = "TEST_TABLE";
! InputStream in = new FileInputStream(
new File("src/xml/transactionOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
--- 106,110 ----
{
String tableName = "TEST_TABLE";
! Reader in = new FileReader(
new File("src/xml/transactionOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** UpdateOperationTest.java 7 Aug 2002 01:32:12 -0000 1.14
--- UpdateOperationTest.java 14 Feb 2003 03:22:02 -0000 1.15
***************
*** 334,338 ****
int modifiedRow = 1;
! InputStream in = new FileInputStream(
new File("src/xml/updateOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
--- 334,338 ----
int modifiedRow = 1;
! Reader in = new FileReader(
new File("src/xml/updateOperationTest.xml"));
IDataSet xmlDataSet = new XmlDataSet(in);
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/test/org/dbunit/dataset/xml
Modified Files:
FlatDtdDataSetTest.java FlatXmlDataSetTest.java
FlatXmlTableWriteTest.java XmlDataSetTest.java
XmlTableTest.java XmlTableWriteTest.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: FlatDtdDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatDtdDataSetTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FlatDtdDataSetTest.java 3 Aug 2002 02:26:40 -0000 1.5
--- FlatDtdDataSetTest.java 14 Feb 2003 03:22:00 -0000 1.6
***************
*** 43,52 ****
protected IDataSet createDataSet() throws Exception
{
! return new FlatDtdDataSet(new FileInputStream(DTD_FILE));
}
protected IDataSet createDuplicateDataSet() throws Exception
{
! return new FlatDtdDataSet(new FileInputStream(DUPLICATE_FILE));
}
--- 43,52 ----
protected IDataSet createDataSet() throws Exception
{
! return new FlatDtdDataSet(new FileReader(DTD_FILE));
}
protected IDataSet createDuplicateDataSet() throws Exception
{
! return new FlatDtdDataSet(new FileReader(DUPLICATE_FILE));
}
***************
*** 85,89 ****
public void testWriteFromDtd() throws Exception
{
! IDataSet dataSet = new FlatDtdDataSet(new FileInputStream(DTD_FILE));
File tempFile = File.createTempFile("flatXmlDocType", ".dtd");
--- 85,89 ----
public void testWriteFromDtd() throws Exception
{
! IDataSet dataSet = new FlatDtdDataSet(new FileReader(DTD_FILE));
File tempFile = File.createTempFile("flatXmlDocType", ".dtd");
***************
*** 91,95 ****
try
{
! OutputStream out = new FileOutputStream(tempFile);
try
--- 91,95 ----
try
{
! Writer out = new FileWriter(tempFile);
try
***************
*** 106,110 ****
}
! FileAsserts.assertEquals(new FileInputStream(DTD_FILE), tempFile);
}
finally
--- 106,112 ----
}
! FileAsserts.assertEquals(
! new BufferedReader(new FileReader(DTD_FILE)),
! new BufferedReader(new FileReader(tempFile)));
}
finally
***************
*** 125,129 ****
try
{
! OutputStream out = new FileOutputStream(tempFile);
try
--- 127,131 ----
try
{
! Writer out = new FileWriter(tempFile);
try
***************
*** 140,144 ****
}
! FileAsserts.assertEquals(new FileInputStream(DTD_FILE), tempFile);
}
finally
--- 142,148 ----
}
! FileAsserts.assertEquals(
! new BufferedReader(new FileReader(DTD_FILE)),
! new BufferedReader(new FileReader(tempFile)));
}
finally
Index: FlatXmlDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatXmlDataSetTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FlatXmlDataSetTest.java 3 Aug 2002 02:26:40 -0000 1.10
--- FlatXmlDataSetTest.java 14 Feb 2003 03:22:00 -0000 1.11
***************
*** 43,47 ****
protected IDataSet createDataSet() throws Exception
{
! return new FlatXmlDataSet(new FileInputStream("src/xml/flatXmlDataSetTest.xml"));
}
--- 43,47 ----
protected IDataSet createDataSet() throws Exception
{
! return new FlatXmlDataSet(new File("src/xml/flatXmlDataSetTest.xml"));
}
***************
*** 49,53 ****
{
return new FlatXmlDataSet(
! new FileInputStream("src/xml/flatXmlDataSetDuplicateTest.xml"));
}
--- 49,53 ----
{
return new FlatXmlDataSet(
! new File("src/xml/flatXmlDataSetDuplicateTest.xml"));
}
***************
*** 112,116 ****
// load new dataset from temp file
! IDataSet actualDataSet = new FlatXmlDataSet(new FileInputStream(tempFile));
// verify table count
--- 112,116 ----
// load new dataset from temp file
! IDataSet actualDataSet = new FlatXmlDataSet(new FileReader(tempFile));
// verify table count
***************
*** 159,163 ****
// load new dataset from temp file
! IDataSet actualDataSet = new FlatXmlDataSet(new FileInputStream(tempFile));
// verify table count
--- 159,163 ----
// load new dataset from temp file
! IDataSet actualDataSet = new FlatXmlDataSet(new FileReader(tempFile));
// verify table count
Index: FlatXmlTableWriteTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatXmlTableWriteTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FlatXmlTableWriteTest.java 13 Jun 2002 17:25:00 -0000 1.7
--- FlatXmlTableWriteTest.java 14 Feb 2003 03:22:01 -0000 1.8
***************
*** 49,53 ****
// load new dataset from temp file
! return new FlatXmlDataSet(new FileInputStream(tempFile));
}
finally
--- 49,53 ----
// load new dataset from temp file
! return new FlatXmlDataSet(new FileReader(tempFile));
}
finally
***************
*** 82,86 ****
// load new dataset from temp file
FlatXmlDataSet xmlDataSet2 = new FlatXmlDataSet(
! new FileInputStream(tempFile));
// verify each table
--- 82,86 ----
// load new dataset from temp file
FlatXmlDataSet xmlDataSet2 = new FlatXmlDataSet(
! new FileReader(tempFile));
// verify each table
Index: XmlDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/XmlDataSetTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XmlDataSetTest.java 3 Aug 2002 02:26:40 -0000 1.7
--- XmlDataSetTest.java 14 Feb 2003 03:22:01 -0000 1.8
***************
*** 43,47 ****
protected IDataSet createDataSet() throws Exception
{
! InputStream in = new FileInputStream(
new File("src/xml/dataSetTest.xml"));
return new XmlDataSet(in);
--- 43,47 ----
protected IDataSet createDataSet() throws Exception
{
! Reader in = new FileReader(
new File("src/xml/dataSetTest.xml"));
return new XmlDataSet(in);
***************
*** 71,75 ****
// load new dataset from temp file
! IDataSet actualDataSet = new XmlDataSet(new FileInputStream(tempFile));
// verify table count
--- 71,75 ----
// load new dataset from temp file
! IDataSet actualDataSet = new XmlDataSet(new FileReader(tempFile));
// verify table count
***************
*** 118,122 ****
// load new dataset from temp file
! IDataSet actualDataSet = new XmlDataSet(new FileInputStream(tempFile));
// verify table count
--- 118,122 ----
// load new dataset from temp file
! IDataSet actualDataSet = new XmlDataSet(new FileReader(tempFile));
// verify table count
Index: XmlTableTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/XmlTableTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XmlTableTest.java 13 Jun 2002 17:25:00 -0000 1.7
--- XmlTableTest.java 14 Feb 2003 03:22:01 -0000 1.8
***************
*** 45,49 ****
protected IDataSet createDataSet() throws Exception
{
! InputStream in = new FileInputStream(
new File("src/xml/xmlTableTest.xml"));
return new XmlDataSet(in);
--- 45,49 ----
protected IDataSet createDataSet() throws Exception
{
! Reader in = new FileReader(
new File("src/xml/xmlTableTest.xml"));
return new XmlDataSet(in);
Index: XmlTableWriteTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/XmlTableWriteTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XmlTableWriteTest.java 13 Jun 2002 17:25:00 -0000 1.4
--- XmlTableWriteTest.java 14 Feb 2003 03:22:01 -0000 1.5
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.dataset.*;
+ import org.dbunit.Assertion;
import java.io.*;
***************
*** 71,75 ****
// load new dataset from temp file
! return new XmlDataSet(new FileInputStream(tempFile));
}
finally
--- 72,76 ----
// load new dataset from temp file
! return new XmlDataSet(new FileReader(tempFile));
}
finally
***************
*** 103,107 ****
// load new dataset from temp file
! XmlDataSet xmlDataSet2 = new XmlDataSet(new FileInputStream(tempFile));
// verify each table
--- 104,108 ----
// load new dataset from temp file
! XmlDataSet xmlDataSet2 = new XmlDataSet(new FileReader(tempFile));
// verify each table
***************
*** 109,113 ****
{
ITable table = tables[i];
! DataSetUtils.assertEquals(table, xmlDataSet2.getTable(xmlDataSet2.getTableNames()[i]));
}
}
--- 110,114 ----
{
ITable table = tables[i];
! Assertion.assertEquals(table, xmlDataSet2.getTable(xmlDataSet2.getTableNames()[i]));
}
}
|
|
From: <mla...@us...> - 2003-02-14 03:22:05
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/dbunit/src/test/org/dbunit/operation/mssqlserver
Modified Files:
InsertIdentityOperationTest.java
Log Message:
1. Allows disabling DTD dataset for FlatXmlDataSet having a DOCTYPE.
2. Provided Reader and Writers for the xml dataset methods, to make possible the use of Unicode and international characters in the datasets. Existing InputStream methods are now deprecated.
Index: InsertIdentityOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/mssqlserver/InsertIdentityOperationTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InsertIdentityOperationTest.java 29 Jan 2003 13:02:43 -0000 1.3
--- InsertIdentityOperationTest.java 14 Feb 2003 03:22:02 -0000 1.4
***************
*** 58,62 ****
{
if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
! InputStream in = new FileInputStream("src/xml/insertIdentityOperationTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
--- 58,62 ----
{
if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
! Reader in = new FileReader("src/xml/insertIdentityOperationTest.xml");
IDataSet xmlDataSet = new XmlDataSet(in);
***************
*** 95,99 ****
{
if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
! InputStream in = new FileInputStream("src/xml/insertIdentityOperationTestFlat.xml");
IDataSet xmlDataSet = new FlatXmlDataSet(in);
--- 95,99 ----
{
if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
! Reader in = new FileReader("src/xml/insertIdentityOperationTestFlat.xml");
IDataSet xmlDataSet = new FlatXmlDataSet(in);
***************
*** 136,140 ****
{
if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
! InputStream in = new FileInputStream("src/xml/insertIdentityOperationTestNoPK.xml");
IDataSet xmlDataSet = new FlatXmlDataSet(in);
--- 136,140 ----
{
if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
! Reader in = new FileReader("src/xml/insertIdentityOperationTestNoPK.xml");
IDataSet xmlDataSet = new FlatXmlDataSet(in);
|
|
From: <mla...@us...> - 2003-02-13 04:32:46
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit/src/test/org/dbunit/dataset
Modified Files:
AbstractDataSetTest.java FilteredDataSetTest.java
QueryDataSetTest.java
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
Index: AbstractDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AbstractDataSetTest.java 29 Jan 2003 13:03:36 -0000 1.16
--- AbstractDataSetTest.java 13 Feb 2003 04:32:42 -0000 1.17
***************
*** 61,65 ****
--- 61,75 ----
{
return (String[])TABLE_NAMES.clone();
+ }
+
+ protected static String[] getExpectedLowerNames() throws Exception
+ {
+ String[] names = (String[])TABLE_NAMES.clone();
+ for (int i = 0; i < names.length; i++)
+ {
+ names[i] = names[i].toLowerCase();
+ }
+ return names;
}
***************
*** 116,119 ****
--- 126,145 ----
}
+ /**
+ * Create a dataset with duplicate tables having different char case in name
+ * @return
+ */
+ protected IDataSet createMultipleCaseDuplicateDataSet() throws Exception
+ {
+ IDataSet dataSet = createDuplicateDataSet();
+ ITable lowerTable = dataSet.getTables()[0];
+ dataSet = new DefaultDataSet(new ITable[]{
+ new CompositeTable(getDuplicateTableName().toLowerCase(), lowerTable),
+ dataSet.getTables()[1],
+ dataSet.getTables()[2],
+ });
+ return dataSet;
+ }
+
protected abstract IDataSet createDataSet() throws Exception;
***************
*** 122,126 ****
/**
* Many tests in this class assume a known sequence of table. For some
! * IDataSet implemntation (like OldDatabaseDataSet) we can't predict
* any specific order. For supporting them, this method is called for both
* the expected names and dataset names before comparing them.
--- 148,152 ----
/**
* Many tests in this class assume a known sequence of table. For some
! * IDataSet implemntation (like DatabaseDataSet) we can't predict
* any specific order. For supporting them, this method is called for both
* the expected names and dataset names before comparing them.
***************
*** 306,309 ****
--- 332,399 ----
}
}
+
+ public void testGetCaseInsensitiveTable() throws Exception
+ {
+ String[] expectedNames = getExpectedLowerNames();
+
+ IDataSet dataSet = createDataSet();
+ for (int i = 0; i < expectedNames.length; i++)
+ {
+ String expected = expectedNames[i];
+ ITable table = dataSet.getTable(expected);
+ String actual = table.getTableMetaData().getTableName();
+
+ if (!expected.equalsIgnoreCase(actual))
+ {
+ assertEquals("name " + i, expected, actual);
+ }
+ }
+ }
+
+ public void testGetCaseInsensitiveTableMetaData() throws Exception
+ {
+ String[] expectedNames = getExpectedLowerNames();
+ IDataSet dataSet = createDataSet();
+
+ for (int i = 0; i < expectedNames.length; i++)
+ {
+ String expected = expectedNames[i];
+ ITableMetaData metaData = dataSet.getTableMetaData(expected);
+ String actual = metaData.getTableName();
+
+ if (!expected.equalsIgnoreCase(actual))
+ {
+ assertEquals("name " + i, expected, actual);
+ }
+ }
+ }
+
+ public void testGetCaseInsensitiveDuplicateTable() throws Exception
+ {
+ IDataSet dataSet = createMultipleCaseDuplicateDataSet();
+
+ try
+ {
+ dataSet.getTable(getDuplicateTableName().toLowerCase());
+ fail("Should throw AmbiguousTableNameException");
+ }
+ catch (AmbiguousTableNameException e)
+ {
+ }
+ }
+
+ public void testGetCaseInsensitiveDuplicateTableMetaData() throws Exception
+ {
+ IDataSet dataSet = createMultipleCaseDuplicateDataSet();
+ try
+ {
+ dataSet.getTableMetaData(getDuplicateTableName().toLowerCase());
+ fail("Should throw AmbiguousTableNameException");
+ }
+ catch (AmbiguousTableNameException e)
+ {
+ }
+ }
+
}
Index: FilteredDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/FilteredDataSetTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FilteredDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.7
--- FilteredDataSetTest.java 13 Feb 2003 04:32:43 -0000 1.8
***************
*** 66,69 ****
--- 66,77 ----
}
+ protected IDataSet createMultipleCaseDuplicateDataSet() throws Exception
+ {
+ String[] names = getExpectedDuplicateNames();
+ names[0] = names[0].toLowerCase();
+
+ return new FilteredDataSet(names, createDuplicateDataSet());
+ }
+
public void testGetFilteredTableNames() throws Exception
{
Index: QueryDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/QueryDataSetTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryDataSetTest.java 13 Dec 2002 21:45:34 -0000 1.2
--- QueryDataSetTest.java 13 Feb 2003 04:32:43 -0000 1.3
***************
*** 297,301 ****
--- 297,309 ----
}
+ public void testGetCaseInsensitiveDuplicateTable() throws Exception
+ {
+ // Cannot test! Unsupported feature.
+ }
+ public void testGetCaseInsensitiveDuplicateTableMetaData() throws Exception
+ {
+ // Cannot test! Unsupported feature.
+ }
}
|
|
From: <mla...@us...> - 2003-02-13 04:32:46
|
Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit
Modified Files:
dbunit.ipr
Added Files:
dbunit.iws
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
--- NEW FILE: dbunit.iws ---
<?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="INCLUDE_SYSTEM_MAP" value="true" type="boolean" />
<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/xml/FlatXmlDataSet.java" line="309" column="15" vertical-scroll-proportion="0.33333334" horizontal-scroll-proportion="0.16773163" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java" line="43" column="0" vertical-scroll-proportion="0.47740114" horizontal-scroll-proportion="0.0" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="201" column="0" vertical-scroll-proportion="0.17896679" horizontal-scroll-proportion="0.0" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/XmlDataSet.java" line="41" column="13" vertical-scroll-proportion="0.3321033" horizontal-scroll-proportion="0.14536741" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" line="70" column="0" vertical-scroll-proportion="0.8256705" horizontal-scroll-proportion="0.0" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" line="139" column="47" vertical-scroll-proportion="0.33908045" horizontal-scroll-proportion="0.5280899" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" line="164" column="44" vertical-scroll-proportion="0.22796935" horizontal-scroll-proportion="0.49438202" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/DefaultDataSetTest.java" line="48" column="23" vertical-scroll-proportion="0.33222592" horizontal-scroll-proportion="0.2515625" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/CompositeTable.java" line="67" column="20" vertical-scroll-proportion="0.72509223" horizontal-scroll-proportion="0.21875" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/FilteredDataSet.java" line="55" column="26" vertical-scroll-proportion="0.7066421" horizontal-scroll-proportion="0.284375" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/AbstractDataSetTest.java" line="374" column="8" vertical-scroll-proportion="0.35823753" horizontal-scroll-proportion="0.08988764" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="74" column="34" vertical-scroll-proportion="0.4386973" horizontal-scroll-proportion="0.38202247" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" line="259" column="4" vertical-scroll-proportion="0.1302682" horizontal-scroll-proportion="0.04494382" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/QueryDataSet.java" line="12" column="23" vertical-scroll-proportion="0.3908046" horizontal-scroll-proportion="0.25842696" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/QueryDataSetTest.java" line="306" column="5" vertical-scroll-proportion="0.50766283" horizontal-scroll-proportion="0.056179777" />
</history>
<open-files>
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/AbstractDataSetTest.java" line="374" column="8" vertical-scroll-proportion="0.35823753" horizontal-scroll-proportion="0.08988764" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="74" column="34" vertical-scroll-proportion="0.4386973" horizontal-scroll-proportion="0.38202247" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" line="259" column="4" vertical-scroll-proportion="0.1302682" horizontal-scroll-proportion="0.04494382" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/QueryDataSet.java" line="12" column="23" vertical-scroll-proportion="0.3908046" horizontal-scroll-proportion="0.25842696" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/QueryDataSetTest.java" line="306" column="5" vertical-scroll-proportion="0.50766283" horizontal-scroll-proportion="0.056179777" selected="true" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" line="139" column="47" vertical-scroll-proportion="0.33908045" horizontal-scroll-proportion="0.5280899" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" line="164" column="44" vertical-scroll-proportion="0.22796935" horizontal-scroll-proportion="0.49438202" />
<source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" line="70" column="0" vertical-scroll-proportion="0.8256705" horizontal-scroll-proportion="0.0" />
</open-files>
</component>
<component name="ToolWindowManager">
<frame x="-4" y="-4" width="1032" height="746" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3538961" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<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="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.29369918" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39935064" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.38311687" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.32954547" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" />
<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="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
</layout>
</component>
<component name="Debugger">
<line_breakpoints />
<exception_breakpoints>
<breakpoint_any>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
<option name="ENABLED" value="false" />
<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_any>
</exception_breakpoints>
<field_breakpoints />
<method_breakpoints />
</component>
<component name="DebuggerManager" />
<component name="DebuggerSettings">
<option name="TRACING_FILTERS_ENABLED" value="true" />
<option name="TOSTRING_CLASSES_ENABLED" value="false" />
<option name="VALUE_LOOKUP_DELAY" value="700" />
<option name="DEBUGGER_TRANSPORT" value="0" />
<option name="FORCE_CLASSIC_VM" value="false" />
<option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
<option name="SKIP_SYNTHETIC_METHODS" value="true" />
<option name="SKIP_CONSTRUCTORS" value="false" />
<option name="STEP_THREAD_SUSPEND_POLICY" value="SuspendThread" />
<option name="EVALUATION_TIMEOUT" value="1000" />
<default_breakpoint_settings>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
<option name="WATCH_MODIFICATION" value="true" />
<option name="WATCH_ACCESS" value="true" />
<option name="WATCH_ENTRY" value="true" />
<option name="WATCH_EXIT" value="true" />
<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" />
</default_breakpoint_settings>
<filter>
<option name="PATTERN" value="com.sun.*" />
<option name="ENABLED" value="true" />
</filter>
<filter>
<option name="PATTERN" value="java.*" />
<option name="ENABLED" value="false" />
</filter>
<filter>
<option name="PATTERN" value="javax.*" />
<option name="ENABLED" value="true" />
</filter>
<filter>
<option name="PATTERN" value="org.omg.*" />
<option name="ENABLED" value="true" />
</filter>
<filter>
<option name="PATTERN" value="sun.*" />
<option name="ENABLED" value="true" />
</filter>
</component>
<component name="CompilerWorkspaceConfiguration">
<option name="COMPILE_IN_BACKGROUND" value="true" />
<option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
</component>
<component name="ErrorTreeViewConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="HIDE_WARNINGS" value="false" />
</component>
<component name="DaemonCodeAnalyzer">
<disable_hints />
</component>
<component name="StructureViewFactory">
<option name="SORT_MODE" value="0" />
<option name="GROUP_OVERRIDINGS" value="true" />
<option name="GROUP_IMPLEMENTINGS" value="true" />
<option name="AUTOSCROLL_MODE" value="true" />
<option name="SHOW_METHODS" value="true" />
<option name="SHOW_FIELDS" value="true" />
<option name="AUTOSCROLL_FROM_SOURCE" value="false" />
<option name="GROUP_GETTERS_AND_SETTERS" value="true" />
</component>
<component name="CvsConfiguration">
<cvs_root>
<option name="METHOD" value="ext" />
<option name="USER_NAME" value="mlaflamm" />
<option name="HOST" value="" />
<option name="REPOSITORY" value="" />
</cvs_root>
<root_file url="file://K:\java\projects\dbunit" />
<Checkout>
<option name="DATE_TAG" value="" />
<option name="REVISION_TAG" value="" />
<option name="PRUNE_EMPTY_DIRS" value="true" />
<option name="RESET_STICKY_TAGS" value="false" />
<option name="NON_RECURSIVE" value="false" />
<option name="CREATE_WORKING_DIR" value="" />
<option name="ADDITIONAL_OPTIONS" value="" />
</Checkout>
<Update>
<option name="DATE_TAG" value="" />
<option name="REVISION_TAG" value="" />
<option name="PRUNE_EMPTY_DIRS" value="true" />
<option name="RESET_STICKY_TAGS" value="false" />
<option name="NON_RECURSIVE" value="false" />
<option name="CREATE_MISSING_DIRECTORIES" value="true" />
<option name="DONT_CHANGE_FILES" value="false" />
<option name="QUIET_MODE" value="false" />
<option name="ADDITIONAL_OPTIONS" value="" />
</Update>
<Commit>
<option name="NON_RECURSIVE" value="false" />
<option name="REVISION_TAG" />
<option name="LOG_MESSAGE" />
<option name="ADDITIONAL_OPTIONS" />
</Commit>
<Diff>
<option name="REVISION_TAG" value="HEAD" />
<option name="DATE_TAG" value="" />
<option name="IGNORE_WHITESPACE" value="false" />
</Diff>
<Add>
<option name="ADD_AS_BINARY" value="false" />
<option name="LOG_MESSAGE" value="" />
</Add>
<Status>
<option name="NON_RECURSIVE" value="false" />
<option name="INCLUDE_TAGS" value="false" />
</Status>
<Edit>
<option name="NON_RECURSIVE" value="false" />
<option name="FORCE_RECURSIVE" value="false" />
<option name="EDIT" value="false" />
<option name="UNEDIT" value="false" />
<option name="COMMIT" value="false" />
<option name="ALL" value="true" />
<option name="NONE" value="false" />
</Edit>
<Remove>
<option name="NON_RECURSIVE" value="false" />
<option name="FORCE_RECURSIVE" value="false" />
<option name="DELETE_FILE" value="false" />
</Remove>
<Log>
<option name="DEFAULT_BRANCH" value="false" />
<option name="NON_RECURSIVE" value="false" />
<option name="QUIET_MODE" value="true" />
<option name="ADDITIONAL_OPTIONS" value="" />
</Log>
<Editors>
<option name="NON_RECURSIVE" value="false" />
<option name="FORCE_RECURSIVE" value="false" />
</Editors>
<option name="CLIENT_PATH" value="D:/Program Files/WinCvs 1.3/cvs.exe" />
<option name="EXTERNAL_DIFF_PATH" value="" />
<option name="USE_EXTERNAL_DIFF" value="false" />
<option name="WORKING_FILES_READONLY" value="false" />
<option name="COMPRESSION_LEVEL" value="0" />
<option name="ADDITIONAL_OPTIONS" value="" />
<option name="BINARY_FILES_EXTENSIONS" />
<option name="REUSE_LAST_LOG_MESSAGE" value="false" />
<option name="PUT_FOCUS_INTO_LOG_MESSAGE" value="false" />
<option name="SHOW_UPDATE_OPTIONS" value="true" />
<option name="SHOW_COMMIT_OPTIONS" value="true" />
<option name="SHOW_DIFF_OPTIONS" value="true" />
<option name="SHOW_ADD_OPTIONS" value="true" />
<option name="SHOW_STATUS_OPTIONS" value="true" />
<option name="SHOW_EDIT_OPTIONS" value="true" />
<option name="SHOW_UNEDIT_OPTIONS" value="true" />
<option name="SHOW_REMOVE_OPTIONS" value="true" />
<option name="SHOW_LOG_OPTIONS" value="true" />
<option name="SHOW_EDITORS_OPTIONS" value="true" />
<option name="HIDE_UNKNOWN_FILES" value="false" />
<option name="HIDE_MISSING_FILES" value="false" />
<option name="HIDE_UP_TO_DATE_FILES" value="false" />
</component>
<component name="CvsVcs">
<expanded_paths />
</component>
<component name="ProjectViewSettings">
<navigator currentView="SourcepathPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
<view id="ProjectPane">
<expanded_node type="directory" url="file://$PROJECT_DIR$" />
</view>
<view id="SourcepathPane">
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
</view>
<view id="ClasspathPane" />
</component>
<component name="RunManager">
<option name="SHOW_SETTINGS_BEFORE_RUNNING" value="false" />
<option name="COMPILE_BEFORE_RUNNING" value="true" />
<activeType name="Application" />
<configuration name="<template>" type="Application" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="<template>" type="Applet" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="D:/Idea\config\appletviewer.policy" />
<option name="VM_PARAMETERS" />
</configuration>
<configuration name="<template>" type="JUnit" default="true" selected="false">
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="<template>" type="Remote" default="true" selected="false">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5000" />
</configuration>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<WebServerIntegration name="" />
<Host>localhost</Host>
<Port>5050</Port>
<LaunchServer>false</LaunchServer>
</configuration>
<configuration name="QueryTool" type="Application" default="false" selected="false">
<option name="MAIN_CLASS_NAME" value="org.hsqldb.util.QueryTool" />
<option name="VM_PARAMETERS" value="-Ddatabase=demowin, -Dtest=false" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="Main" type="Application" default="false" selected="false">
<option name="MAIN_CLASS_NAME" value="org.dbunit.Main" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="Base64" type="Application" default="false" selected="false">
<option name="MAIN_CLASS_NAME" value="Base64" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="AllTests" type="JUnit" default="false" selected="false">
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
<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>
<configuration name="AllTests" type="Application" default="false" selected="true">
<option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
</component>
<component name="BookmarkManager" />
<component name="Commander">
<leftPanel view="Project" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
<rightPanel view="Project" />
<splitter proportion="0.5" />
</component>
<component name="PropertiesComponent">
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="GoToClass.includeLibraries" value="true" />
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.sorted" value="false" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
</component>
<component name="SelectInManager">
<target name="Source" />
<target name="Classpath View" />
<target name="CVS View" />
<target name="Project" />
<target name="File Structure" />
<target name="Commander" />
<target name="EJB View" />
</component>
<component name="VssConfiguration">
<CheckoutOptions>
<option name="COMMENT" value="" />
<option name="DO_NOT_GET_LATEST_VERSION" value="false" />
<option name="REPLACE_WRITABLE" value="false" />
<option name="RECURSIVE" value="false" />
</CheckoutOptions>
<CheckinOptions>
<option name="COMMENT" value="" />
<option name="KEEP_CHECKED_OUT" value="false" />
<option name="RECURSIVE" value="false" />
</CheckinOptions>
<AddOptions>
<option name="COMMENT" value="" />
<option name="STORE_ONLY_LATEST_VERSION" value="false" />
<option name="CHECK_OUT_IMMEDIATELY" value="false" />
<option name="FILE_TYPE" value="0" />
</AddOptions>
<UndocheckoutOptions>
<option name="MAKE_WRITABLE" value="false" />
<option name="REPLACE_LOCAL_COPY" value="0" />
<option name="RECURSIVE" value="false" />
</UndocheckoutOptions>
<DiffOptions>
<option name="IGNORE_WHITE_SPACE" value="false" />
<option name="IGNORE_CASE" value="false" />
</DiffOptions>
<GetOptions>
<option name="REPLACE_WRITABLE" value="0" />
<option name="MAKE_WRITABLE" value="false" />
<option name="RECURSIVE" value="false" />
</GetOptions>
<option name="CLIENT_PATH" value="" />
<option name="SRCSAFEINI_PATH" value="" />
<option name="USER_NAME" value="" />
<option name="PWD" value="" />
<option name="SHOW_CHECKOUT_OPTIONS" value="true" />
<option name="SHOW_CHECKIN_OPTIONS" value="true" />
<option name="SHOW_ADD_OPTIONS" value="true" />
<option name="SHOW_UNDOCHECKOUT_OPTIONS" value="true" />
<option name="SHOW_DIFF_OPTIONS" value="true" />
<option name="SHOW_GET_OPTIONS" value="true" />
<option name="USE_EXTERNAL_DIFF" value="false" />
<option name="EXTERNAL_DIFF_PATH" value="" />
<option name="REUSE_LAST_COMMENT" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
</component>
<component name="HierarchyBrowserManager">
<option name="SHOW_PACKAGES" value="false" />
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="SORT_ALPHABETICALLY" value="false" />
</component>
<component name="WebViewSettings">
<webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
</component>
<component name="EjbViewSettings">
<EjbView showMembers="false" autoscrollToSource="false" />
</component>
<component name="LvcsConfiguration">
<option name="LOCAL_VCS_ENABLED" value="true" />
<option name="LOCAL_VCS_PURGING_PERIOD" value="259200000" />
<option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
<option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
<option name="ADD_LABEL_ON_FILE_PACKAGE_COMPILATION" value="true" />
<option name="ADD_LABEL_ON_PROJECT_MAKE" value="true" />
<option name="ADD_LABEL_ON_RUNNING" value="true" />
<option name="ADD_LABEL_ON_DEBUGGING" value="true" />
<option name="ADD_LABEL_ON_UNIT_TEST" value="true" />
<option name="MARK_EXTERNAL_CHANGES_AS_UP_TO_DATE" value="true" />
</component>
<component name="InspectionManager">
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
<option name="SPLITTER_PROPORTION" value="0.5" />
<inspection_tool class="Unused declaration" enabled="false">
<option name="ADD_MAINS_TO_ENTRIES" value="true" />
<option name="ADD_JUNIT_TO_ENTRIES" value="true" />
<option name="ADD_EJB_TO_ENTRIES" value="true" />
<option name="ADD_APPLET_TO_ENTRIES" value="true" />
<option name="ADD_SERVLET_TO_ENTRIES" value="true" />
<option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
</inspection_tool>
<inspection_tool class="Declaration access can be weaker" enabled="false">
<option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
<option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
<option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
</inspection_tool>
<inspection_tool class="Declaration can have static modifier" enabled="false" />
<inspection_tool class="Declaration can have final modifier" enabled="false">
<option name="REPORT_CLASSES" value="true" />
<option name="REPORT_METHODS" value="true" />
<option name="REPORT_FIELDS" value="true" />
</inspection_tool>
<inspection_tool class="Unused method parameters" enabled="false" />
<inspection_tool class="Actual method parameter is the same constant" enabled="false" />
<inspection_tool class="Unused method return value" enabled="false" />
<inspection_tool class="Method returns the same value" enabled="false" />
<inspection_tool class="Empty method" enabled="false" />
<inspection_tool class="Redundant throws clause" enabled="false" />
<inspection_tool class="Constant conditions & exceptions" enabled="false" />
<inspection_tool class="Unused assignment" enabled="false" />
<inspection_tool class="Redundant type cast" enabled="false" />
<inspection_tool class="Local variable or parameter can be final" enabled="false">
<option name="REPORT_VARIABLES" value="true" />
<option name="REPORT_PARAMETERS" value="true" />
</inspection_tool>
<inspection_tool class="Declaration has javadoc problems" enabled="false">
<option name="TOP_LEVEL_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="public" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="INNER_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="protected" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="METHOD_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="protected" />
<option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
</value>
</option>
<option name="FIELD_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="protected" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
</inspection_tool>
<inspection_tool class="Deprecated API usage" enabled="false" />
<inspection_tool class="equals() and hashCode() not paired" enabled="false" />
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
<are-packages-shown value="false" />
<flatten-packages value="false" />
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<flatten-packages value="false" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="" />
</component>
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
<option name="PORT" value="49201" />
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="PROJECT" value="" />
<option name="VIEW" value="" />
<option name="ALTERNATIVE_WORKING_PATH" value="" />
</component>
</project>
Index: dbunit.ipr
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** dbunit.ipr 7 Aug 2002 01:32:11 -0000 1.50
--- dbunit.ipr 13 Feb 2003 04:32:41 -0000 1.51
***************
*** 1,29 ****
! <?xml version="1.0"?>
!
! <project version="2">
! <component class="com.intellij.ant.AntConfiguration">
! <buildFile url="file://$PROJECT_DIR$/build.xml">
! <runInBackground value="true" />
! <useEmacsModeOutput value="true" />
! <useCustomJdk value="false" />
! <useJavaw value="true" />
! <includeProjectClasspath value="false" />
! <maximumHeapSize value="128" />
! </buildFile>
! </component>
! <component class="com.intellij.ant.AntManager">
! <option name="OPEN_IN_TEXT_VIEW" value="false" />
! <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! </component>
! <component class="com.intellij.codeInsight.CodeInsightManager">
! <disable_hints />
</component>
! <component class="com.intellij.compiler.Compiler">
<option name="DEFAULT_COMPILER" value="Javac" />
! <option name="COMPILE_IN_BACKGROUND" value="true" />
! <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! <option name="HIDE_WARNINGS" value="true" />
</component>
! <component class="com.intellij.compiler.JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
--- 1,57 ----
! <?xml version="1.0" encoding="UTF-8"?>
! <project version="3" relativePaths="false">
! <component name="ProjectRootManager" version="2">
! <jdk name="java version "1.3.1_03"" />
! <projectPath>
! <root type="composite">
! <root type="simple" url="file://$PROJECT_DIR$" />
! </root>
! </projectPath>
! <sourcePath>
! <root type="composite">
! <root type="jdk" rootType="sourcePath" name="java version "1.3.1_03"" />
! <root type="simple" url="file://$PROJECT_DIR$/src/java" />
! <root type="simple" url="file://$PROJECT_DIR$/src/test" />
! </root>
! </sourcePath>
! <classPath>
! <root type="composite">
! <root type="jdk" rootType="classPath" name="java version "1.3.1_03"" />
! <root type="output" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/dtdparser.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/exml.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/hsqldb.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/j2ee.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/mockobjects.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/oracle-jdbc.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/mm.mysql-2.0.11-bin.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/ant.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/crimson.jar!/" />
! <root type="simple" url="jar://$PROJECT_DIR$/lib/jaxp.jar!/" />
! </root>
! </classPath>
! <excludePath>
! <root type="composite">
! <root type="jdk" rootType="excludePath" name="java version "1.3.1_03"" />
! <root type="excludedOutput" />
! </root>
! </excludePath>
! <javadocPath>
! <root type="composite">
! <root type="jdk" rootType="javadocPath" name="java version "1.3.1_03"" />
! </root>
! </javadocPath>
! <assert_keyword enabled="no" />
! <exclude_output enabled="yes" />
</component>
! <component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
! <option name="SYNCHRONIZE_OUTPUT_DIRECTORY" value="false" />
! <option name="DEFAULT_OUTPUT_PATH" value="$PROJECT_DIR$/build/classes" />
! <option name="OUTPUT_MODE" value="single" />
! <resourceExtensions />
</component>
! <component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
***************
*** 32,36 ****
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
! <component class="com.intellij.compiler.JikesSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="DEPRECATION" value="true" />
--- 60,65 ----
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
! <component name="JikesSettings">
! <option name="JIKES_PATH" value="" />
<option name="DEBUGGING_INFO" value="true" />
<option name="DEPRECATION" value="true" />
***************
*** 38,393 ****
<option name="GENERATE_MAKE_FILE_DEPENDENCIES" value="false" />
<option name="DO_FULL_DEPENDENCE_CHECK" value="false" />
- <option name="IS_INCREMENTAL_MODE" value="false" />
<option name="IS_EMACS_ERRORS_MODE" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
! <component class="com.intellij.cvsSupport.CvsConfiguration">
! <cvs_root>
! <option name="METHOD" value="ext" />
! <option name="USER_NAME" value="mlaflamm" />
! <option name="SERVER_NAME" value="cvs.dbunit.sourceforge.net" />
! <option name="REPOSITORY_PATH" value="/cvsroot/dbunit" />
! </cvs_root>
! <root_file url="file://K:\java\projects\dbunit" />
! <Checkout>
! <option name="DATE_TAG" value="" />
! <option name="REVISION_TAG" value="" />
! <option name="PRUNE_EMPTY_DIRS" value="true" />
! <option name="RESET_STICKY_TAGS" value="false" />
! <option name="NON_RECURSIVE" value="false" />
! <option name="CREATE_WORKING_DIR" value="" />
! <option name="ADDITIONAL_OPTIONS" value="" />
! </Checkout>
! <Update>
! <option name="DATE_TAG" value="" />
! <option name="REVISION_TAG" value="" />
! <option name="PRUNE_EMPTY_DIRS" value="true" />
! <option name="RESET_STICKY_TAGS" value="false" />
! <option name="NON_RECURSIVE" value="false" />
! <option name="CREATE_MISSING_DIRECTORIES" value="true" />
! <option name="DONT_CHANGE_FILES" value="false" />
! <option name="QUIET_MODE" value="false" />
! <option name="ADDITIONAL_OPTIONS" value="" />
! </Update>
! <Commit>
! <option name="NON_RECURSIVE" value="false" />
! <option name="REVISION_TAG" />
! <option name="LOG_MESSAGE" />
! <option name="ADDITIONAL_OPTIONS" />
! </Commit>
! <Diff>
! <option name="REVISION_TAG" value="HEAD" />
! <option name="DATE_TAG" value="" />
! <option name="IGNORE_WHITESPACE" value="false" />
! </Diff>
! <Add>
! <option name="ADD_AS_BINARY" value="false" />
! <option name="LOG_MESSAGE" value="" />
! </Add>
! <Status>
! <option name="NON_RECURSIVE" value="false" />
! <option name="INCLUDE_TAGS" value="false" />
! </Status>
! <Edit>
! <option name="NON_RECURSIVE" value="false" />
! <option name="FORCE_RECURSIVE" value="false" />
! <option name="EDIT" value="false" />
! <option name="UNEDIT" value="false" />
! <option name="COMMIT" value="false" />
! <option name="ALL" value="true" />
! <option name="NONE" value="false" />
! </Edit>
! <Remove>
! <option name="NON_RECURSIVE" value="false" />
! <option name="FORCE_RECURSIVE" value="false" />
! <option name="DELETE_FILE" value="false" />
! </Remove>
! <Log>
! <option name="DEFAULT_BRANCH" value="false" />
! <option name="NON_RECURSIVE" value="false" />
! <option name="QUIET_MODE" value="true" />
! <option name="ADDITIONAL_OPTIONS" value="" />
! </Log>
! <Editors>
! <option name="NON_RECURSIVE" value="false" />
! <option name="FORCE_RECURSIVE" value="false" />
! </Editors>
! <option name="CLIENT_PATH" value="D:/Program Files/WinCvs 1.3/cvs.exe" />
! <option name="EXTERNAL_DIFF_PATH" value="" />
! <option name="CVS_ENABLED" value="false" />
! <option name="USE_EXTERNAL_DIFF" value="false" />
! <option name="WORKING_FILES_READONLY" value="false" />
! <option name="COMPRESSION_LEVEL" value="0" />
! <option name="ADDITIONAL_OPTIONS" value="" />
! <option name="REUSE_LAST_LOG_MESSAGE" value="false" />
! <option name="PUT_FOCUS_INTO_LOG_MESSAGE" value="false" />
! <option name="SHOW_PROJECT_ROOTS" value="false" />
! <option name="SHOW_UPDATE_OPTIONS" value="true" />
! <option name="SHOW_COMMIT_OPTIONS" value="true" />
! <option name="SHOW_DIFF_OPTIONS" value="true" />
! <option name="SHOW_ADD_OPTIONS" value="true" />
! <option name="SHOW_STATUS_OPTIONS" value="true" />
! <option name="SHOW_EDIT_OPTIONS" value="true" />
! <option name="SHOW_UNEDIT_OPTIONS" value="true" />
! <option name="SHOW_REMOVE_OPTIONS" value="true" />
! <option name="SHOW_LOG_OPTIONS" value="true" />
! <option name="SHOW_EDITORS_OPTIONS" value="true" />
! <option name="HIDE_UNKNOWN_FILES" value="false" />
! <option name="HIDE_MISSING_FILES" value="false" />
! <option name="HIDE_UP_TO_DATE_FILES" value="false" />
! </component>
! <component class="com.intellij.cvsSupport.CvsManager">
! <expanded_paths />
! </component>
! <component class="com.intellij.debugger.Debugger">
! <line_breakpoints>
! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" line="162">
! <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="true" />
! <option name="CONDITION" value="tableName.equals("ESCAPED.TABLE")" />
! <option name="LOG_ENABLED" value="false" />
! <option name="LOG_EXPRESSION_ENABLED" value="false" />
! <option name="LOG_MESSAGE" value="" />
! <option name="CLASS_FILTERS_ENABLED" value="false" />
! <option name="INVERSE_CLASS_FILLTERS" value="false" />
! </breakpoint>
! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="201">
! <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" />
! </breakpoint>
! </line_breakpoints>
! <exception_breakpoints>
! <breakpoint_any>
! <option name="ENABLED" value="false" />
! <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="NOTIFY_CAUGHT" value="false" />
! <option name="NOTIFY_UNCAUGHT" value="true" />
! </breakpoint_any>
! </exception_breakpoints>
! <field_breakpoints />
! <method_breakpoints />
! </component>
! <component class="com.intellij.debugger.settings.DebuggerSettings">
! <option name="TRACING_FILTERS_ENABLED" value="true" />
! <option name="VALUE_LOOKUP_DELAY" value="700" />
! <option name="DEBUGGER_TRANSPORT" value="0" />
! <option name="FORCE_CLASSIC_VM" value="false" />
! <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
! <option name="SKIP_SYNTHETIC_METHODS" value="true" />
! <option name="SKIP_CONSTRUCTORS" value="false" />
! <default_breakpoint_settings>
! <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="NOTIFY_CAUGHT" value="true" />
! <option name="NOTIFY_UNCAUGHT" value="true" />
! <option name="WATCH_MODIFICATION" value="true" />
! <option name="WATCH_ACCESS" value="true" />
! <option name="WATCH_ENTRY" value="true" />
! <option name="WATCH_EXIT" value="true" />
! </default_breakpoint_settings>
! <filter>
! <option name="PATTERN" value="com.sun.*" />
! <option name="ENABLED" value="true" />
! </filter>
! <filter>
! <option name="PATTERN" value="java.*" />
! <option name="ENABLED" value="false" />
! </filter>
! <filter>
! <option name="PATTERN" value="javax.*" />
! <option name="ENABLED" value="true" />
! </filter>
! <filter>
! <option name="PATTERN" value="org.omg.*" />
! <option name="ENABLED" value="true" />
! </filter>
! <filter>
! <option name="PATTERN" value="sun.*" />
! <option name="ENABLED" value="true" />
! </filter>
! </component>
! <component class="com.intellij.debugger.ui.DebuggerUI" />
! <component class="com.intellij.execution.RunManager">
! <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="false" />
! <option name="COMPILE_BEFORE_RUNNING" value="true" />
! <activeType name="JUnit" />
! <configuration name="<template>" type="Application" default="true" selected="false">
! <option name="MAIN_CLASS_NAME" />
! <option name="VM_PARAMETERS" />
! <option name="PROGRAM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! </configuration>
! <configuration name="<template>" type="Applet" default="true" selected="false">
! <option name="MAIN_CLASS_NAME" />
! <option name="HTML_FILE_NAME" />
! <option name="HTML_USED" value="false" />
! <option name="WIDTH" value="400" />
! <option name="HEIGHT" value="300" />
! <option name="POLICY_FILE" value="D:/Idea\config\appletviewer.policy" />
! <option name="VM_PARAMETERS" />
! </configuration>
! <configuration name="<template>" type="JUnit" default="true" selected="false">
! <option name="MAIN_CLASS_NAME" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="<template>" type="Remote" default="true" selected="false">
! <option name="USE_SOCKET_TRANSPORT" value="true" />
! <option name="SHMEM_ADDRESS" value="javadebug" />
! <option name="HOST" value="localhost" />
! <option name="PORT" value="5000" />
! </configuration>
! <configuration name="QueryTool" type="Application" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.hsqldb.util.QueryTool" />
! <option name="VM_PARAMETERS" value="-Ddatabase=demowin, -Dtest=false" />
! <option name="PROGRAM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! </configuration>
! <configuration name="Main" type="Application" default="false" selected="true">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.Main" />
! <option name="VM_PARAMETERS" />
! <option name="PROGRAM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! </configuration>
! <configuration name="Base64" type="Application" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="Base64" />
! <option name="VM_PARAMETERS" />
! <option name="PROGRAM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! </configuration>
! <configuration name="AllTests" type="JUnit" default="false" selected="true">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="DatabaseDataSetTest" type="JUnit" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseDataSetTest" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="DeleteOperationTest" type="JUnit" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.DeleteOperationTest" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="InsertOperationTest" type="JUnit" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.InsertOperationTest" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="UpdateOperationTest" type="JUnit" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.UpdateOperationTest" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="DatabaseTableMetaDataTest" type="JUnit" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseTableMetaDataTest" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! <configuration name="RefreshOperationTest" type="JUnit" default="false" selected="false">
! <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.RefreshOperationTest" />
! <option name="VM_PARAMETERS" />
! <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
! <option name="TEST_RUNNER" value="Text" />
! </configuration>
! </component>
! <component class="com.intellij.ide.SelectInManager">
! <target name="Classpath View" />
! <target name="Source" />
! <target name="CVS View" />
! <target name="Project" />
! <target name="File Structure" />
! <target name="Commander" />
! </component>
! <component class="com.intellij.ide.bookmarks.BookmarkManager" />
! <component class="com.intellij.ide.commander.Commander">
! <leftPanel view="Project" active="true" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
! <rightPanel view="Project" active="false" />
! <splitter proportion="0.5" />
! </component>
! <component class="com.intellij.ide.desktop.IdeDocumentManager">
! <recent_files>
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/statement/MockBatchStatement.java" column="22" line="89" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="13" line="48" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/IDatabaseConnection.java" column="26" line="71" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DataSetUtils.java" column="74" line="95" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" column="14" line="230" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" column="47" line="117" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java" column="35" line="46" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/Assertion.java" column="0" line="141" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/RefreshOperationTest.java" column="27" line="93" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="69" line="354" />
! <file_info url="file://$PROJECT_DIR$/src/sql/hypersonic.sql" column="30" line="47" />
! <file_info url="file://$PROJECT_DIR$/profile.properties" column="0" line="45" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/DatabaseProfile.java" column="0" line="39" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/HypersonicEnvironment.java" column="0" line="59" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/OracleEnvironment.java" column="20" line="37" />
! </recent_files>
! </component>
! <component class="com.intellij.ide.hierarchy.HierarchyBrowserManager">
! <option name="SHOW_PACKAGES" value="false" />
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! <option name="SORT_ALPHABETICALLY" value="false" />
! </component>
! <component class="com.intellij.ide.impl.ProjectWorkspace" />
! <component class="com.intellij.ide.navigator.impl.ProjectNavigatorSettings">
! <navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" />
! <navigator id="ProjectNavigator" flattenPackages="false" showMembers="false">
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$" />
! </navigator>
! <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true" />
! </component>
! <component class="com.intellij.ide.structureView.StructureViewFactory">
! <option name="SORT_MODE" value="0" />
! <option name="GROUP_OVERRIDINGS" value="true" />
! <option name="GROUP_IMPLEMENTINGS" value="true" />
! <option name="AUTOSCROLL_MODE" value="true" />
! <option name="SHOW_METHODS" value="true" />
! <option name="SHOW_FIELDS" value="true" />
! </component>
! <component class="com.intellij.ide.util.PropertiesComponent">
! <property name="GoToClass.includeLibraries" value="true" />
</component>
! <component class="com.intellij.javadoc.JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" value="K:/java/projects/dbunit-cvs/__dbunit/docs/api" />
<option name="OPTION_SCOPE" value="protected" />
--- 67,90 ----
<option name="GENERATE_MAKE_FILE_DEPENDENCIES" value="false" />
<option name="DO_FULL_DEPENDENCE_CHECK" value="false" />
<option name="IS_EMACS_ERRORS_MODE" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
! <component name="AntConfiguration">
! <buildFile url="file://$PROJECT_DIR$/build.xml">
! <runInBackground value="true" />
! <useEmacsModeOutput value="true" />
! <useCustomJdk value="false" />
! <treeView value="true" />
! <useJavaw value="true" />
! <verbose value="true" />
! <includeProjectClasspath value="false" />
! <includeParser value="true" />
! <maximumHeapSize value="128" />
! <viewClosedWhenNoErrors value="false" />
! </buildFile>
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! <option name="FILTER_TARGETS" value="false" />
</component>
! <component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" value="K:/java/projects/dbunit-cvs/__dbunit/docs/api" />
<option name="OPTION_SCOPE" value="protected" />
***************
*** 396,400 ****
<option name="OPTION_INDEX" value="false" />
<option name="OPTION_SEPARATE_INDEX" value="false" />
- <option name="OPTION_USE_1_1" value="false" />
<option name="OPTION_DOCUMENT_TAG_USE" value="false" />
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
--- 93,96 ----
***************
*** 406,512 ****
<option name="OPEN_IN_BROWSER" value="false" />
</component>
! <component class="com.intellij.projectRoots.ProjectRootContainer">
! <jdk name="java version "1.3.1_03"" />
! <root file="file://$PROJECT_DIR$/build/classes">
! <property name="type" value="outputPath" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/dtdparser.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/exml.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/hsqldb.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/junit.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/j2ee.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/mockobjects.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/oracle-jdbc.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/mm.mysql-2.0.11-bin.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/ant.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/crimson.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="jar://$PROJECT_DIR$/lib/jaxp.jar!/">
! <property name="type" value="classPathEntry" />
! </root>
! <root file="file://$PROJECT_DIR$">
! <property name="type" value="projectFiles" />
! </root>
! <root file="file://$PROJECT_DIR$/src/java">
! <property name="type" value="sourcePathEntry" />
! </root>
! <root file="file://$PROJECT_DIR$/src/test">
! <property name="type" value="sourcePathEntry" />
! </root>
</component>
! <component class="com.intellij.usageView.impl.UsageViewSettings">
! <option name="EXPORT_FILE_NAME" value="$PROJECT_DIR$/report.txt" />
! <option name="IS_EXPANDED" value="true" />
! <option name="IS_SHOW_PACKAGES" value="true" />
! <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
! <option name="IS_FILTER_DUPLICATED_LINE" value="false" />
</component>
! <component class="com.intellij.vssSupport.VssConfiguration">
! <CheckoutOptions>
! <option name="COMMENT" value="" />
! <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
! <option name="REPLACE_WRITABLE" value="false" />
! <option name="RECURSIVE" value="false" />
! </CheckoutOptions>
! <CheckinOptions>
! <option name="COMMENT" value="" />
! <option name="KEEP_CHECKED_OUT" value="false" />
! <option name="RECURSIVE" value="false" />
! </CheckinOptions>
! <AddOptions>
! <option name="COMMENT" value="" />
! <option name="STORE_ONLY_LATEST_VERSION" value="false" />
! <option name="CHECK_OUT_IMMEDIATELY" value="false" />
! <option name="FILE_TYPE" value="0" />
! </AddOptions>
! <UndocheckoutOptions>
! <option name="MAKE_WRITABLE" value="false" />
! <option name="REPLACE_LOCAL_COPY" value="0" />
! <option name="RECURSIVE" value="false" />
! </UndocheckoutOptions>
! <DiffOptions>
! <option name="IGNORE_WHITE_SPACE" value="false" />
! <option name="IGNORE_CASE" value="false" />
! </DiffOptions>
! <GetOptions>
! <option name="REPLACE_WRITABLE" value="0" />
! <option name="MAKE_WRITABLE" value="false" />
! <option name="RECURSIVE" value="false" />
! </GetOptions>
! <option name="ENABLED" value="false" />
! <option name="CLIENT_PATH" value="" />
! <option name="SRCSAFEINI_PATH" value="" />
! <option name="USER_NAME" value="" />
! <option name="PWD" value="" />
! <option name="SHOW_CHECKOUT_OPTIONS" value="true" />
! <option name="SHOW_CHECKIN_OPTIONS" value="true" />
! <option name="SHOW_ADD_OPTIONS" value="true" />
! <option name="SHOW_UNDOCHECKOUT_OPTIONS" value="true" />
! <option name="SHOW_DIFF_OPTIONS" value="true" />
! <option name="SHOW_GET_OPTIONS" value="true" />
! <option name="USE_EXTERNAL_DIFF" value="false" />
! <option name="EXTERNAL_DIFF_PATH" value="" />
! <option name="REUSE_LAST_COMMENT" value="false" />
! <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
</component>
</project>
--- 102,131 ----
<option name="OPEN_IN_BROWSER" value="false" />
</component>
! <component name="WebManager">
! <option enabled="false" />
</component>
! <component name="WebRootContainer" />
! <component name="EjbManager" enabled="false" />
! <component name="JUnitProjectSettings">
! <option name="TEST_RUNNER" value="Text" />
</component>
! <component name="EntryPointsManager">
! <entry_points />
</component>
+ <component name="EjbActionsConfiguration">
+ <option name="NEW_MESSAGE_BEAN_LAST_PACKAGE" value="" />
+ <option name="NEW_ENTITY_BEAN_LAST_PACKAGE" value="" />
+ <option name="NEW_SESSION_BEAN_LAST_PACKAGE" value="" />
+ </component>
+ <component name="CodeStyleManager">
+ <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
+ <option name="CODE_STYLE_SCHEME" value="" />
+ </component>
+ <component name="ExportToHTMLSettings">
+ <option name="PRINT_LINE_NUMBERS" value="false" />
+ <option name="OPEN_IN_BROWSER" value="false" />
+ <option name="OUTPUT_DIRECTORY" />
+ </component>
+ <component name="WebReferencesManager" />
</project>
|
|
From: <mla...@us...> - 2003-02-13 04:32:46
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit/src/test/org/dbunit
Modified Files:
AllTests.java
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
Index: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/AllTests.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AllTests.java 4 Jul 2002 21:33:43 -0000 1.9
--- AllTests.java 13 Feb 2003 04:32:42 -0000 1.10
***************
*** 32,36 ****
public class AllTests
{
! public static Test suite()
{
TestSuite suite = new TestSuite();
--- 32,36 ----
public class AllTests
{
! public static Test suite() throws Exception
{
TestSuite suite = new TestSuite();
|
|
From: <mla...@us...> - 2003-02-13 04:32:45
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit/src/test/org/dbunit/database
Modified Files:
DatabaseDataSetTest.java
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
Index: DatabaseDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DatabaseDataSetTest.java 13 Dec 2002 21:44:46 -0000 1.18
--- DatabaseDataSetTest.java 13 Feb 2003 04:32:42 -0000 1.19
***************
*** 274,277 ****
--- 274,287 ----
// Cannot test! Unsupported feature.
}
+
+ public void testGetCaseInsensitiveDuplicateTable() throws Exception
+ {
+ // Cannot test! Unsupported feature.
+ }
+
+ public void testGetCaseInsensitiveDuplicateTableMetaData() throws Exception
+ {
+ // Cannot test! Unsupported feature.
+ }
}
|
|
From: <mla...@us...> - 2003-02-13 04:32:45
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit/src/java/org/dbunit/database
Modified Files:
DatabaseDataSet.java
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
Index: DatabaseDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DatabaseDataSet.java 11 Dec 2002 15:54:32 -0000 1.17
--- DatabaseDataSet.java 13 Feb 2003 04:32:42 -0000 1.18
***************
*** 160,177 ****
public ITableMetaData getTableMetaData(String tableName) throws DataSetException
{
! ITableMetaData metaData = (ITableMetaData)getTableMap().get(tableName);
! if (metaData != null)
{
! return metaData;
! }
! if (!getTableMap().containsKey(tableName))
! {
! throw new NoSuchTableException(tableName);
}
! metaData = new DatabaseTableMetaData(tableName, _connection);
! getTableMap().put(tableName, metaData);
! return metaData;
}
--- 160,196 ----
public ITableMetaData getTableMetaData(String tableName) throws DataSetException
{
! for (Iterator it = getTableMap().entrySet().iterator(); it.hasNext();)
{
! Map.Entry entry = (Map.Entry)it.next();
! if (tableName.equalsIgnoreCase((String)entry.getKey()))
! {
! ITableMetaData metaData = (ITableMetaData)entry.getValue();
! if (metaData != null)
! {
! return metaData;
! }
! metaData = new DatabaseTableMetaData((String)entry.getKey(), _connection);
! getTableMap().put(metaData.getTableName(), metaData);
! return metaData;
! }
}
! throw new NoSuchTableException(tableName);
!
! // ITableMetaData metaData = (ITableMetaData)getTableMap().get(tableName);
! // if (metaData != null)
! // {
! // return metaData;
! // }
! //
! // if (!getTableMap().containsKey(tableName))
! // {
! // throw new NoSuchTableException(tableName);
! // }
! //
! // metaData = new DatabaseTableMetaData(tableName, _connection);
! // getTableMap().put(tableName, metaData);
! // return metaData;
}
|
|
From: <mla...@us...> - 2003-02-13 04:32:45
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit/src/java/org/dbunit/dataset/xml
Modified Files:
FlatDtdDataSet.java
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
Index: FlatDtdDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FlatDtdDataSet.java 3 Aug 2002 02:26:40 -0000 1.3
--- FlatDtdDataSet.java 13 Feb 2003 04:32:42 -0000 1.4
***************
*** 24,28 ****
* @version $Revision$
*/
! public class FlatDtdDataSet implements IDataSet
{
private static final List EMPTY_LIST = Arrays.asList(new Object[0]);
--- 24,28 ----
* @version $Revision$
*/
! public class FlatDtdDataSet extends AbstractDataSet
{
private static final List EMPTY_LIST = Arrays.asList(new Object[0]);
***************
*** 138,162 ****
}
! public ITableMetaData getTableMetaData(String tableName)
! throws DataSetException
! {
! return getTable(tableName).getTableMetaData();
! }
!
! public ITable getTable(String tableName) throws DataSetException
! {
! if (_tableNames.indexOf(tableName) != _tableNames.lastIndexOf(tableName))
! {
! throw new AmbiguousTableNameException(tableName);
! }
!
! ITable table = (ITable)_tableMap.get(tableName);
! if (table == null)
! {
! throw new NoSuchTableException(tableName);
! }
!
! return table;
! }
public ITable[] getTables() throws DataSetException
--- 138,162 ----
}
! // public ITableMetaData getTableMetaData(String tableName)
! // throws DataSetException
! // {
! // return getTable(tableName).getTableMetaData();
! // }
! //
! // public ITable getTable(String tableName) throws DataSetException
! // {
! // if (_tableNames.indexOf(tableName) != _tableNames.lastIndexOf(tableName))
! // {
! // throw new AmbiguousTableNameException(tableName);
! // }
! //
! // ITable table = (ITable)_tableMap.get(tableName);
! // if (table == null)
! // {
! // throw new NoSuchTableException(tableName);
! // }
! //
! // return table;
! // }
public ITable[] getTables() throws DataSetException
|
|
From: <mla...@us...> - 2003-02-13 04:32:45
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv338/dbunit/src/java/org/dbunit/dataset
Modified Files:
AbstractDataSet.java FilteredDataSet.java IDataSet.java
Log Message:
Modified all dataset implementations to make them case insensitive. This is the first step to make DbUnit case insensitive and more work is still required.
Index: AbstractDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/AbstractDataSet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractDataSet.java 3 Aug 2002 02:26:40 -0000 1.8
--- AbstractDataSet.java 13 Feb 2003 04:32:42 -0000 1.9
***************
*** 29,33 ****
/**
* This abstract class provides the basic implementation of the IDataSet
! * interface. Subclass are only required to implement the {@link getTables}
* method.
*
--- 29,33 ----
/**
* This abstract class provides the basic implementation of the IDataSet
! * interface. Subclass are only required to implement the {@link #getTables}
* method.
*
***************
*** 74,78 ****
{
ITable table = tables[i];
! if (tableName.equals(table.getTableMetaData().getTableName()))
{
if (found != null)
--- 74,78 ----
{
ITable table = tables[i];
! if (tableName.equalsIgnoreCase(table.getTableMetaData().getTableName()))
{
if (found != null)
Index: FilteredDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/FilteredDataSet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FilteredDataSet.java 3 Aug 2002 02:26:40 -0000 1.10
--- FilteredDataSet.java 13 Feb 2003 04:32:42 -0000 1.11
***************
*** 54,58 ****
for (int i = 0; i < _tableNames.length; i++)
{
! if (tableName.equals(_tableNames[i]))
{
if (found)
--- 54,58 ----
for (int i = 0; i < _tableNames.length; i++)
{
! if (tableName.equalsIgnoreCase(_tableNames[i]))
{
if (found)
Index: IDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/IDataSet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IDataSet.java 9 Dec 2002 18:00:20 -0000 1.9
--- IDataSet.java 13 Feb 2003 04:32:42 -0000 1.10
***************
*** 42,46 ****
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
--- 42,46 ----
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
***************
*** 54,58 ****
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
--- 54,58 ----
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
|
|
From: <de...@us...> - 2003-01-29 13:05:02
|
Update of /cvsroot/dbunit/dbunit/src/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv30474
Modified Files:
mssql.sql
Log Message:
Added new table for Identity not PK test. Also, somehow missed all the PK constraints when I first committed the code!
Index: mssql.sql
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/sql/mssql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mssql.sql 13 Dec 2002 21:41:33 -0000 1.1
--- mssql.sql 29 Jan 2003 13:04:57 -0000 1.2
***************
*** 27,30 ****
--- 27,34 ----
GO
+ if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[TEST_IDENTITY_NOT_PK]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ drop table [dbo].[TEST_IDENTITY_NOT_PK]
+ GO
+
CREATE TABLE [dbo].[EMPTY_MULTITYPE_TABLE] (
[VARCHAR_COL] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
***************
*** 50,53 ****
--- 54,65 ----
GO
+ ALTER TABLE dbo.IDENTITY_TABLE ADD CONSTRAINT
+ PK_IDENTITY_TABLE PRIMARY KEY CLUSTERED
+ (
+ IDENTITY_TABLE_ID
+ ) ON [PRIMARY]
+
+ GO
+
CREATE TABLE [dbo].[ONLY_PK_TABLE] (
[PK0] [numeric](38, 0) NOT NULL
***************
*** 55,58 ****
--- 67,78 ----
GO
+ ALTER TABLE dbo.ONLY_PK_TABLE ADD CONSTRAINT
+ PK_ONLY_PK_TABLE PRIMARY KEY CLUSTERED
+ (
+ PK0
+ ) ON [PRIMARY]
+
+ GO
+
CREATE TABLE [dbo].[PK_TABLE] (
[PK0] [numeric](38, 0) NOT NULL ,
***************
*** 63,66 ****
--- 83,95 ----
) ON [PRIMARY]
GO
+ ALTER TABLE dbo.PK_TABLE ADD CONSTRAINT
+ PK_PK_TABLE PRIMARY KEY CLUSTERED
+ (
+ PK0,
+ PK1,
+ PK2
+ ) ON [PRIMARY]
+
+ GO
CREATE TABLE [dbo].[SECOND_TABLE] (
***************
*** 79,81 ****
) ON [PRIMARY]
GO
!
--- 108,115 ----
) ON [PRIMARY]
GO
! CREATE TABLE dbo.TEST_IDENTITY_NOT_PK
! (
! COL01 int NOT NULL IDENTITY (1, 1),
! COL02 varchar(64) NULL
! ) ON [PRIMARY]
! GO
|
|
From: <de...@us...> - 2003-01-29 13:03:42
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv29919
Modified Files:
AbstractDataSetTest.java
Log Message:
Added new table to be ignored for SQL Server identity tests. I think this needs to be refactored into data sored in the environment class.
Index: AbstractDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AbstractDataSetTest.java 13 Dec 2002 21:45:34 -0000 1.15
--- AbstractDataSetTest.java 29 Jan 2003 13:03:36 -0000 1.16
***************
*** 81,85 ****
/**
* This method exclude BLOB_TABLE and CLOB_TABLE from the specified dataset
! * because BLOB and CLOB are not supported by all database vendor.
* @todo Should be refactored into thee various DatabaseEnvironments!
*/
--- 81,86 ----
/**
* This method exclude BLOB_TABLE and CLOB_TABLE from the specified dataset
! * because BLOB and CLOB are not supported by all database vendor. It also excludes
! * tables with Identity columns (MSSQL) becasuse they are specific to MSSQL.
* @todo Should be refactored into thee various DatabaseEnvironments!
*/
***************
*** 102,111 ****
nameList.remove("dtproperties");
/*
! This table is created specifically for testing identity columns on MSSQL server.
! It should be ignored on other platforms.
*/
nameList.remove("DBUNIT.IDENTITY_TABLE");
nameList.remove("IDENTITY_TABLE");
! // nameList.remove("ESCAPED TABLE");
names = (String[])nameList.toArray(new String[0]);
--- 103,114 ----
nameList.remove("dtproperties");
/*
! These tables are created specifically for testing identity columns on MSSQL server.
! They should be ignored on other platforms.
*/
nameList.remove("DBUNIT.IDENTITY_TABLE");
nameList.remove("IDENTITY_TABLE");
! nameList.remove("DBUNIT.TEST_IDENTITY_NOT_PK");
! nameList.remove("TEST_IDENTITY_NOT_PK");
!
names = (String[])nameList.toArray(new String[0]);
|
|
From: <de...@us...> - 2003-01-29 13:02:46
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv29571
Modified Files:
InsertIdentityOperationTest.java
Log Message:
Test added to validate the patch from Gaetano Di Gregorio.
Index: InsertIdentityOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/mssqlserver/InsertIdentityOperationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InsertIdentityOperationTest.java 16 Dec 2002 19:21:19 -0000 1.2
--- InsertIdentityOperationTest.java 29 Jan 2003 13:02:43 -0000 1.3
***************
*** 128,131 ****
--- 128,172 ----
}
+
+ /* test case was added to validate the bug that tables with Identity columns that are not
+ one of the primary keys are able to figure out if an IDENTITY_INSERT is needed.
+ Thanks to Gaetano Di Gregorio for finding the bug.
+ */
+ public void testIdentityInsertNoPK() throws Exception
+ {
+ if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
+ InputStream in = new FileInputStream("src/xml/insertIdentityOperationTestNoPK.xml");
+ IDataSet xmlDataSet = new FlatXmlDataSet(in);
+
+ ITable[] tablesBefore = DataSetUtils.getTables(_connection.createDataSet());
+ InsertIdentityOperation.CLEAN_INSERT.execute(_connection, xmlDataSet);
+ ITable[] tablesAfter = DataSetUtils.getTables(_connection.createDataSet());
+
+ assertEquals("table count", tablesBefore.length, tablesAfter.length);
+ for (int i = 0; i < tablesBefore.length; i++)
+ {
+ ITable table = tablesBefore[i];
+ String name = table.getTableMetaData().getTableName();
+
+
+ if (name.equals("TEST_IDENTITY_NOT_PK"))
+ {
+
+ assertTrue("Should have either 0 or 6", table.getRowCount()==0 | table.getRowCount()==6);
+ }
+ }
+
+ for (int i = 0; i < tablesAfter.length; i++)
+ {
+ ITable table = tablesAfter[i];
+ String name = table.getTableMetaData().getTableName();
+ if (name.equals("TEST_IDENTITY_NOT_PK"))
+ {
+ Assertion.assertEquals(xmlDataSet.getTable(name), table);
+ }
+ }
+ }
+
+ }
}
|
|
From: <de...@us...> - 2003-01-29 13:02:13
|
Update of /cvsroot/dbunit/dbunit/src/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv29372
Added Files:
insertIdentityOperationTestNoPK.xml
Log Message:
Test data for JUNIT test to validate the patch from Gaetano Di Gregorio.
--- NEW FILE: insertIdentityOperationTestNoPK.xml ---
<!-- Created by Eric Pugh (ep...@up...) -->
<dataset>
<TEST_IDENTITY_NOT_PK COL01='1' COL02='row 0 col 1' />
<TEST_IDENTITY_NOT_PK COL01='2' COL02='row 1 col 1' />
<TEST_IDENTITY_NOT_PK COL01='3' COL02='row 2 col 1' />
<TEST_IDENTITY_NOT_PK COL01='4' COL02='row 3 col 1' />
<TEST_IDENTITY_NOT_PK COL01='5' COL02='row 4 col 1' />
<TEST_IDENTITY_NOT_PK COL01='6' COL02='row 5 col 1' />
</dataset>
|
|
From: <de...@us...> - 2003-01-29 13:01:19
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv28975
Modified Files:
InsertIdentityOperation.java
Log Message:
Patch from Gaetano Di Gregorio. Thanks for finding this bug!
Index: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InsertIdentityOperation.java 13 Dec 2002 21:42:34 -0000 1.11
--- InsertIdentityOperation.java 29 Jan 2003 13:01:12 -0000 1.12
***************
*** 73,77 ****
throws DataSetException
{
! Column[] primaryKeys = metaData.getPrimaryKeys();
for (int i = 0; i < primaryKeys.length; i++)
--- 73,77 ----
throws DataSetException
{
! Column[] primaryKeys = metaData.getColumns(); // check all columns to see if they are an identity column
for (int i = 0; i < primaryKeys.length; i++)
|
