Menu
▾
▴
[dbunit-commit] dbunit/src/test/org/dbunit/dataset CaseInsensitiveDataSetTest.java,1.3,1.4 CaseInsensitiveTableTest.java,1.2,1.3 CompositeDataSetTest.java,1.6,1.7 DefaultDataSetTest.java,1.6,1.7 FilteredDataSetTest.java,1.8,1.9
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);
|
