[dbunit-commit] dbunit/src/java/org/dbunit/dataset/xml FlatDtdDataSet.java,1.5,1.6 FlatXmlDataSet.java,1.18,1.19 XmlDataSet.java,1.13,1.14

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

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv18146/dbunit/src/java/org/dbunit/dataset/xml

Modified Files:
	FlatDtdDataSet.java FlatXmlDataSet.java XmlDataSet.java 
Log Message:
1. Added write() overload with encoding argument.
2. Added tests for ant <classpath> element.

Index: FlatDtdDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FlatDtdDataSet.java	14 Feb 2003 03:21:59 -0000	1.5
--- FlatDtdDataSet.java	1 Mar 2003 06:51:17 -0000	1.6
***************
*** 129,132 ****
--- 129,134 ----
              printOut.println();
          }
+ 
+         printOut.flush();
      }
  

Index: FlatXmlDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FlatXmlDataSet.java	14 Feb 2003 03:21:59 -0000	1.18
--- FlatXmlDataSet.java	1 Mar 2003 06:51:17 -0000	1.19
***************
*** 42,45 ****
--- 42,46 ----
  {
      private static final String SYSTEM = "SYSTEM '";
+     private static final String DEFAULT_ENCODING = "UTF-8";
  
      private final ITable[] _tables;
***************
*** 240,247 ****
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet);
  
          // write xml document
          document.write(out);
      }
  
--- 241,249 ----
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet, DEFAULT_ENCODING);
  
          // write xml document
          document.write(out);
+         out.flush();
      }
  
***************
*** 252,259 ****
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet);
  
          // write xml document
          document.write(out);
      }
  
--- 254,275 ----
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet, DEFAULT_ENCODING);
! 
!         // write xml document
!         document.write(out);
!         out.flush();
!     }
! 
!     /**
!      * Write the specified dataset to the specified writer as xml.
!      */
!     public static void write(IDataSet dataSet, Writer out, String encoding)
!             throws IOException, DataSetException
!     {
!         Document document = buildDocument(dataSet, encoding);
  
          // write xml document
          document.write(out);
+         out.flush();
      }
  
***************
*** 268,276 ****
      }
  
!     private static Document buildDocument(IDataSet dataSet) throws DataSetException
      {
-         Document document = new Document();
          ITable[] tables = dataSet.getTables();
! //        String[] tableNames = dataSet.getTableNames();
  
          // dataset
--- 284,294 ----
      }
  
!     private static Document buildDocument(IDataSet dataSet, String encoding)
!             throws DataSetException
      {
          ITable[] tables = dataSet.getTables();
! 
!         Document document = new Document();
!         document.addChild(new XMLDecl("1.0", encoding));
  
          // dataset

Index: XmlDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlDataSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** XmlDataSet.java	14 Feb 2003 03:21:59 -0000	1.13
--- XmlDataSet.java	1 Mar 2003 06:51:17 -0000	1.14
***************
*** 42,45 ****
--- 42,46 ----
  public class XmlDataSet extends AbstractDataSet
  {
+     private static final String DEFAULT_ENCODING = "UTF-8";
      private final ITable[] _tables;
  
***************
*** 110,117 ****
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet);
  
          // write xml document
          document.write(out);
      }
  
--- 111,119 ----
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet, DEFAULT_ENCODING);
  
          // write xml document
          document.write(out);
+         out.flush();
      }
  
***************
*** 122,135 ****
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet);
  
          // write xml document
          document.write(out);
      }
  
!     private static Document buildDocument(IDataSet dataSet) throws DataSetException
      {
-         Document document = new Document();
          ITable[] tables = dataSet.getTables();
  
          // dataset
--- 124,154 ----
              throws IOException, DataSetException
      {
!         Document document = buildDocument(dataSet, DEFAULT_ENCODING);
  
          // write xml document
          document.write(out);
+         out.flush();
      }
  
!     /**
!      * Write the specified dataset to the specified writer as xml.
!      */
!     public static void write(IDataSet dataSet, Writer out, String encoding)
!             throws IOException, DataSetException
!     {
!         Document document = buildDocument(dataSet, encoding);
! 
!         // write xml document
!         document.write(out);
!         out.flush();
!     }
! 
!     private static Document buildDocument(IDataSet dataSet, String encoding)
!             throws DataSetException
      {
          ITable[] tables = dataSet.getTables();
+ 
+         Document document = new Document();
+         document.addChild(new XMLDecl("1.0", encoding));
  
          // dataset