[dbunit-commit] dbunit/src/test/org/dbunit/operation AbstractBatchOperationTest.java,1.3,1.4 CompositeOperationTest.java,1.7,1.8 DeleteOperationTest.java,1.12,1.13 InsertOperationTest.java,1.16,1.17 RefreshOperationTest.java,1.9,1.10 TransactionOperationTest.java,1.6,1.7 UpdateOperationTest.java,1.14,1.15

[<mla...@us...>]

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);