[dbunit-commit] dbunit/src/test/org/dbunit/dataset/xml FlatDtdDataSetTest.java,1.8,1.9 FlatXmlDataSetTest.java,1.13,1.14 XmlDataSetTest.java,1.8,1.9

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

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

Modified Files:
	FlatDtdDataSetTest.java FlatXmlDataSetTest.java 
	XmlDataSetTest.java 
Log Message:
Merged from "branch-iterator":

* Deprecated the IDataSet.getTables() method. This method have been 
replaced by the new iterator() and reverseIterator() methods. Only the code 
that test the getTables() method continue to use it.

* Fixed some issues with case sensitive database like MySQL.

* DatabaseDataSet improvements: faster access to metadata cache and 
keep original database table ordering.


Index: FlatDtdDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatDtdDataSetTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FlatDtdDataSetTest.java	13 Mar 2003 02:24:12 -0000	1.8
--- FlatDtdDataSetTest.java	9 Apr 2003 22:52:16 -0000	1.9
***************
*** 92,96 ****
          IDatabaseConnection connection =
                  DatabaseEnvironment.getInstance().getConnection();
!         IDataSet dataSet = removeExtraTestTables(connection.createDataSet());
  
          File tempFile = File.createTempFile("flatXmlDocType", ".dtd");
--- 92,96 ----
          IDatabaseConnection connection =
                  DatabaseEnvironment.getInstance().getConnection();
!         IDataSet dataSet = connection.createDataSet();
  
          File tempFile = File.createTempFile("flatXmlDocType", ".dtd");

Index: FlatXmlDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/FlatXmlDataSetTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FlatXmlDataSetTest.java	11 Mar 2003 13:00:07 -0000	1.13
--- FlatXmlDataSetTest.java	9 Apr 2003 22:52:17 -0000	1.14
***************
*** 28,31 ****
--- 28,32 ----
  import org.dbunit.dataset.IDataSet;
  import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.DataSetUtils;
  
  import java.io.File;
***************
*** 107,112 ****
  
                  // verify each table
!                 ITable[] expected = expectedDataSet.getTables();
!                 ITable[] actual = actualDataSet.getTables();
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)
--- 108,113 ----
  
                  // verify each table
!                 ITable[] expected = DataSetUtils.getTables(expectedDataSet);
!                 ITable[] actual = DataSetUtils.getTables(actualDataSet);
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)
***************
*** 160,165 ****
  
                  // verify each table
!                 ITable[] expected = expectedDataSet.getTables();
!                 ITable[] actual = actualDataSet.getTables();
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)
--- 161,166 ----
  
                  // verify each table
!                 ITable[] expected = DataSetUtils.getTables(expectedDataSet);
!                 ITable[] actual = DataSetUtils.getTables(actualDataSet);
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)

Index: XmlDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/xml/XmlDataSetTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XmlDataSetTest.java	14 Feb 2003 03:22:01 -0000	1.8
--- XmlDataSetTest.java	9 Apr 2003 22:52:17 -0000	1.9
***************
*** 78,83 ****
  
                  // verify each table
!                 ITable[] expected = expectedDataSet.getTables();
!                 ITable[] actual = actualDataSet.getTables();
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)
--- 78,83 ----
  
                  // verify each table
!                 ITable[] expected = DataSetUtils.getTables(expectedDataSet);
!                 ITable[] actual = DataSetUtils.getTables(actualDataSet);
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)
***************
*** 125,130 ****
  
                  // verify each table
!                 ITable[] expected = expectedDataSet.getTables();
!                 ITable[] actual = actualDataSet.getTables();
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)
--- 125,130 ----
  
                  // verify each table
!                 ITable[] expected = DataSetUtils.getTables(expectedDataSet);
!                 ITable[] actual = DataSetUtils.getTables(actualDataSet);
                  assertEquals("table count", expected.length, actual.length);
                  for (int i = 0; i < expected.length; i++)