|
From: <mla...@us...> - 2003-04-09 22:52:46
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/test/org/dbunit/database
Modified Files:
AllTests.java DatabaseDataSetTest.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: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/AllTests.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
Index: DatabaseDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DatabaseDataSetTest.java 13 Feb 2003 04:32:42 -0000 1.19
--- DatabaseDataSetTest.java 9 Apr 2003 22:52:13 -0000 1.20
***************
*** 23,35 ****
package org.dbunit.database;
- import org.dbunit.*;
import org.dbunit.DatabaseEnvironment;
! import org.dbunit.dataset.*;
import org.dbunit.dataset.datatype.DataType;
- import java.util.Arrays;
- import java.util.Comparator;
- import java.lang.reflect.Array;
-
/**
* @author Manuel Laflamme
--- 23,36 ----
package org.dbunit.database;
import org.dbunit.DatabaseEnvironment;
! import org.dbunit.MSSQLServerEnvironment;
! import org.dbunit.dataset.AbstractDataSetTest;
! import org.dbunit.dataset.Column;
! import org.dbunit.dataset.DataSetUtils;
! import org.dbunit.dataset.DefaultTableMetaData;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITableMetaData;
import org.dbunit.dataset.datatype.DataType;
/**
* @author Manuel Laflamme
***************
*** 72,101 ****
}
! protected IDataSet createDuplicateDataSet() throws Exception
! {
! throw new UnsupportedOperationException();
! }
!
! protected void sort(Object[] array)
{
! if (ITable[].class.isInstance(array))
! {
! Arrays.sort(array, new TableComparator());
! }
! else
! {
! Arrays.sort(array);
! }
}
! private class TableComparator implements Comparator
{
! public int compare(Object o1, Object o2)
! {
! String name1 = ((ITable)o1).getTableMetaData().getTableName();
! String name2 = ((ITable)o2).getTableMetaData().getTableName();
!
! return name1.compareTo(name2);
! }
}
--- 73,84 ----
}
! protected String[] getExpectedNames() throws Exception
{
! return _connection.createDataSet().getTableNames();
}
! protected IDataSet createDuplicateDataSet() throws Exception
{
! throw new UnsupportedOperationException();
}
***************
*** 164,168 ****
if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment)){
String[] expectedNames = getExpectedNames();
! sort(expectedNames);
try
--- 147,151 ----
if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment)){
String[] expectedNames = getExpectedNames();
! // sort(expectedNames);
try
***************
*** 173,179 ****
_connection.getConnection(), _connection.getSchema());
! IDataSet dataSet = removeExtraTestTables(connection.createDataSet());
String[] actualNames = dataSet.getTableNames();
! sort(actualNames);
assertEquals("name count", expectedNames.length, actualNames.length);
--- 156,162 ----
_connection.getConnection(), _connection.getSchema());
! IDataSet dataSet = connection.createDataSet();
String[] actualNames = dataSet.getTableNames();
! // sort(actualNames);
assertEquals("name count", expectedNames.length, actualNames.length);
|