Menu
▾
▴
dbunit-commit
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(7) |
Aug
(37) |
Sep
|
Oct
|
Nov
(1) |
Dec
(22) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(8) |
Feb
(68) |
Mar
(72) |
Apr
(149) |
May
(32) |
Jun
(46) |
Jul
(26) |
Aug
(59) |
Sep
(25) |
Oct
(18) |
Nov
(4) |
Dec
(3) |
| 2004 |
Jan
(90) |
Feb
(19) |
Mar
(38) |
Apr
(41) |
May
(44) |
Jun
(2) |
Jul
(10) |
Aug
|
Sep
(14) |
Oct
|
Nov
(1) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(15) |
Jun
(1) |
Jul
|
Aug
(9) |
Sep
|
Oct
(17) |
Nov
|
Dec
|
| 2006 |
Jan
(1) |
Feb
(16) |
Mar
|
Apr
(1) |
May
(48) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(29) |
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(23) |
Mar
(31) |
Apr
|
May
(26) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
(7) |
Oct
(1) |
Nov
(8) |
Dec
(8) |
| 2009 |
Jan
(5) |
Feb
(9) |
Mar
(1) |
Apr
|
May
(23) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
(9) |
Oct
(28) |
Nov
(18) |
Dec
(8) |
| 2010 |
Jan
(19) |
Feb
(24) |
Mar
(3) |
Apr
|
May
(5) |
Jun
(4) |
Jul
|
Aug
(1) |
Sep
(11) |
Oct
|
Nov
(2) |
Dec
(1) |
| 2011 |
Jan
|
Feb
(7) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(32) |
Oct
(6) |
Nov
|
Dec
|
|
From: <mla...@us...> - 2003-04-13 01:47:00
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv22460/dbunit/src/java/org/dbunit/operation/mssqlserver
Modified Files:
InsertIdentityOperation.java
Log Message:
Fixed qualified table name bug introduced in iterator refactoring.
Index: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** InsertIdentityOperation.java 9 Apr 2003 22:52:12 -0000 1.15
--- InsertIdentityOperation.java 13 Apr 2003 01:46:57 -0000 1.16
***************
*** 99,102 ****
--- 99,103 ----
{
IDataSet databaseDataSet = connection.createDataSet();
+ String schemaName = connection.getSchema();
// INSERT_IDENTITY need to be enabled/disabled inside the
***************
*** 113,125 ****
{
ITable table = iterator.getTable();
! String tableName = DataSetUtils.getQualifiedName(
! connection.getSchema(),
! table.getTableMetaData().getTableName(), true);
! ITableMetaData databaseMetaData =
databaseDataSet.getTableMetaData(tableName);
// enable identity insert
! boolean hasIdentityColumn = hasIdentityColumn(databaseMetaData);
if (hasIdentityColumn)
--- 114,124 ----
{
ITable table = iterator.getTable();
! String tableName = table.getTableMetaData().getTableName();
! ITableMetaData metaData =
databaseDataSet.getTableMetaData(tableName);
// enable identity insert
! boolean hasIdentityColumn = hasIdentityColumn(metaData);
if (hasIdentityColumn)
***************
*** 127,131 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(tableName);
sqlBuffer.append(" ON");
statement.execute(sqlBuffer.toString());
--- 126,131 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName(), true));
sqlBuffer.append(" ON");
statement.execute(sqlBuffer.toString());
***************
*** 143,147 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(tableName);
sqlBuffer.append(" OFF");
statement.execute(sqlBuffer.toString());
--- 143,148 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName(), true));
sqlBuffer.append(" OFF");
statement.execute(sqlBuffer.toString());
|
|
From: <mla...@us...> - 2003-04-12 16:57:04
|
Update of /cvsroot/dbunit/dbunit/lib In directory sc8-pr-cvs1:/tmp/cvs-serv26112/dbunit/lib Added Files: jakarta-poi-1.8.0-dev-20020919.jar mockobjects-0.07-core.jar mockobjects-0.07-jdk1.3.jar mysql-connector-java-3.0.6-stable-bin.jar Removed Files: jakarta-poi.jar mm.mysql-2.0.11-bin.jar mockobjects.jar Log Message: Updated multiple JARs --- NEW FILE: jakarta-poi-1.8.0-dev-20020919.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockobjects-0.07-core.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockobjects-0.07-jdk1.3.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mysql-connector-java-3.0.6-stable-bin.jar --- (This appears to be a binary file; contents omitted.) --- jakarta-poi.jar DELETED --- --- mm.mysql-2.0.11-bin.jar DELETED --- --- mockobjects.jar DELETED --- |
|
From: <mla...@us...> - 2003-04-10 02:55:05
|
Update of /cvsroot/dbunit/dbunit/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv1623/dbunit/lib
Removed Files:
Tag: branch-iterator
oracle-jdbc.jar
Log Message:
Get rid of the Oracle driver.
--- oracle-jdbc.jar DELETED ---
|
|
From: <mla...@us...> - 2003-04-10 02:52:10
|
Update of /cvsroot/dbunit/dbunit/src/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv788/dbunit/src/xml
Modified Files:
antTestBuildFile.xml
Log Message:
Refactored test suite to works with MySQL. Problems where mostly hard coded SQL using capitalized table names that I converted to lower case.
Index: antTestBuildFile.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/xml/antTestBuildFile.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** antTestBuildFile.xml 1 Mar 2003 06:51:18 -0000 1.5
--- antTestBuildFile.xml 10 Apr 2003 02:52:07 -0000 1.6
***************
*** 260,265 ****
password="${dbunit.profile.password}">
<export dest="${exportDataSet}">
! <query name="TEST_TABLE" sql="SELECT * FROM TEST_TABLE"/>
! <query name="PK_TABLE" sql="SELECT * FROM PK_TABLE"/>
</export>
</dbunit>
--- 260,265 ----
password="${dbunit.profile.password}">
<export dest="${exportDataSet}">
! <query name="TEST_TABLE" sql="SELECT * FROM test_table"/>
! <query name="PK_TABLE" sql="SELECT * FROM pk_table"/>
</export>
</dbunit>
***************
*** 274,278 ****
<export dest="${exportDataSet}">
<table name="TEST_TABLE" />
! <query name="PK_TABLE" sql="SELECT * FROM PK_TABLE WHERE NORMAL1='0 wor'"/>
</export>
</dbunit>
--- 274,278 ----
<export dest="${exportDataSet}">
<table name="TEST_TABLE" />
! <query name="PK_TABLE" sql="SELECT * FROM pk_table WHERE normal1='0 wor'"/>
</export>
</dbunit>
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv788/dbunit/src/test/org/dbunit/database
Modified Files:
AbstractDatabaseConnectionTest.java
DatabaseTableMetaDataTest.java QueryDataSetTest.java
ResultsetTableTest.java
Log Message:
Refactored test suite to works with MySQL. Problems where mostly hard coded SQL using capitalized table names that I converted to lower case.
Index: AbstractDatabaseConnectionTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/AbstractDatabaseConnectionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractDatabaseConnectionTest.java 13 Jun 2002 17:24:59 -0000 1.3
--- AbstractDatabaseConnectionTest.java 10 Apr 2003 02:52:06 -0000 1.4
***************
*** 39,49 ****
public final void testGetRowCount() throws Exception
{
! assertEquals("EMPTY_TABLE", 0, _connection.getRowCount("EMPTY_TABLE", null));
! assertEquals("EMPTY_TABLE", 0, _connection.getRowCount("EMPTY_TABLE"));
! assertEquals("TEST_TABLE", 6, _connection.getRowCount("TEST_TABLE", null));
! assertEquals("TEST_TABLE", 6, _connection.getRowCount("TEST_TABLE"));
! assertEquals("PK_TABLE", 1, _connection.getRowCount("PK_TABLE", "where PK0 = 0"));
}
}
--- 39,49 ----
public final void testGetRowCount() throws Exception
{
! assertEquals("EMPTY_TABLE", 0, _connection.getRowCount("empty_table", null));
! assertEquals("EMPTY_TABLE", 0, _connection.getRowCount("empty_table"));
! assertEquals("TEST_TABLE", 6, _connection.getRowCount("test_table", null));
! assertEquals("TEST_TABLE", 6, _connection.getRowCount("test_table"));
! assertEquals("PK_TABLE", 1, _connection.getRowCount("pk_table", "where PK0 = 0"));
}
}
Index: DatabaseTableMetaDataTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DatabaseTableMetaDataTest.java 14 Feb 2003 05:02:28 -0000 1.13
--- DatabaseTableMetaDataTest.java 10 Apr 2003 02:52:06 -0000 1.14
***************
*** 56,60 ****
return (DataType[])EXPECTED_DATA_TYPES.clone();
}
-
}
--- 56,59 ----
***************
*** 75,79 ****
String[] expected = {"PK0", "PK1", "PK2"};
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getPrimaryKeys();
--- 74,78 ----
String[] expected = {"PK0", "PK1", "PK2"};
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getPrimaryKeys();
***************
*** 90,94 ****
String tableName = "TEST_TABLE";
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getPrimaryKeys();
--- 89,93 ----
String tableName = "TEST_TABLE";
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getPrimaryKeys();
***************
*** 127,131 ****
String[] nullable = {"NORMAL0", "NORMAL1"};
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getColumns();
--- 126,130 ----
String[] nullable = {"NORMAL0", "NORMAL1"};
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getColumns();
***************
*** 181,185 ****
DataType[] expectedTypes = getExpectedDataTypes();
! ITableMetaData metaData = new DatabaseTableMetaData(tableName, getConnection());
Column[] columns = metaData.getColumns();
--- 180,184 ----
DataType[] expectedTypes = getExpectedDataTypes();
! ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
Column[] columns = metaData.getColumns();
Index: QueryDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/QueryDataSetTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryDataSetTest.java 16 Feb 2003 06:27:28 -0000 1.2
--- QueryDataSetTest.java 10 Apr 2003 02:52:07 -0000 1.3
***************
*** 25,35 ****
import org.dbunit.DatabaseEnvironment;
import org.dbunit.HypersonicEnvironment;
! import org.dbunit.dataset.*;
! import org.dbunit.database.IDatabaseConnection;
import org.dbunit.operation.DatabaseOperation;
- import java.util.Arrays;
- import java.util.Comparator;
-
/**
* @author Manuel Laflamme
--- 25,34 ----
import org.dbunit.DatabaseEnvironment;
import org.dbunit.HypersonicEnvironment;
! import org.dbunit.dataset.AbstractDataSetTest;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.NoSuchColumnException;
import org.dbunit.operation.DatabaseOperation;
/**
* @author Manuel Laflamme
***************
*** 68,71 ****
--- 67,77 ----
// AbstractDataSetTest class
+ protected String[] getExpectedNames() throws Exception
+ {
+ return getExpectedLowerNames();
+ }
+
+
+
protected IDataSet createDataSet() throws Exception
{
***************
*** 88,100 ****
// first table expect 1 row
! String queryOneRow = "select * from ONLY_PK_TABLE";
dataSet.addTable(names[0], queryOneRow);
// second table expect 0 row
! String queryNoRow = "select * from EMPTY_TABLE";
dataSet.addTable(names[1], queryNoRow);
// third table expect 2 row
! String queryTwoRow = "select * from PK_TABLE where PK0=0 or PK0=1";
dataSet.addTable(names[2], queryTwoRow);
--- 94,106 ----
// first table expect 1 row
! String queryOneRow = "select * from only_pk_table";
dataSet.addTable(names[0], queryOneRow);
// second table expect 0 row
! String queryNoRow = "select * from empty_table";
dataSet.addTable(names[1], queryNoRow);
// third table expect 2 row
! String queryTwoRow = "select * from pk_table where PK0=0 or PK0=1";
dataSet.addTable(names[2], queryTwoRow);
***************
*** 109,113 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT PK0, PK1 FROM PK_TABLE where PK0 = 0");
ITable table = ptds.getTable("PK_TABLE");
--- 115,119 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT PK0, PK1 FROM pk_table where PK0 = 0");
ITable table = ptds.getTable("PK_TABLE");
***************
*** 121,125 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT * FROM PK_TABLE where PK0 = 0");
ITable table = ptds.getTable("PK_TABLE");
--- 127,131 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT * FROM pk_table where PK0 = 0");
ITable table = ptds.getTable("PK_TABLE");
***************
*** 133,137 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT PK0 FROM PK_TABLE");
ITable table = ptds.getTable("PK_TABLE");
--- 139,143 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT PK0 FROM pk_table");
ITable table = ptds.getTable("PK_TABLE");
***************
*** 145,149 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT PK0 FROM PK_TABLE");
ITable table = ptds.getTable("PK_TABLE");
--- 151,155 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("PK_TABLE", "SELECT PK0 FROM pk_table");
ITable table = ptds.getTable("PK_TABLE");
***************
*** 152,156 ****
try
{
! String test = table.getValue(0, "PK1").toString();
fail("Should not have reached here, we should have thrown a NoSuchColumnException");
}
--- 158,162 ----
try
{
! table.getValue(0, "PK1").toString();
fail("Should not have reached here, we should have thrown a NoSuchColumnException");
}
***************
*** 159,164 ****
String errorMsg = "org.dbunit.dataset.NoSuchColumnException: PK_TABLE.PK1";
assertTrue("Find text:" + errorMsg, nsce.toString().indexOf(errorMsg) >= 0);
-
-
}
}
--- 165,168 ----
***************
*** 168,172 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE", "SELECT * FROM SECOND_TABLE where COLUMN0='row 0 col 0'");
ITable table = ptds.getTable("SECOND_TABLE");
--- 172,177 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE",
! "SELECT * FROM second_table where COLUMN0='row 0 col 0'");
ITable table = ptds.getTable("SECOND_TABLE");
***************
*** 181,185 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE", "SELECT COLUMN0, COLUMN3 FROM SECOND_TABLE where COLUMN0='row 0 col 0' and COLUMN2='row 0 col 2'");
ITable table = ptds.getTable("SECOND_TABLE");
--- 186,191 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE",
! "SELECT COLUMN0, COLUMN3 FROM second_table where COLUMN0='row 0 col 0' and COLUMN2='row 0 col 2'");
ITable table = ptds.getTable("SECOND_TABLE");
***************
*** 195,200 ****
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE", "SELECT * from SECOND_TABLE where COLUMN0='row 0 col 0' and COLUMN2='row 0 col 2'");
! ptds.addTable("PK_TABLE", "SELECT * FROM PK_TABLE where PK0 = 0");
table = ptds.getTable("SECOND_TABLE");
--- 201,208 ----
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE",
! "SELECT * from second_table where COLUMN0='row 0 col 0' and COLUMN2='row 0 col 2'");
! ptds.addTable("PK_TABLE",
! "SELECT * FROM pk_table where PK0 = 0");
table = ptds.getTable("SECOND_TABLE");
***************
*** 225,234 ****
public void testMultipleTablesWithMissingWhere() throws Exception
{
- ITable table = null;
-
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE", "SELECT * from SECOND_TABLE where COLUMN0='row 0 col 0' and COLUMN2='row 0 col 2'");
ptds.addTable("PK_TABLE", null);
-
}
--- 233,240 ----
public void testMultipleTablesWithMissingWhere() throws Exception
{
QueryDataSet ptds = new QueryDataSet(_connection);
! ptds.addTable("SECOND_TABLE",
! "SELECT * from second_table where COLUMN0='row 0 col 0' and COLUMN2='row 0 col 2'");
ptds.addTable("PK_TABLE", null);
}
Index: ResultsetTableTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/ResultsetTableTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ResultsetTableTest.java 16 Feb 2003 06:01:00 -0000 1.8
--- ResultsetTableTest.java 10 Apr 2003 02:52:07 -0000 1.9
***************
*** 46,50 ****
DatabaseOperation.CLEAN_INSERT.execute(connection, env.getInitDataSet());
! String sql = "select * from TEST_TABLE order by COLUMN0";
return connection.createQueryTable("TEST_TABLE", sql);
}
--- 46,50 ----
DatabaseOperation.CLEAN_INSERT.execute(connection, env.getInitDataSet());
! String sql = "select * from test_table order by COLUMN0";
return connection.createQueryTable("TEST_TABLE", sql);
}
|
|
From: <mla...@us...> - 2003-04-10 02:52:10
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv788/dbunit/src/test/org/dbunit/operation
Modified Files:
RefreshOperationTest.java UpdateOperationTest.java
Log Message:
Refactored test suite to works with MySQL. Problems where mostly hard coded SQL using capitalized table names that I converted to lower case.
Index: RefreshOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/RefreshOperationTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RefreshOperationTest.java 5 Mar 2003 02:54:16 -0000 1.12
--- RefreshOperationTest.java 10 Apr 2003 02:52:07 -0000 1.13
***************
*** 25,40 ****
import org.dbunit.AbstractDatabaseTest;
import org.dbunit.Assertion;
- import org.dbunit.DatabaseUnitException;
import org.dbunit.database.MockDatabaseConnection;
import org.dbunit.database.statement.MockStatementFactory;
! import org.dbunit.dataset.*;
import org.dbunit.dataset.datatype.DataType;
import org.dbunit.dataset.xml.FlatXmlDataSet;
- import java.io.FileInputStream;
import java.io.FileReader;
import java.io.Reader;
import java.util.ArrayList;
- import java.sql.SQLException;
/**
--- 25,44 ----
import org.dbunit.AbstractDatabaseTest;
import org.dbunit.Assertion;
import org.dbunit.database.MockDatabaseConnection;
import org.dbunit.database.statement.MockStatementFactory;
! import org.dbunit.dataset.Column;
! import org.dbunit.dataset.DefaultDataSet;
! import org.dbunit.dataset.DefaultTable;
! import org.dbunit.dataset.DefaultTableMetaData;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.LowerCaseDataSet;
! import org.dbunit.dataset.NoPrimaryKeyException;
import org.dbunit.dataset.datatype.DataType;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import java.io.FileReader;
import java.io.Reader;
import java.util.ArrayList;
/**
***************
*** 95,99 ****
public void testExecuteAndNoPrimaryKeys() throws Exception
{
! String tableName = "TEST_TABLE";
Reader reader = new FileReader("src/xml/refreshOperationNoPKTest.xml");
--- 99,103 ----
public void testExecuteAndNoPrimaryKeys() throws Exception
{
! String tableName = "test_table";
Reader reader = new FileReader("src/xml/refreshOperationNoPKTest.xml");
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** UpdateOperationTest.java 5 Mar 2003 02:54:16 -0000 1.17
--- UpdateOperationTest.java 10 Apr 2003 02:52:07 -0000 1.18
***************
*** 329,333 ****
public void testExecuteAndNoPrimaryKeys() throws Exception
{
! String tableName = "TEST_TABLE";
Reader reader = new FileReader("src/xml/updateOperationNoPKTest.xml");
--- 329,333 ----
public void testExecuteAndNoPrimaryKeys() throws Exception
{
! String tableName = "test_table";
Reader reader = new FileReader("src/xml/updateOperationNoPKTest.xml");
|
|
From: <mla...@us...> - 2003-04-10 02:52:09
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant
In directory sc8-pr-cvs1:/tmp/cvs-serv788/dbunit/src/test/org/dbunit/ant
Modified Files:
DbUnitTaskTest.java
Log Message:
Refactored test suite to works with MySQL. Problems where mostly hard coded SQL using capitalized table names that I converted to lower case.
Index: DbUnitTaskTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DbUnitTaskTest.java 1 Mar 2003 06:51:18 -0000 1.8
--- DbUnitTaskTest.java 10 Apr 2003 02:52:06 -0000 1.9
***************
*** 266,274 ****
Query testTable = (Query)queries.get(0);
assertEquals("name", "TEST_TABLE", testTable.getName());
! assertEquals("sql", "SELECT * FROM TEST_TABLE", testTable.getSql());
Query pkTable = (Query)queries.get(1);
assertEquals("name", "PK_TABLE", pkTable.getName());
! assertEquals("sql", "SELECT * FROM PK_TABLE", pkTable.getSql());
}
--- 266,274 ----
Query testTable = (Query)queries.get(0);
assertEquals("name", "TEST_TABLE", testTable.getName());
! assertEquals("sql", "SELECT * FROM test_table", testTable.getSql());
Query pkTable = (Query)queries.get(1);
assertEquals("name", "PK_TABLE", pkTable.getName());
! assertEquals("sql", "SELECT * FROM pk_table", pkTable.getSql());
}
|
|
From: <mla...@us...> - 2003-04-10 02:52:09
|
Update of /cvsroot/dbunit/dbunit/src/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv788/dbunit/src/sql
Modified Files:
mysql.sql
Log Message:
Refactored test suite to works with MySQL. Problems where mostly hard coded SQL using capitalized table names that I converted to lower case.
Index: mysql.sql
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/sql/mysql.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mysql.sql 9 Apr 2003 22:52:17 -0000 1.2
--- mysql.sql 10 Apr 2003 02:52:06 -0000 1.3
***************
*** 3,11 ****
-----------------------------------------------------------------------------
CREATE TABLE test_table
! (column0 VARCHAR(32),
! column1 VARCHAR(32),
! column2 VARCHAR(32),
! column3 VARCHAR(32)) TYPE = InnoDB;
-----------------------------------------------------------------------------
--- 3,12 ----
-----------------------------------------------------------------------------
+ DROP TABLE IF EXISTS test_table;
CREATE TABLE test_table
! (COLUMN0 VARCHAR(32),
! COLUMN1 VARCHAR(32),
! COLUMN2 VARCHAR(32),
! COLUMN3 VARCHAR(32)) TYPE = InnoDB;
-----------------------------------------------------------------------------
***************
*** 13,16 ****
--- 14,18 ----
-----------------------------------------------------------------------------
+ DROP TABLE IF EXISTS second_table;
CREATE TABLE second_table
(COLUMN0 VARCHAR(32),
***************
*** 23,26 ****
--- 25,29 ----
-----------------------------------------------------------------------------
+ DROP TABLE IF EXISTS empty_table;
CREATE TABLE empty_table
(COLUMN0 VARCHAR(32),
***************
*** 29,48 ****
COLUMN3 VARCHAR(32)) TYPE = InnoDB;
- /*
- -----------------------------------------------------------------------------
- -- ESCAPED TABLE
- -----------------------------------------------------------------------------
-
- CREATE TABLE "ESCAPED TABLE"
- (COLUMN0 VARCHAR(32),
- COLUMN1 VARCHAR(32),
- COLUMN2 VARCHAR(32),
- "COLUMN 3" VARCHAR(32)) TYPE = InnoDB;
- */
-
-----------------------------------------------------------------------------
-- PK_TABLE
-----------------------------------------------------------------------------
CREATE TABLE pk_table
(PK0 NUMERIC(38, 0) NOT NULL,
--- 32,40 ----
COLUMN3 VARCHAR(32)) TYPE = InnoDB;
-----------------------------------------------------------------------------
-- PK_TABLE
-----------------------------------------------------------------------------
+ DROP TABLE IF EXISTS pk_table;
CREATE TABLE pk_table
(PK0 NUMERIC(38, 0) NOT NULL,
***************
*** 56,61 ****
-----------------------------------------------------------------------------
CREATE TABLE only_pk_table
! (pk0 NUMERIC(38, 0) NOT NULL PRIMARY KEY) TYPE = InnoDB;
-----------------------------------------------------------------------------
--- 48,54 ----
-----------------------------------------------------------------------------
+ DROP TABLE IF EXISTS only_pk_table;
CREATE TABLE only_pk_table
! (PK0 NUMERIC(38, 0) NOT NULL PRIMARY KEY) TYPE = InnoDB;
-----------------------------------------------------------------------------
***************
*** 63,66 ****
--- 56,60 ----
-----------------------------------------------------------------------------
+ DROP TABLE IF EXISTS empty_multitype_table;
CREATE TABLE empty_multitype_table
(VARCHAR_COL VARCHAR(32),
***************
*** 68,72 ****
TIMESTAMP_COL TIMESTAMP,
VARBINARY_COL VARBINARY(254)) TYPE = InnoDB;
-
-
-
--- 62,63 ----
|
|
From: <mla...@us...> - 2003-04-10 02:52:09
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory sc8-pr-cvs1:/tmp/cvs-serv788/dbunit/src/java/org/dbunit/ant Modified Files: Operation.java Log Message: Refactored test suite to works with MySQL. Problems where mostly hard coded SQL using capitalized table names that I converted to lower case. Index: Operation.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Operation.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Operation.java 14 Feb 2003 03:21:59 -0000 1.5 --- Operation.java 10 Apr 2003 02:52:05 -0000 1.6 *************** *** 31,36 **** import org.dbunit.operation.mssqlserver.InsertIdentityOperation; ! import java.io.*; ! import java.sql.Connection; import java.sql.SQLException; --- 31,37 ---- import org.dbunit.operation.mssqlserver.InsertIdentityOperation; ! import java.io.File; ! import java.io.FileReader; ! import java.io.IOException; import java.sql.SQLException; *************** *** 46,50 **** public class Operation implements DbUnitTaskStep { ! protected String type; private final String DEFAULT_FORMAT = "flat"; --- 47,51 ---- public class Operation implements DbUnitTaskStep { ! protected String type; private final String DEFAULT_FORMAT = "flat"; *************** *** 78,89 **** } ! /** ! * This returns the actual value of the <code>format</code> field, ! * which makes it possible to determine whether the setFormat() method was ever called ! * despite the fact that the <code>getFormat()</code> method returns a default. ! * ! * @return a <code>String</code>, the actual value of the <code>format</code> field. ! * If <code>setFormat()</code> has not been called, this method will return null. ! */ String getRawFormat() { --- 79,90 ---- } ! /** ! * This returns the actual value of the <code>format</code> field, ! * which makes it possible to determine whether the setFormat() method was ever called ! * despite the fact that the <code>getFormat()</code> method returns a default. ! * ! * @return a <code>String</code>, the actual value of the <code>format</code> field. ! * If <code>setFormat()</code> has not been called, this method will return null. ! */ String getRawFormat() { *************** *** 117,137 **** dbOperation = DatabaseOperation.CLEAN_INSERT; } ! else if ("MSSQL_CLEAN_INSERT".equals(type)) ! { ! dbOperation = InsertIdentityOperation.CLEAN_INSERT; ! } ! else if ("MSSQL_INSERT".equals(type)) ! { ! dbOperation = InsertIdentityOperation.INSERT; ! } ! else if ("MSSQL_REFRESH".equals(type)) ! { ! dbOperation = InsertIdentityOperation.REFRESH; ! } ! else ! { ! throw new IllegalArgumentException("Type must be one of: UPDATE, INSERT," + " REFRESH, DELETE, DELETE_ALL, CLEAN_INSERT, MSSQL_INSERT, " ! + " or MSSQL_REFRESH but was: " + type); } this.type = type; --- 118,138 ---- dbOperation = DatabaseOperation.CLEAN_INSERT; } ! else if ("MSSQL_CLEAN_INSERT".equals(type)) ! { ! dbOperation = InsertIdentityOperation.CLEAN_INSERT; ! } ! else if ("MSSQL_INSERT".equals(type)) ! { ! dbOperation = InsertIdentityOperation.INSERT; ! } ! else if ("MSSQL_REFRESH".equals(type)) ! { ! dbOperation = InsertIdentityOperation.REFRESH; ! } ! else ! { ! throw new IllegalArgumentException("Type must be one of: UPDATE, INSERT," + " REFRESH, DELETE, DELETE_ALL, CLEAN_INSERT, MSSQL_INSERT, " ! + " or MSSQL_REFRESH but was: " + type); } this.type = type; *************** *** 145,157 **** public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml")) ! { this.format = format; ! } ! else ! { ! throw new IllegalArgumentException("Type must be either 'flat'(default) or 'xml' but was: " + format); ! } } --- 146,158 ---- public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml")) ! { this.format = format; ! } ! else ! { ! throw new IllegalArgumentException("Type must be either 'flat'(default) or 'xml' but was: " + format); ! } } *************** *** 163,175 **** { IDataSet dataset; ! if (format == null) ! { ! format = DEFAULT_FORMAT; ! } if (format.equalsIgnoreCase("xml")) { dataset = new XmlDataSet(new FileReader(src)); } ! else { dataset = new FlatXmlDataSet(src); --- 164,176 ---- { IDataSet dataset; ! if (format == null) ! { ! format = DEFAULT_FORMAT; ! } if (format.equalsIgnoreCase("xml")) { dataset = new XmlDataSet(new FileReader(src)); } ! else { dataset = new FlatXmlDataSet(src); *************** *** 196,200 **** return "Executing operation: " + type + "\n on file: " + src.getAbsolutePath() ! + "\n with format: " + format; } --- 197,201 ---- return "Executing operation: " + type + "\n on file: " + src.getAbsolutePath() ! + "\n with format: " + format; } |
|
From: <mla...@us...> - 2003-04-09 22:52:51
|
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++)
|
|
From: <mla...@us...> - 2003-04-09 22:52:50
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/test/org/dbunit/dataset/filter
Modified Files:
AbstractTableFilterTest.java AllTests.java
ExcludeTableFilterTest.java IncludeTableFilterTest.java
SequenceTableFilterTest.java
Added Files:
SequenceTableIteratorTest.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: AbstractTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/AbstractTableFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractTableFilterTest.java 19 Mar 2003 01:56:18 -0000 1.2
--- AbstractTableFilterTest.java 9 Apr 2003 22:52:15 -0000 1.3
***************
*** 21,32 ****
package org.dbunit.dataset.filter;
! import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.CompositeDataSet;
import org.dbunit.dataset.DefaultDataSet;
import org.dbunit.dataset.DefaultTable;
import org.dbunit.dataset.xml.XmlDataSet;
- import junit.framework.TestCase;
-
import java.io.FileReader;
--- 21,31 ----
package org.dbunit.dataset.filter;
! import org.dbunit.dataset.AbstractTest;
import org.dbunit.dataset.CompositeDataSet;
import org.dbunit.dataset.DefaultDataSet;
import org.dbunit.dataset.DefaultTable;
+ import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.xml.XmlDataSet;
import java.io.FileReader;
***************
*** 36,57 ****
* @version $Revision$
*/
! public abstract class AbstractTableFilterTest extends TestCase
{
- private static final String[] TABLE_NAMES = {
- "TEST_TABLE",
- "SECOND_TABLE",
- "EMPTY_TABLE",
- "PK_TABLE",
- "ONLY_PK_TABLE",
- "EMPTY_MULTITYPE_TABLE",
- };
-
- private static final String[] DUPLICATE_TABLE_NAMES = {
- "DUPLICATE_TABLE",
- "EMPTY_TABLE",
- "DUPLICATE_TABLE",
- };
-
- private static final String EXTRA_TABLE_NAME = "EXTRA_TABLE";
public AbstractTableFilterTest(String s)
--- 35,41 ----
* @version $Revision$
*/
! public abstract class AbstractTableFilterTest
! extends AbstractTest
{
public AbstractTableFilterTest(String s)
***************
*** 60,89 ****
}
- protected String[] getExpectedNames() throws Exception
- {
- return (String[])TABLE_NAMES.clone();
- }
-
- protected String[] getExpectedLowerNames() throws Exception
- {
- String[] names = (String[])TABLE_NAMES.clone();
- for (int i = 0; i < names.length; i++)
- {
- names[i] = names[i].toLowerCase();
- }
-
- return names;
- }
-
- protected String[] getExpectedDuplicateNames()
- {
- return (String[])DUPLICATE_TABLE_NAMES.clone();
- }
-
- public String getExtraTableName()
- {
- return EXTRA_TABLE_NAME;
- }
-
protected IDataSet createDataSet() throws Exception
{
--- 44,47 ----
***************
*** 128,140 ****
public abstract void testGetTableNamesAndTableNotInDecoratedDataSet() throws Exception;
! public abstract void testGetTables() throws Exception;
!
! public abstract void testGetDuplicateTables() throws Exception;
! public abstract void testGetCaseInsensitiveTables() throws Exception;
! public abstract void testGetReverseTables() throws Exception;
! public abstract void testGetTablesAndTableNotInDecoratedDataSet() throws Exception;
}
--- 86,97 ----
public abstract void testGetTableNamesAndTableNotInDecoratedDataSet() throws Exception;
! public abstract void testIterator() throws Exception;
! public abstract void testIteratorWithDuplicateTables() throws Exception;
! public abstract void testCaseInsensitiveIterator() throws Exception;
! public abstract void testReverseIterator() throws Exception;
+ public abstract void testIteratorAndTableNotInDecoratedDataSet() throws Exception;
}
Index: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/AllTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AllTests.java 19 Mar 2003 01:56:18 -0000 1.2
--- AllTests.java 9 Apr 2003 22:52:15 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
suite.addTest(new TestSuite(IncludeTableFilterTest.class));
suite.addTest(new TestSuite(SequenceTableFilterTest.class));
+ suite.addTest(new TestSuite(SequenceTableIteratorTest.class));
return suite;
Index: ExcludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/ExcludeTableFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExcludeTableFilterTest.java 20 Mar 2003 03:05:12 -0000 1.2
--- ExcludeTableFilterTest.java 9 Apr 2003 22:52:15 -0000 1.3
***************
*** 26,29 ****
--- 26,30 ----
import org.dbunit.dataset.LowerCaseDataSet;
import org.dbunit.dataset.DefaultTable;
+ import org.dbunit.dataset.DataSetUtils;
import java.util.Arrays;
***************
*** 158,162 ****
}
! public void testGetTables() throws Exception
{
String[] expectedNames = getExpectedNames();
--- 159,163 ----
}
! public void testIterator() throws Exception
{
String[] expectedNames = getExpectedNames();
***************
*** 168,172 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 169,174 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 175,179 ****
}
! public void testGetDuplicateTables() throws Exception
{
String[] expectedNames = getExpectedDuplicateNames();
--- 177,181 ----
}
! public void testIteratorWithDuplicateTables() throws Exception
{
String[] expectedNames = getExpectedDuplicateNames();
***************
*** 185,189 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 187,192 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 192,196 ****
}
! public void testGetCaseInsensitiveTables() throws Exception
{
ExcludeTableFilter filter = new ExcludeTableFilter();
--- 195,199 ----
}
! public void testCaseInsensitiveIterator() throws Exception
{
ExcludeTableFilter filter = new ExcludeTableFilter();
***************
*** 202,206 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 205,210 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 209,218 ****
}
! public void testGetReverseTables() throws Exception
{
// Cannot test!
}
! public void testGetTablesAndTableNotInDecoratedDataSet() throws Exception
{
String[] expectedNames = getExpectedNames();
--- 213,222 ----
}
! public void testReverseIterator() throws Exception
{
// Cannot test!
}
! public void testIteratorAndTableNotInDecoratedDataSet() throws Exception
{
String[] expectedNames = getExpectedNames();
***************
*** 225,229 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 229,234 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 341,345 ****
if (pattern.equals("*"))
{
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
--- 346,351 ----
if (pattern.equals("*"))
{
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
***************
*** 348,352 ****
else
{
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
--- 354,359 ----
else
{
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
***************
*** 374,378 ****
filter.excludeTable(pattern);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
--- 381,386 ----
filter.excludeTable(pattern);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
Index: IncludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/IncludeTableFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IncludeTableFilterTest.java 20 Mar 2003 03:05:12 -0000 1.2
--- IncludeTableFilterTest.java 9 Apr 2003 22:52:16 -0000 1.3
***************
*** 190,194 ****
}
! public void testGetTables() throws Exception
{
String[] expectedNames = getExpectedNames();
--- 190,194 ----
}
! public void testIterator() throws Exception
{
String[] expectedNames = getExpectedNames();
***************
*** 199,203 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 199,204 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 206,210 ****
}
! public void testGetDuplicateTables() throws Exception
{
String[] expectedNames = getExpectedDuplicateNames();
--- 207,211 ----
}
! public void testIteratorWithDuplicateTables() throws Exception
{
String[] expectedNames = getExpectedDuplicateNames();
***************
*** 215,219 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 216,221 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 222,226 ****
}
! public void testGetCaseInsensitiveTables() throws Exception
{
ITableFilter filter = new IncludeTableFilter(getExpectedNames());
--- 224,228 ----
}
! public void testCaseInsensitiveIterator() throws Exception
{
ITableFilter filter = new IncludeTableFilter(getExpectedNames());
***************
*** 231,235 ****
dataSet.getTableNames().length > lowerNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", lowerNames.length, actualTables.length);
--- 233,238 ----
dataSet.getTableNames().length > lowerNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", lowerNames.length, actualTables.length);
***************
*** 238,245 ****
}
! public void testGetReverseTables() throws Exception
{
! String[] expectedNames = getExpectedNames();
! String[] filterNames = DataSetUtils.reverseStringArray(expectedNames);
ITableFilter filter = new IncludeTableFilter(filterNames);
--- 241,248 ----
}
! public void testReverseIterator() throws Exception
{
! String[] filterNames = getExpectedNames();
! String[] expectedNames = DataSetUtils.reverseStringArray(filterNames);
ITableFilter filter = new IncludeTableFilter(filterNames);
***************
*** 248,252 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 251,256 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, true));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 255,259 ****
}
! public void testGetTablesAndTableNotInDecoratedDataSet() throws Exception
{
String[] expectedNames = getExpectedNames();
--- 259,263 ----
}
! public void testIteratorAndTableNotInDecoratedDataSet() throws Exception
{
String[] expectedNames = getExpectedNames();
***************
*** 268,272 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 272,277 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 387,391 ****
if (pattern.equals("*"))
{
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
--- 392,397 ----
if (pattern.equals("*"))
{
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
***************
*** 397,401 ****
else
{
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
--- 403,408 ----
else
{
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count - " + pattern,
***************
*** 422,426 ****
filter.includeTable(pattern);
! ITable[] actualTables = filter.getTables(dataSet);
assertEquals("table count - " + pattern, 0, actualTables.length);
}
--- 429,434 ----
filter.includeTable(pattern);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
assertEquals("table count - " + pattern, 0, actualTables.length);
}
Index: SequenceTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/SequenceTableFilterTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SequenceTableFilterTest.java 19 Mar 2003 01:56:18 -0000 1.3
--- SequenceTableFilterTest.java 9 Apr 2003 22:52:16 -0000 1.4
***************
*** 21,34 ****
package org.dbunit.dataset.filter;
- import org.dbunit.dataset.*;
- import org.dbunit.dataset.xml.XmlDataSet;
import org.dbunit.database.AmbiguousTableNameException;
! import junit.framework.TestCase;
!
! import java.io.FileReader;
import java.util.Arrays;
import java.util.List;
- import java.util.ArrayList;
/**
--- 21,34 ----
package org.dbunit.dataset.filter;
import org.dbunit.database.AmbiguousTableNameException;
+ import org.dbunit.dataset.DataSetUtils;
+ import org.dbunit.dataset.DefaultDataSet;
+ import org.dbunit.dataset.IDataSet;
+ import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.LowerCaseDataSet;
! import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
***************
*** 170,174 ****
}
! public void testGetTables() throws Exception
{
String[] expectedNames = getExpectedNames();
--- 170,174 ----
}
! public void testIterator() throws Exception
{
String[] expectedNames = getExpectedNames();
***************
*** 179,183 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 179,184 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 186,190 ****
}
! public void testGetDuplicateTables() throws Exception
{
String[] expectedNames = getExpectedDuplicateNames();
--- 187,191 ----
}
! public void testIteratorWithDuplicateTables() throws Exception
{
String[] expectedNames = getExpectedDuplicateNames();
***************
*** 197,201 ****
try
{
! filter.getTables(dataSet);
fail("Should not be here!");
}
--- 198,202 ----
try
{
! DataSetUtils.getTables(filter.iterator(dataSet, false));
fail("Should not be here!");
}
***************
*** 205,209 ****
}
! public void testGetCaseInsensitiveTables() throws Exception
{
ITableFilter filter = new SequenceTableFilter(getExpectedNames());
--- 206,210 ----
}
! public void testCaseInsensitiveIterator() throws Exception
{
ITableFilter filter = new SequenceTableFilter(getExpectedNames());
***************
*** 214,218 ****
dataSet.getTableNames().length > lowerNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", lowerNames.length, actualTables.length);
--- 215,220 ----
dataSet.getTableNames().length > lowerNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", lowerNames.length, actualTables.length);
***************
*** 221,228 ****
}
! public void testGetReverseTables() throws Exception
{
! String[] expectedNames = DataSetUtils.reverseStringArray(getExpectedNames());
! ITableFilter filter = new SequenceTableFilter(expectedNames);
IDataSet dataSet = createDataSet();
--- 223,231 ----
}
! public void testReverseIterator() throws Exception
{
! String[] filterNames = getExpectedNames();
! String[] expectedNames = DataSetUtils.reverseStringArray(filterNames);
! ITableFilter filter = new SequenceTableFilter(filterNames);
IDataSet dataSet = createDataSet();
***************
*** 230,234 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 233,238 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, true));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 237,241 ****
}
! public void testGetTablesAndTableNotInDecoratedDataSet() throws Exception
{
String[] expectedNames = getExpectedNames();
--- 241,245 ----
}
! public void testIteratorAndTableNotInDecoratedDataSet() throws Exception
{
String[] expectedNames = getExpectedNames();
***************
*** 250,254 ****
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = filter.getTables(dataSet);
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
--- 254,278 ----
dataSet.getTableNames().length > expectedNames.length);
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
! String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
! assertEquals("table count", expectedNames.length, actualTables.length);
! assertEquals("table names",
! Arrays.asList(expectedNames), Arrays.asList(actualNames));
! }
!
! ////////////////////////////////////////////////////////////////////////////
!
! public void testIteratorWithDifferentSequence() throws Exception
! {
! String[] expectedNames = DataSetUtils.reverseStringArray(getExpectedNames());
! ITableFilter filter = new SequenceTableFilter(expectedNames);
!
! IDataSet dataSet = createDataSet();
! assertTrue("dataset names count",
! dataSet.getTableNames().length > expectedNames.length);
!
! ITable[] actualTables = DataSetUtils.getTables(
! filter.iterator(dataSet, false));
String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 256,258 ****
--- 280,283 ----
Arrays.asList(expectedNames), Arrays.asList(actualNames));
}
+
}
|
|
From: <mla...@us...> - 2003-04-09 22:52:48
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/excel In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/test/org/dbunit/dataset/excel Modified Files: XlsDataSetTest.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: XlsDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/excel/XlsDataSetTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XlsDataSetTest.java 21 Mar 2003 03:14:50 -0000 1.1 --- XlsDataSetTest.java 9 Apr 2003 22:52:15 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.ITable; + import org.dbunit.dataset.DataSetUtils; import java.io.*; *************** *** 80,85 **** // 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++) --- 81,86 ---- // 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++) *************** *** 133,138 **** // 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++) --- 134,139 ---- // 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++) |
|
From: <mla...@us...> - 2003-04-09 22:52:48
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/test/org/dbunit/dataset
Modified Files:
AbstractDataSetTest.java AllTests.java
CaseInsensitiveDataSetTest.java CompositeDataSetTest.java
Added Files:
AbstractTableIteratorTest.java AbstractTest.java
DefaultReverseTableIteratorTest.java
DefaultTableIteratorTest.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: AbstractDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AbstractDataSetTest.java 16 Feb 2003 06:01:00 -0000 1.19
--- AbstractDataSetTest.java 9 Apr 2003 22:52:13 -0000 1.20
***************
*** 25,31 ****
import org.dbunit.database.AmbiguousTableNameException;
! import java.util.*;
!
! import junit.framework.TestCase;
/**
--- 25,31 ----
import org.dbunit.database.AmbiguousTableNameException;
! import java.util.ArrayList;
! import java.util.Arrays;
! import java.util.List;
/**
***************
*** 33,53 ****
* @version $Revision$
*/
! public abstract class AbstractDataSetTest extends TestCase
{
- private static final String[] TABLE_NAMES = {
- "TEST_TABLE",
- "SECOND_TABLE",
- "EMPTY_TABLE",
- "PK_TABLE",
- "ONLY_PK_TABLE",
- "EMPTY_MULTITYPE_TABLE",
- };
-
- private static final String[] DUPLICATE_TABLE_NAMES = {
- "DUPLICATE_TABLE",
- "EMPTY_TABLE",
- "DUPLICATE_TABLE",
- };
-
public AbstractDataSetTest(String s)
{
--- 33,38 ----
* @version $Revision$
*/
! public abstract class AbstractDataSetTest extends AbstractTest
{
public AbstractDataSetTest(String s)
{
***************
*** 55,79 ****
}
- protected String[] getExpectedNames() throws Exception
- {
- return (String[])TABLE_NAMES.clone();
- }
-
- protected String[] getExpectedLowerNames() throws Exception
- {
- String[] names = (String[])TABLE_NAMES.clone();
- for (int i = 0; i < names.length; i++)
- {
- names[i] = names[i].toLowerCase();
- }
-
- return names;
- }
-
- protected String[] getExpectedDuplicateNames()
- {
- return (String[])DUPLICATE_TABLE_NAMES.clone();
- }
-
protected int[] getExpectedDuplicateRows()
{
--- 40,43 ----
***************
*** 81,94 ****
}
- protected String getDuplicateTableName()
- {
- return "DUPLICATE_TABLE";
- }
-
/**
* This method exclude BLOB_TABLE and CLOB_TABLE from the specified dataset
* because BLOB and CLOB are not supported by all database vendor. It also excludes
* tables with Identity columns (MSSQL) becasuse they are specific to MSSQL.
! * @todo Should be refactored into thee various DatabaseEnvironments!
*/
public static IDataSet removeExtraTestTables(IDataSet dataSet) throws Exception
--- 45,53 ----
}
/**
* This method exclude BLOB_TABLE and CLOB_TABLE from the specified dataset
* because BLOB and CLOB are not supported by all database vendor. It also excludes
* tables with Identity columns (MSSQL) becasuse they are specific to MSSQL.
! * TODO : should be refactored into thee various DatabaseEnvironments!
*/
public static IDataSet removeExtraTestTables(IDataSet dataSet) throws Exception
***************
*** 130,138 ****
{
IDataSet dataSet = createDuplicateDataSet();
! ITable lowerTable = dataSet.getTables()[0];
dataSet = new DefaultDataSet(new ITable[]{
new CompositeTable(getDuplicateTableName().toLowerCase(), lowerTable),
! dataSet.getTables()[1],
! dataSet.getTables()[2],
});
return dataSet;
--- 89,98 ----
{
IDataSet dataSet = createDuplicateDataSet();
! ITable[] tables = DataSetUtils.getTables(dataSet.iterator());
! ITable lowerTable = tables[0];
dataSet = new DefaultDataSet(new ITable[]{
new CompositeTable(getDuplicateTableName().toLowerCase(), lowerTable),
! tables[1],
! tables[2],
});
return dataSet;
***************
*** 143,159 ****
protected abstract IDataSet createDuplicateDataSet() throws Exception;
- /**
- * Many tests in this class assume a known sequence of table. For some
- * IDataSet implemntation (like DatabaseDataSet) we can't predict
- * any specific order. For supporting them, this method is called for both
- * the expected names and dataset names before comparing them.
- * <p>
- * This method should do nothing for implemntation supporting ordered names.
- * Others should sort the specified array.
- */
- protected void sort(Object[] array)
- {
- }
-
protected void assertEqualsTableName(String mesage, String expected,
String actual)
--- 103,106 ----
***************
*** 165,173 ****
{
String[] expected = getExpectedNames();
! sort(expected);
! IDataSet dataSet = removeExtraTestTables(createDataSet());
String[] names = dataSet.getTableNames();
- sort(names);
assertEquals("table count", expected.length, names.length);
--- 112,120 ----
{
String[] expected = getExpectedNames();
! assertContainsIgnoreCase("minimal names subset",
! super.getExpectedNames(), expected);
! IDataSet dataSet = createDataSet();
String[] names = dataSet.getTableNames();
assertEquals("table count", expected.length, names.length);
***************
*** 218,228 ****
{
String[] expected = getExpectedNames();
- // sort(expected);
IDataSet dataSet = createDataSet();
- // String[] names = dataSet.getTableNames();
- // sort(names);
- // assertEquals("table count",
- // expected.length, dataSet.getTableNames().length);
for (int i = 0; i < expected.length; i++)
{
--- 165,170 ----
***************
*** 248,258 ****
{
String[] expected = getExpectedNames();
! sort(expected);
! IDataSet dataSet = removeExtraTestTables(createDataSet());
! String[] names = dataSet.getTableNames();
! sort(names);
ITable[] tables = dataSet.getTables();
- sort(tables);
assertEquals("table count", expected.length, tables.length);
--- 190,198 ----
{
String[] expected = getExpectedNames();
! assertContainsIgnoreCase("minimal names subset",
! super.getExpectedNames(), expected);
! IDataSet dataSet = createDataSet();
ITable[] tables = dataSet.getTables();
assertEquals("table count", expected.length, tables.length);
***************
*** 392,395 ****
--- 332,372 ----
}
}
+
+ public void testIterator() throws Exception
+ {
+ String[] expected = getExpectedNames();
+ assertContainsIgnoreCase("minimal names subset",
+ super.getExpectedNames(), expected);
+
+ int i = 0;
+ ITableIterator iterator = createDataSet().iterator();
+ while(iterator.next())
+ {
+ assertEqualsTableName("name " + i, expected[i],
+ iterator.getTableMetaData().getTableName());
+ i++;
+ }
+
+ assertEquals("table count", expected.length, i);
+ }
+
+ public void testReverseIterator() throws Exception
+ {
+ String[] expected = DataSetUtils.reverseStringArray(getExpectedNames());
+ assertContainsIgnoreCase("minimal names subset",
+ super.getExpectedNames(), expected);
+
+ int i = 0;
+ ITableIterator iterator = createDataSet().reverseIterator();
+ while(iterator.next())
+ {
+ assertEqualsTableName("name " + i, expected[i],
+ iterator.getTableMetaData().getTableName());
+ i++;
+ }
+
+ assertEquals("table count", expected.length, i);
+ }
+
}
Index: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AllTests.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AllTests.java 5 Apr 2003 14:34:26 -0000 1.16
--- AllTests.java 9 Apr 2003 22:52:14 -0000 1.17
***************
*** 48,51 ****
--- 48,53 ----
suite.addTest(new TestSuite(DataSetUtilsTest.class));
suite.addTest(new TestSuite(DefaultDataSetTest.class));
+ suite.addTest(new TestSuite(DefaultReverseTableIteratorTest.class));
+ suite.addTest(new TestSuite(DefaultTableIteratorTest.class));
suite.addTest(new TestSuite(DefaultTableMetaDataTest.class));
suite.addTest(new TestSuite(DefaultTableTest.class));
Index: CaseInsensitiveDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CaseInsensitiveDataSetTest.java 14 Feb 2003 03:21:59 -0000 1.4
--- CaseInsensitiveDataSetTest.java 9 Apr 2003 22:52:14 -0000 1.5
***************
*** 40,50 ****
}
! protected void assertEqualsTableName(String mesage, String expected,
String actual)
{
! if (!expected.equalsIgnoreCase(actual))
! {
! super.assertEqualsTableName(mesage, expected, actual);
! }
}
}
--- 40,47 ----
}
! protected void assertEqualsTableName(String message, String expected,
String actual)
{
! assertEqualsIgnoreCase(message, expected, actual);
}
}
Index: CompositeDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CompositeDataSetTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CompositeDataSetTest.java 15 Feb 2003 05:42:43 -0000 1.8
--- CompositeDataSetTest.java 9 Apr 2003 22:52:14 -0000 1.9
***************
*** 75,79 ****
assertEquals("table count before", 3, originaldataSet.getTableNames().length);
! IDataSet combinedDataSet = new CompositeDataSet(originaldataSet.getTables());
assertEquals("table count combined", 2, combinedDataSet.getTableNames().length);
}
--- 75,79 ----
assertEquals("table count before", 3, originaldataSet.getTableNames().length);
! IDataSet combinedDataSet = new CompositeDataSet(originaldataSet, true);
assertEquals("table count combined", 2, combinedDataSet.getTableNames().length);
}
|
|
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);
|
|
From: <mla...@us...> - 2003-04-09 22:52:46
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/test/org/dbunit
Modified Files:
AbstractDatabaseTest.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: AbstractDatabaseTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/AbstractDatabaseTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractDatabaseTest.java 16 Feb 2003 06:00:59 -0000 1.11
--- AbstractDatabaseTest.java 9 Apr 2003 22:52:12 -0000 1.12
***************
*** 26,29 ****
--- 26,30 ----
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.SortedTable;
import org.dbunit.operation.DatabaseOperation;
***************
*** 50,55 ****
throws Exception
{
! String sql = "select * from " + tableName + " order by " + orderByColumn;
! return _connection.createQueryTable(tableName, sql);
}
--- 51,58 ----
throws Exception
{
! return new SortedTable(_connection.createDataSet().getTable(tableName),
! new String[]{orderByColumn});
! // String sql = "select * from " + tableName + " order by " + orderByColumn;
! // return _connection.createQueryTable(tableName, sql);
}
|
|
From: <mla...@us...> - 2003-04-09 22:52:45
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/operation/mssqlserver
Modified Files:
InsertIdentityOperation.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: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InsertIdentityOperation.java 16 Feb 2003 17:41:14 -0000 1.14
--- InsertIdentityOperation.java 9 Apr 2003 22:52:12 -0000 1.15
***************
*** 98,101 ****
--- 98,103 ----
try
{
+ IDataSet databaseDataSet = connection.createDataSet();
+
// INSERT_IDENTITY need to be enabled/disabled inside the
// same transaction
***************
*** 107,123 ****
// Execute decorated operation one table at a time
! ITable[] tables = dataSet.getTables();
! for (int i = 0; i < tables.length; i++)
{
! ITable table = tables[i];
!
! ITableMetaData databaseMetaData = table.getTableMetaData();
!
! if (!(databaseMetaData instanceof DatabaseTableMetaData)){
! databaseMetaData = new DatabaseTableMetaData(table.getTableMetaData().getTableName(),connection);
! }
String tableName = DataSetUtils.getQualifiedName(
connection.getSchema(),
! databaseMetaData.getTableName(), true);
// enable identity insert
--- 109,122 ----
// Execute decorated operation one table at a time
! ITableIterator iterator = dataSet.iterator();
! while(iterator.next())
{
! ITable table = iterator.getTable();
String tableName = DataSetUtils.getQualifiedName(
connection.getSchema(),
! table.getTableMetaData().getTableName(), true);
!
! ITableMetaData databaseMetaData =
! databaseDataSet.getTableMetaData(tableName);
// enable identity insert
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/operation
Modified Files:
AbstractBatchOperation.java DeleteAllOperation.java
DeleteOperation.java RefreshOperation.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: AbstractBatchOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AbstractBatchOperation.java 1 Apr 2003 02:01:42 -0000 1.16
--- AbstractBatchOperation.java 9 Apr 2003 22:52:11 -0000 1.17
***************
*** 72,76 ****
}
! return new DefaultTableMetaData(tableName,
(Column[])columnList.toArray(new Column[0]),
databaseMetaData.getPrimaryKeys());
--- 72,76 ----
}
! return new DefaultTableMetaData(databaseMetaData.getTableName(),
(Column[])columnList.toArray(new Column[0]),
databaseMetaData.getPrimaryKeys());
***************
*** 81,87 ****
* allow subclass to do filtering.
*/
! protected ITable[] getTables(IDataSet dataSet) throws DatabaseUnitException
{
! return dataSet.getTables();
}
--- 81,87 ----
* allow subclass to do filtering.
*/
! protected ITableIterator iterator(IDataSet dataSet) throws DatabaseUnitException
{
! return dataSet.iterator();
}
***************
*** 96,106 ****
{
IStatementFactory factory = connection.getStatementFactory();
- ITable[] tables = getTables(dataSet);
// for each table
! for (int i = 0; i < tables.length; i++)
{
// do not process empty table
- ITable table = tables[i];
if (table.getRowCount() == 0)
{
--- 96,107 ----
{
IStatementFactory factory = connection.getStatementFactory();
// for each table
! ITableIterator iterator = iterator(dataSet);
! while(iterator.next())
{
+ ITable table = iterator.getTable();
+
// do not process empty table
if (table.getRowCount() == 0)
{
***************
*** 108,112 ****
}
- // String tableName = tableNames[i];
ITableMetaData metaData = getOperationMetaData(connection,
table.getTableMetaData());
--- 109,112 ----
***************
*** 123,134 ****
// for each row
int rowCount = table.getRowCount();
! for (int j = 0; j < rowCount; j++)
{
! int row = _reverseRowOrder ? (rowCount - 1 - j) : j;
// for each column
! for (int k = 0; k < columns.length; k++)
{
! Column column = columns[k];
statement.addValue(table.getValue(row,
column.getColumnName()), column.getDataType());
--- 123,134 ----
// for each row
int rowCount = table.getRowCount();
! for (int i = 0; i < rowCount; i++)
{
! int row = _reverseRowOrder ? (rowCount - 1 - i) : i;
// for each column
! for (int j = 0; j < columns.length; j++)
{
! Column column = columns[j];
statement.addValue(table.getValue(row,
column.getColumnName()), column.getDataType());
Index: DeleteAllOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteAllOperation.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DeleteAllOperation.java 19 Feb 2003 21:45:33 -0000 1.13
--- DeleteAllOperation.java 9 Apr 2003 22:52:11 -0000 1.14
***************
*** 58,78 ****
try
{
! String[] tableNames = DataSetUtils.getReverseTableNames(dataSet);
! if (tableNames.length > 0)
{
! for (int i = 0; i < tableNames.length; i++)
! {
! // Use database table name. Required to support case sensitive database.
! ITableMetaData databaseMetaData =
! databaseDataSet.getTableMetaData(tableNames[i]);
! String tableName = databaseMetaData.getTableName();
! StringBuffer sqlBuffer = new StringBuffer(128);
! sqlBuffer.append("delete from ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! connection.getSchema(), tableName, true));
! statement.addBatch(sqlBuffer.toString());
! }
statement.executeBatch();
statement.clearBatch();
--- 58,84 ----
try
{
! int count = 0;
! ITableIterator iterator = dataSet.reverseIterator();
! while(iterator.next())
{
! String tableName = iterator.getTableMetaData().getTableName();
! // Use database table name. Required to support case sensitive database.
! ITableMetaData databaseMetaData =
! databaseDataSet.getTableMetaData(tableName);
! tableName = databaseMetaData.getTableName();
+ StringBuffer sqlBuffer = new StringBuffer(128);
+ sqlBuffer.append("delete from ");
+ sqlBuffer.append(DataSetUtils.getQualifiedName(
+ connection.getSchema(), tableName, true));
+ statement.addBatch(sqlBuffer.toString());
+
+ count++;
+ }
+
+
+ if (count > 0)
+ {
statement.executeBatch();
statement.clearBatch();
Index: DeleteOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DeleteOperation.java 1 Apr 2003 02:01:43 -0000 1.12
--- DeleteOperation.java 9 Apr 2003 22:52:11 -0000 1.13
***************
*** 44,56 ****
// AbstractBatchOperation class
! protected ITable[] getTables(IDataSet dataSet) throws DatabaseUnitException
{
! ITable[] tables = dataSet.getTables();
! ITable[] reverseTables = new ITable[tables.length];
! for (int i = 0; i < tables.length; i++)
! {
! reverseTables[tables.length - 1 - i] = tables[i];
! }
! return reverseTables;
}
--- 44,50 ----
// AbstractBatchOperation class
! protected ITableIterator iterator(IDataSet dataSet) throws DatabaseUnitException
{
! return dataSet.reverseIterator();
}
Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** RefreshOperation.java 27 Mar 2003 22:34:55 -0000 1.23
--- RefreshOperation.java 9 Apr 2003 22:52:12 -0000 1.24
***************
*** 60,68 ****
// for each table
! ITable[] tables = dataSet.getTables();
! for (int i = 0; i < tables.length; i++)
{
// do not process empty table
- ITable table = tables[i];
if (table.getRowCount() == 0)
{
--- 60,69 ----
// for each table
! ITableIterator iterator = dataSet.iterator();
! while(iterator.next())
{
+ ITable table = iterator.getTable();
+
// do not process empty table
if (table.getRowCount() == 0)
{
***************
*** 78,86 ****
// refresh all rows
! for (int j = 0; j < table.getRowCount(); j++)
{
! if (!updateRowOperation.execute(table, j))
{
! insertRowOperation.execute(table, j);
}
}
--- 79,87 ----
// refresh all rows
! for (int i = 0; i < table.getRowCount(); i++)
{
! if (!updateRowOperation.execute(table, i))
{
! insertRowOperation.execute(table, i);
}
}
|
|
From: <mla...@us...> - 2003-04-09 22:52:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/dataset/xml Modified Files: FlatDtdDataSet.java FlatXmlDataSet.java XmlDataSet.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: FlatDtdDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FlatDtdDataSet.java 1 Mar 2003 06:51:17 -0000 1.6 --- FlatDtdDataSet.java 9 Apr 2003 22:52:10 -0000 1.7 *************** *** 13,22 **** import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; - import org.dbunit.database.AmbiguousTableNameException; ! import java.io.*; ! import java.util.*; ! import com.wutka.dtd.*; /** --- 13,40 ---- import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; ! import com.wutka.dtd.DTD; ! import com.wutka.dtd.DTDAttlist; ! import com.wutka.dtd.DTDAttribute; ! import com.wutka.dtd.DTDContainer; ! import com.wutka.dtd.DTDDecl; ! import com.wutka.dtd.DTDItem; ! import com.wutka.dtd.DTDName; ! import com.wutka.dtd.DTDParser; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; ! import java.io.OutputStreamWriter; ! import java.io.PrintWriter; ! import java.io.Reader; ! import java.io.Writer; ! import java.util.ArrayList; ! import java.util.Arrays; ! import java.util.HashMap; ! import java.util.List; ! import java.util.Map; ! import java.util.Vector; /** *************** *** 150,183 **** //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! ! public String[] getTableNames() throws DataSetException ! { ! return (String[])_tableNames.toArray(new String[0]); ! } ! ! // public ITableMetaData getTableMetaData(String tableName) ! // throws DataSetException ! // { ! // return getTable(tableName).getTableMetaData(); ! // } ! // ! // public ITable getTable(String tableName) throws DataSetException ! // { ! // if (_tableNames.indexOf(tableName) != _tableNames.lastIndexOf(tableName)) ! // { ! // throw new AmbiguousTableNameException(tableName); ! // } ! // ! // ITable table = (ITable)_tableMap.get(tableName); ! // if (table == null) ! // { ! // throw new NoSuchTableException(tableName); ! // } ! // ! // return table; ! // } ! public ITable[] getTables() throws DataSetException { String[] names = (String[])_tableNames.toArray(new String[0]); --- 168,175 ---- //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITableIterator createIterator(boolean reversed) ! throws DataSetException { String[] names = (String[])_tableNames.toArray(new String[0]); *************** *** 195,202 **** } ! return tables; } } --- 187,202 ---- } ! return new DefaultTableIterator(tables, reversed); } + //////////////////////////////////////////////////////////////////////////// + // IDataSet interface + + public String[] getTableNames() throws DataSetException + { + return (String[])_tableNames.toArray(new String[0]); + } } + Index: FlatXmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** FlatXmlDataSet.java 11 Mar 2003 13:00:07 -0000 1.20 --- FlatXmlDataSet.java 9 Apr 2003 22:52:10 -0000 1.21 *************** *** 23,31 **** package org.dbunit.dataset.xml; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; ! import java.io.*; import java.net.MalformedURLException; import java.net.URL; --- 23,53 ---- package org.dbunit.dataset.xml; ! import org.dbunit.dataset.AbstractDataSet; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.DefaultTableIterator; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.ITableMetaData; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.TypeCastException; ! import electric.xml.DocType; ! import electric.xml.Document; ! import electric.xml.Element; ! import electric.xml.Elements; ! import electric.xml.ParseException; ! import electric.xml.XMLDecl; ! ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileReader; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; ! import java.io.Reader; ! import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; *************** *** 33,38 **** import java.util.List; - import electric.xml.*; - /** * @author Manuel Laflamme --- 55,58 ---- *************** *** 288,293 **** throws DataSetException { - ITable[] tables = dataSet.getTables(); - Document document = new Document(); document.addChild(new XMLDecl("1.0", encoding)); --- 308,311 ---- *************** *** 297,304 **** // tables ! for (int i = 0; i < tables.length; i++) { ! ITable table = tables[i]; ! ITableMetaData metaData = tables[i].getTableMetaData(); String tableName = metaData.getTableName(); --- 315,323 ---- // tables ! ITableIterator iterator = dataSet.iterator(); ! while(iterator.next()) { ! ITable table = iterator.getTable(); ! ITableMetaData metaData = table.getTableMetaData(); String tableName = metaData.getTableName(); *************** *** 423,433 **** //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } - } --- 442,452 ---- //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITableIterator createIterator(boolean reversed) ! throws DataSetException { ! return new DefaultTableIterator(_tables, reversed); } } Index: XmlDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/XmlDataSet.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** XmlDataSet.java 11 Mar 2003 13:00:07 -0000 1.15 --- XmlDataSet.java 9 Apr 2003 22:52:11 -0000 1.16 *************** *** 137,142 **** throws DataSetException { - ITable[] tables = dataSet.getTables(); - Document document = new Document(); document.addChild(new XMLDecl("1.0", encoding)); --- 137,140 ---- *************** *** 144,151 **** // dataset Element rootElem = document.addElement("dataset"); ! for (int i = 0; i < tables.length; i++) { ! ITable table = tables[i]; ! ITableMetaData metaData = tables[i].getTableMetaData(); String tableName = metaData.getTableName(); --- 142,150 ---- // dataset Element rootElem = document.addElement("dataset"); ! ITableIterator iterator = dataSet.iterator(); ! while(iterator.next()) { ! ITable table = iterator.getTable(); ! ITableMetaData metaData = table.getTableMetaData(); String tableName = metaData.getTableName(); *************** *** 215,225 **** //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } - } --- 214,224 ---- //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITableIterator createIterator(boolean reversed) ! throws DataSetException { ! return new DefaultTableIterator(_tables, reversed); } } |
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/dataset/filter
Modified Files:
AbstractTableFilter.java ITableFilter.java
SequenceTableFilter.java
Added Files:
SequenceTableIterator.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: AbstractTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/AbstractTableFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractTableFilter.java 11 Mar 2003 13:26:03 -0000 1.1
--- AbstractTableFilter.java 9 Apr 2003 22:52:10 -0000 1.2
***************
*** 24,31 ****
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.NoSuchTableException;
- import java.util.List;
import java.util.ArrayList;
/**
--- 24,32 ----
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.ITableIterator;
! import org.dbunit.dataset.ITableMetaData;
import java.util.ArrayList;
+ import java.util.List;
/**
***************
*** 59,76 ****
}
! public ITable[] getTables(IDataSet dataSet) throws DataSetException
{
! ITable[] tables = dataSet.getTables();
! List tableList = new ArrayList();
! for (int i = 0; i < tables.length; i++)
{
! ITable table = tables[i];
! String tableName = table.getTableMetaData().getTableName();
! if (isValidName(tableName))
{
! tableList.add(table);
}
}
- return (ITable[])tableList.toArray(new ITable[0]);
}
}
--- 60,106 ----
}
! public ITableIterator iterator(IDataSet dataSet, boolean reversed)
! throws DataSetException
{
! return new FilterIterator(reversed ?
! dataSet.reverseIterator() : dataSet.iterator());
! }
!
! ////////////////////////////////////////////////////////////////////////////
! // FilterIterator class
!
! private class FilterIterator implements ITableIterator
! {
! private final ITableIterator _iterator;
!
! public FilterIterator(ITableIterator iterator)
{
! _iterator = iterator;
! }
!
! ////////////////////////////////////////////////////////////////////////////
! // ITableIterator interface
!
! public boolean next() throws DataSetException
! {
! while(_iterator.next())
{
! if (isValidName(_iterator.getTableMetaData().getTableName()))
! {
! return true;
! }
}
+ return false;
+ }
+
+ public ITableMetaData getTableMetaData() throws DataSetException
+ {
+ return _iterator.getTableMetaData();
+ }
+
+ public ITable getTable() throws DataSetException
+ {
+ return _iterator.getTable();
}
}
}
Index: ITableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/ITableFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ITableFilter.java 11 Mar 2003 13:26:03 -0000 1.1
--- ITableFilter.java 9 Apr 2003 22:52:10 -0000 1.2
***************
*** 49,56 ****
/**
! * Returns the tables allowed by this filter from the specified dataset.
*
* @param dataSet the filtered dataset
*/
! public ITable[] getTables(IDataSet dataSet) throws DataSetException;
}
--- 49,57 ----
/**
! * Returns iterator of tables allowed by this filter from the specified dataset.
*
* @param dataSet the filtered dataset
*/
! public ITableIterator iterator(IDataSet dataSet, boolean reversed)
! throws DataSetException;
}
Index: SequenceTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/SequenceTableFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequenceTableFilter.java 11 Mar 2003 13:26:03 -0000 1.1
--- SequenceTableFilter.java 9 Apr 2003 22:52:10 -0000 1.2
***************
*** 105,119 ****
}
! public ITable[] getTables(IDataSet dataSet) throws DataSetException
{
- List tableList = new ArrayList();
String[] tableNames = getTableNames(dataSet);
! for (int i = 0; i < tableNames.length; i++)
! {
! String tableName = tableNames[i];
! tableList.add(dataSet.getTable(tableName));
! }
!
! return (ITable[])tableList.toArray(new ITable[0]);
}
}
--- 105,114 ----
}
! public ITableIterator iterator(IDataSet dataSet, boolean reversed)
! throws DataSetException
{
String[] tableNames = getTableNames(dataSet);
! return new SequenceTableIterator(reversed ?
! DataSetUtils.reverseStringArray(tableNames) : tableNames, dataSet);
}
}
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/dataset
Modified Files:
AbstractDataSet.java CaseInsensitiveDataSet.java
CompositeDataSet.java DataSetUtils.java DefaultDataSet.java
FilteredDataSet.java IDataSet.java LowerCaseDataSet.java
ReplacementDataSet.java SortedDataSet.java SortedTable.java
Added Files:
DefaultTableIterator.java ITableIterator.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: AbstractDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/AbstractDataSet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractDataSet.java 13 Feb 2003 04:32:42 -0000 1.9
--- AbstractDataSet.java 9 Apr 2003 22:52:08 -0000 1.10
***************
*** 26,33 ****
import java.util.Arrays;
/**
* This abstract class provides the basic implementation of the IDataSet
! * interface. Subclass are only required to implement the {@link #getTables}
* method.
*
--- 26,35 ----
import java.util.Arrays;
+ import java.util.List;
+ import java.util.ArrayList;
/**
* This abstract class provides the basic implementation of the IDataSet
! * interface. Subclass are only required to implement the {@link #createIterator}
* method.
*
***************
*** 47,50 ****
--- 49,55 ----
}
+ protected abstract ITableIterator createIterator(boolean reversed)
+ throws DataSetException;
+
////////////////////////////////////////////////////////////////////////////
// IDataSet interface
***************
*** 52,63 ****
public String[] getTableNames() throws DataSetException
{
! ITable[] tables = getTables();
! String[] tableNames = new String[tables.length];
! for (int i = 0; i < tables.length; i++)
{
! ITable table = tables[i];
! tableNames[i] = table.getTableMetaData().getTableName();
}
! return tableNames;
}
--- 57,67 ----
public String[] getTableNames() throws DataSetException
{
! List tableNameList = new ArrayList();
! ITableIterator iterator = createIterator(false);
! while (iterator.next())
{
! tableNameList.add(iterator.getTableMetaData().getTableName());
}
! return (String[])tableNameList.toArray(new String[0]);
}
***************
*** 70,77 ****
{
ITable found = null;
! ITable[] tables = getTables();
! for (int i = 0; i < tables.length; i++)
{
! ITable table = tables[i];
if (tableName.equalsIgnoreCase(table.getTableMetaData().getTableName()))
{
--- 74,81 ----
{
ITable found = null;
! ITableIterator iterator = createIterator(false);
! while (iterator.next())
{
! ITable table = iterator.getTable();
if (tableName.equalsIgnoreCase(table.getTableMetaData().getTableName()))
{
***************
*** 91,94 ****
--- 95,119 ----
throw new NoSuchTableException(tableName);
+ }
+
+ public ITable[] getTables() throws DataSetException
+ {
+ List tableList = new ArrayList();
+ ITableIterator iterator = createIterator(false);
+ while (iterator.next())
+ {
+ tableList.add(iterator.getTable());
+ }
+ return (ITable[])tableList.toArray(new ITable[0]);
+ }
+
+ public ITableIterator iterator() throws DataSetException
+ {
+ return createIterator(false);
+ }
+
+ public ITableIterator reverseIterator() throws DataSetException
+ {
+ return createIterator(true);
}
Index: CaseInsensitiveDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CaseInsensitiveDataSet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CaseInsensitiveDataSet.java 26 Feb 2003 22:52:47 -0000 1.6
--- CaseInsensitiveDataSet.java 9 Apr 2003 22:52:08 -0000 1.7
***************
*** 22,26 ****
* @deprecated All IDataSet implementations are case insensitive since DbUnit 1.5
*/
! public class CaseInsensitiveDataSet implements IDataSet
{
private final IDataSet _dataSet;
--- 22,26 ----
* @deprecated All IDataSet implementations are case insensitive since DbUnit 1.5
*/
! public class CaseInsensitiveDataSet extends AbstractDataSet
{
private final IDataSet _dataSet;
***************
*** 56,59 ****
--- 56,69 ----
////////////////////////////////////////////////////////////////////////////
+ // AbstractDataSet class
+
+ protected ITableIterator createIterator(boolean reversed)
+ throws DataSetException
+ {
+ return new CaseInsensitiveIterator(reversed ?
+ _dataSet.reverseIterator() : _dataSet.iterator());
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
// IDataSet interface
***************
*** 75,81 ****
}
! public ITable[] getTables() throws DataSetException
{
! return _dataSet.getTables();
}
}
--- 85,117 ----
}
! ////////////////////////////////////////////////////////////////////////////
! // CaseInsensitiveIterator class
!
! private class CaseInsensitiveIterator implements ITableIterator
{
! private final ITableIterator _iterator;
!
! public CaseInsensitiveIterator(ITableIterator iterator)
! {
! _iterator = iterator;
! }
!
! ////////////////////////////////////////////////////////////////////////
! // ITableIterator interface
!
! public boolean next() throws DataSetException
! {
! return _iterator.next();
! }
!
! public ITableMetaData getTableMetaData() throws DataSetException
! {
! return _iterator.getTableMetaData();
! }
!
! public ITable getTable() throws DataSetException
! {
! return new CaseInsensitiveTable(_iterator.getTable());
! }
}
}
Index: CompositeDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CompositeDataSet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CompositeDataSet.java 15 Feb 2003 05:42:42 -0000 1.11
--- CompositeDataSet.java 9 Apr 2003 22:52:08 -0000 1.12
***************
*** 101,104 ****
--- 101,119 ----
/**
+ * Creates a composite dataset that combines dsuplicate tables of the specified dataset.
+ *
+ * @param dataSet
+ * the dataset
+ * @param combine
+ * if <code>true</code>, tables having the same name are merged into
+ * one table.
+ */
+ public CompositeDataSet(IDataSet dataSet, boolean combine)
+ throws DataSetException
+ {
+ this(new IDataSet[]{dataSet}, combine);
+ }
+
+ /**
* Creates a composite dataset that combines tables having identical name.
* Tables having the same name are merged into one table.
***************
*** 109,113 ****
}
! private ITable[] combineTables(ITable[] tables) throws DataSetException
{
List tableList = new ArrayList();
--- 124,128 ----
}
! private ITable[] combineTables(ITable[] tables) //throws DataSetException
{
List tableList = new ArrayList();
***************
*** 152,160 ****
////////////////////////////////////////////////////////////////////////////
! // IDataSet interface
! public ITable[] getTables() throws DataSetException
{
! return cloneTables(_tables);
}
}
--- 167,176 ----
////////////////////////////////////////////////////////////////////////////
! // AbstractDataSet class
! protected ITableIterator createIterator(boolean reversed)
! throws DataSetException
{
! return new DefaultTableIterator(_tables, reversed);
}
}
Index: DataSetUtils.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DataSetUtils.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DataSetUtils.java 11 Mar 2003 13:26:03 -0000 1.15
--- DataSetUtils.java 9 Apr 2003 22:52:09 -0000 1.16
***************
*** 28,31 ****
--- 28,33 ----
import java.util.StringTokenizer;
+ import java.util.List;
+ import java.util.ArrayList;
/**
***************
*** 234,239 ****
public static ITable[] getTables(IDataSet dataSet) throws DataSetException
{
! // return getTables(dataSet.getTableNames(), dataSet);
! return dataSet.getTables();
}
--- 236,253 ----
public static ITable[] getTables(IDataSet dataSet) throws DataSetException
{
! return getTables(dataSet.iterator());
! }
!
! /**
! * Returns the tables from the specified iterator.
! */
! public static ITable[] getTables(ITableIterator iterator) throws DataSetException
! {
! List tableList = new ArrayList();
! while(iterator.next())
! {
! tableList.add(iterator.getTable());
! }
! return (ITable[])tableList.toArray(new ITable[0]);
}
Index: DefaultDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DefaultDataSet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DefaultDataSet.java 1 Apr 2003 21:15:37 -0000 1.10
--- DefaultDataSet.java 9 Apr 2003 22:52:09 -0000 1.11
***************
*** 23,29 ****
package org.dbunit.dataset;
- import java.util.List;
import java.util.ArrayList;
! import java.util.Arrays;
--- 23,28 ----
package org.dbunit.dataset;
import java.util.ArrayList;
! import java.util.List;
***************
*** 68,76 ****
////////////////////////////////////////////////////////////////////////////
! // IDataSet interface
! public ITable[] getTables() throws DataSetException
{
! return (ITable[])_tableList.toArray(new ITable[0]);
}
}
--- 67,77 ----
////////////////////////////////////////////////////////////////////////////
! // AbstractDataSet class
! protected ITableIterator createIterator(boolean reversed)
! throws DataSetException
{
! ITable[] tables = (ITable[])_tableList.toArray(new ITable[0]);
! return new DefaultTableIterator(tables, reversed);
}
}
Index: FilteredDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/FilteredDataSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FilteredDataSet.java 11 Mar 2003 13:26:03 -0000 1.12
--- FilteredDataSet.java 9 Apr 2003 22:52:09 -0000 1.13
***************
*** 39,43 ****
* @version $Revision$
*/
! public class FilteredDataSet implements IDataSet
{
private final IDataSet _dataSet;
--- 39,43 ----
* @version $Revision$
*/
! public class FilteredDataSet extends AbstractDataSet
{
private final IDataSet _dataSet;
***************
*** 69,72 ****
--- 69,81 ----
////////////////////////////////////////////////////////////////////////////
+ // AbstractDataSet class
+
+ protected ITableIterator createIterator(boolean reversed)
+ throws DataSetException
+ {
+ return _filter.iterator(_dataSet, reversed);
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
// IDataSet interface
***************
*** 96,105 ****
return _dataSet.getTable(tableName);
}
-
- public ITable[] getTables() throws DataSetException
- {
- return _filter.getTables(_dataSet);
- }
-
}
--- 105,108 ----
Index: IDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/IDataSet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IDataSet.java 11 Mar 2003 13:03:21 -0000 1.11
--- IDataSet.java 9 Apr 2003 22:52:09 -0000 1.12
***************
*** 34,40 ****
{
/**
! * Returns table names this dataset contains. Multiple occurence of a name
! * may be present in the returned list if the dataset contains multiple
! * tables having the same name.
*/
public String[] getTableNames() throws DataSetException;
--- 34,40 ----
{
/**
! * Returns names of tables in this dataset in proper sequence. Multiple
! * occurence of the same name may be returned if multiple tables having
! * the same name are present in the dataset.
*/
public String[] getTableNames() throws DataSetException;
***************
*** 44,48 ****
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
--- 44,48 ----
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #iterator} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
***************
*** 56,60 ****
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
--- 56,60 ----
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #iterator} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
***************
*** 64,71 ****
/**
! * Returns tables contained by this dataset. Multiple table having the same
! * name but different data may be returned.
*/
public ITable[] getTables() throws DataSetException;
}
--- 64,83 ----
/**
! * Returns tables in this dataset in proper sequence. Multiple tables having
! * the same name but different data may be returned.
! *
! * @deprecated Use {@link #iterator} or {@link #reverseIterator} instead.
*/
public ITable[] getTables() throws DataSetException;
+
+ /**
+ * Returns an iterator over the tables in this dataset in proper sequence.
+ */
+ public ITableIterator iterator() throws DataSetException;
+
+ /**
+ * Returns an iterator over the tables in this dataset in reverse sequence.
+ */
+ public ITableIterator reverseIterator() throws DataSetException;
}
Index: LowerCaseDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/LowerCaseDataSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LowerCaseDataSet.java 15 Feb 2003 05:42:42 -0000 1.1
--- LowerCaseDataSet.java 9 Apr 2003 22:52:09 -0000 1.2
***************
*** 34,57 ****
public class LowerCaseDataSet extends AbstractDataSet
{
! private final ITable[] _tables;
public LowerCaseDataSet(ITable table) throws DataSetException
{
! this(new ITable[]{table});
}
! public LowerCaseDataSet(IDataSet dataSet) throws DataSetException
{
! this(dataSet.getTables());
}
! public LowerCaseDataSet(ITable[] tables) throws DataSetException
{
! ITable[] lowerTables = new ITable[tables.length];
! for (int i = 0; i < tables.length; i++)
! {
! lowerTables[i] = createLowerTable(tables[i]);
! }
! _tables = lowerTables;
}
--- 34,52 ----
public class LowerCaseDataSet extends AbstractDataSet
{
! private final IDataSet _dataSet;
public LowerCaseDataSet(ITable table) throws DataSetException
{
! this(new DefaultDataSet(table));
}
! public LowerCaseDataSet(ITable[] tables) throws DataSetException
{
! this(new DefaultDataSet(tables));
}
! public LowerCaseDataSet(IDataSet dataSet) throws DataSetException
{
! _dataSet = dataSet;
}
***************
*** 63,71 ****
////////////////////////////////////////////////////////////////////////////
// IDataSet interface
! public ITable[] getTables() throws DataSetException
{
! return cloneTables(_tables);
}
}
--- 58,122 ----
////////////////////////////////////////////////////////////////////////////
+ // AbstractDataSet class
+
+ protected ITableIterator createIterator(boolean reversed)
+ throws DataSetException
+ {
+ return new LowerCaseIterator(reversed ?
+ _dataSet.reverseIterator() : _dataSet.iterator());
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
// IDataSet interface
! public String[] getTableNames() throws DataSetException
{
! String[] tableNames = super.getTableNames();
! for (int i = 0; i < tableNames.length; i++)
! {
! tableNames[i] = tableNames[i].toLowerCase();
! }
! return tableNames;
! }
!
! public ITableMetaData getTableMetaData(String tableName) throws DataSetException
! {
! return new LowerCaseTableMetaData(super.getTableMetaData(tableName));
! }
!
! public ITable getTable(String tableName) throws DataSetException
! {
! return createLowerTable(super.getTable(tableName));
! }
!
! ////////////////////////////////////////////////////////////////////////////
! // LowerCaseIterator class
!
! private class LowerCaseIterator implements ITableIterator
! {
! private final ITableIterator _iterator;
!
! public LowerCaseIterator(ITableIterator iterator)
! {
! _iterator = iterator;
! }
!
! ////////////////////////////////////////////////////////////////////////
! // ITableIterator interface
!
! public boolean next() throws DataSetException
! {
! return _iterator.next();
! }
!
! public ITableMetaData getTableMetaData() throws DataSetException
! {
! return new LowerCaseTableMetaData(_iterator.getTableMetaData());
! }
!
! public ITable getTable() throws DataSetException
! {
! return createLowerTable(_iterator.getTable());
! }
}
}
Index: ReplacementDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/ReplacementDataSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReplacementDataSet.java 23 Mar 2003 04:31:55 -0000 1.4
--- ReplacementDataSet.java 9 Apr 2003 22:52:09 -0000 1.5
***************
*** 21,27 ****
package org.dbunit.dataset;
- import java.util.ArrayList;
import java.util.HashMap;
- import java.util.List;
import java.util.Map;
--- 21,25 ----
***************
*** 34,38 ****
* @version $Revision$
*/
! public class ReplacementDataSet implements IDataSet
{
private final IDataSet _dataSet;
--- 32,36 ----
* @version $Revision$
*/
! public class ReplacementDataSet extends AbstractDataSet
{
private final IDataSet _dataSet;
***************
*** 118,121 ****
--- 116,129 ----
////////////////////////////////////////////////////////////////////////////
+ // AbstractDataSet class
+
+ protected ITableIterator createIterator(boolean reversed)
+ throws DataSetException
+ {
+ return new ReplacementIterator(reversed ?
+ _dataSet.reverseIterator() : _dataSet.iterator());
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
// IDataSet interface
***************
*** 136,149 ****
}
! public ITable[] getTables() throws DataSetException
{
! List tableList = new ArrayList();
! ITable[] tables = _dataSet.getTables();
! for (int i = 0; i < tables.length; i++)
{
! ITable table = tables[i];
! tableList.add(createReplacementTable(table));
}
- return (ITable[])tableList.toArray(new ITable[0]);
}
}
--- 144,176 ----
}
! ////////////////////////////////////////////////////////////////////////////
! // ReplacementIterator class
!
! private class ReplacementIterator implements ITableIterator
{
! private final ITableIterator _iterator;
!
! public ReplacementIterator(ITableIterator iterator)
{
! _iterator = iterator;
! }
!
! ////////////////////////////////////////////////////////////////////////
! // ITableIterator interface
!
! public boolean next() throws DataSetException
! {
! return _iterator.next();
! }
!
! public ITableMetaData getTableMetaData() throws DataSetException
! {
! return _iterator.getTableMetaData();
! }
!
! public ITable getTable() throws DataSetException
! {
! return createReplacementTable(_iterator.getTable());
}
}
}
Index: SortedDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/SortedDataSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SortedDataSet.java 20 Feb 2003 03:55:17 -0000 1.1
--- SortedDataSet.java 9 Apr 2003 22:52:09 -0000 1.2
***************
*** 30,44 ****
public class SortedDataSet extends AbstractDataSet
{
! private final ITable[] _tables;
public SortedDataSet(IDataSet dataSet) throws DataSetException
{
! ITable[] tables = dataSet.getTables();
! for (int i = 0; i < tables.length; i++)
! {
! tables[i] = new SortedTable(tables[i]);
! }
! _tables = tables;
}
--- 30,48 ----
public class SortedDataSet extends AbstractDataSet
{
! private final IDataSet _dataSet;
public SortedDataSet(IDataSet dataSet) throws DataSetException
{
! _dataSet = dataSet;
! }
! ////////////////////////////////////////////////////////////////////////////
! // AbstractDataSet class
!
! protected ITableIterator createIterator(boolean reversed)
! throws DataSetException
! {
! return new SortedIterator(reversed ?
! _dataSet.reverseIterator() : _dataSet.iterator());
}
***************
*** 46,53 ****
// IDataSet interface
! public ITable[] getTables() throws DataSetException
{
! return cloneTables(_tables);
}
}
--- 50,99 ----
// IDataSet interface
! public String[] getTableNames() throws DataSetException
{
! return _dataSet.getTableNames();
! }
!
! public ITableMetaData getTableMetaData(String tableName) throws DataSetException
! {
! return _dataSet.getTableMetaData(tableName);
! }
!
! public ITable getTable(String tableName) throws DataSetException
! {
! return new SortedTable(_dataSet.getTable(tableName));
}
+
+ ////////////////////////////////////////////////////////////////////////////
+ // SortedIterator class
+
+ private class SortedIterator implements ITableIterator
+ {
+ private final ITableIterator _iterator;
+
+ public SortedIterator(ITableIterator iterator)
+ {
+ _iterator = iterator;
+ }
+
+ ////////////////////////////////////////////////////////////////////////
+ // ITableIterator interface
+
+ public boolean next() throws DataSetException
+ {
+ return _iterator.next();
+ }
+
+ public ITableMetaData getTableMetaData() throws DataSetException
+ {
+ return _iterator.getTableMetaData();
+ }
+
+ public ITable getTable() throws DataSetException
+ {
+ return new SortedTable(_iterator.getTable());
+ }
+ }
+
}
Index: SortedTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/SortedTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SortedTable.java 21 Feb 2003 13:13:17 -0000 1.3
--- SortedTable.java 9 Apr 2003 22:52:09 -0000 1.4
***************
*** 52,55 ****
--- 52,71 ----
/**
+ * Sort the decorated table by specified columns order.
+ */
+ public SortedTable(ITable table, String[] columnNames) throws DataSetException
+ {
+ _table = table;
+ _columns = new Column[columnNames.length];
+
+ Column[] columns = table.getTableMetaData().getColumns();
+ for (int i = 0; i < columnNames.length; i++)
+ {
+ String columnName = columnNames[i];
+ _columns[i] = DataSetUtils.getColumn(columnName, columns);
+ }
+ }
+
+ /**
* Sort the decorated table by specified metadata columns order. All
* metadata columns will be used.
|
|
From: <mla...@us...> - 2003-04-09 22:52:43
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/dataset/excel Modified Files: XlsDataSet.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: XlsDataSet.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel/XlsDataSet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XlsDataSet.java 23 Mar 2003 21:53:39 -0000 1.2 --- XlsDataSet.java 9 Apr 2003 22:52:10 -0000 1.3 *************** *** 19,26 **** package org.dbunit.dataset.excel; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; - import electric.xml.Document; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; --- 19,32 ---- package org.dbunit.dataset.excel; ! import org.dbunit.dataset.AbstractDataSet; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetException; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.ITableIterator; ! import org.dbunit.dataset.DefaultTableIterator; import org.dbunit.dataset.datatype.DataType; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; *************** *** 28,32 **** import org.apache.poi.hssf.usermodel.HSSFWorkbook; ! import java.io.*; /** --- 34,42 ---- import org.apache.poi.hssf.usermodel.HSSFWorkbook; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.OutputStream; /** *************** *** 73,86 **** HSSFWorkbook workbook = new HSSFWorkbook(); ! ITable[] tables = dataSet.getTables(); ! for (int i = 0; i < tables.length; i++) { // create the table i.e. sheet ! ITable table = tables[i]; ITableMetaData metaData = table.getTableMetaData(); HSSFSheet sheet = workbook.createSheet(metaData.getTableName()); // write table metadata i.e. first row in sheet ! workbook.setSheetName(i, metaData.getTableName()); HSSFRow headerRow = sheet.createRow(0); --- 83,97 ---- HSSFWorkbook workbook = new HSSFWorkbook(); ! int index = 0; ! ITableIterator iterator = dataSet.iterator(); ! while(iterator.next()) { // create the table i.e. sheet ! ITable table = iterator.getTable(); ITableMetaData metaData = table.getTableMetaData(); HSSFSheet sheet = workbook.createSheet(metaData.getTableName()); // write table metadata i.e. first row in sheet ! workbook.setSheetName(index, metaData.getTableName()); HSSFRow headerRow = sheet.createRow(0); *************** *** 109,112 **** --- 120,124 ---- } + index++; } *************** *** 117,125 **** //////////////////////////////////////////////////////////////////////////// ! // IDataSet interface ! public ITable[] getTables() throws DataSetException { ! return cloneTables(_tables); } } --- 129,138 ---- //////////////////////////////////////////////////////////////////////////// ! // AbstractDataSet class ! protected ITableIterator createIterator(boolean reversed) ! throws DataSetException { ! return new DefaultTableIterator(_tables, reversed); } } |
|
From: <mla...@us...> - 2003-04-09 22:52:42
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/java/org/dbunit/database
Modified Files:
DatabaseDataSet.java QueryDataSet.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: DatabaseDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DatabaseDataSet.java 14 Feb 2003 17:22:22 -0000 1.19
--- DatabaseDataSet.java 9 Apr 2003 22:52:08 -0000 1.20
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.dataset.*;
+ import org.dbunit.dataset.filter.SequenceTableIterator;
import java.sql.*;
***************
*** 32,36 ****
* @version $Revision$
*/
! public class DatabaseDataSet implements IDataSet
{
static final String QUALIFIED_TABLE_NAMES =
--- 33,37 ----
* @version $Revision$
*/
! public class DatabaseDataSet extends AbstractDataSet
{
static final String QUALIFIED_TABLE_NAMES =
***************
*** 39,43 ****
private final IDatabaseConnection _connection;
! private Map _tableMap = null;
DatabaseDataSet(IDatabaseConnection connection) throws SQLException
--- 40,45 ----
private final IDatabaseConnection _connection;
! private final Map _tableMap = new HashMap();
! private List _nameList = null;
DatabaseDataSet(IDatabaseConnection connection) throws SQLException
***************
*** 101,109 ****
* Get all the table names form the database that are not system tables.
*/
! private Map getTableMap() throws DataSetException
{
! if (_tableMap != null)
{
! return _tableMap;
}
--- 103,111 ----
* Get all the table names form the database that are not system tables.
*/
! private void initialize() throws DataSetException
{
! if (_nameList != null)
{
! return;
}
***************
*** 119,123 ****
try
{
! Map tableMap = new HashMap();
while (resultSet.next())
{
--- 121,125 ----
try
{
! List nameList = new ArrayList();
while (resultSet.next())
{
***************
*** 129,141 ****
// prevent table name conflict
! if (tableMap.containsKey(tableName))
{
throw new AmbiguousTableNameException(tableName);
}
! tableMap.put(tableName, null);
}
! _tableMap = tableMap;
! return _tableMap;
}
finally
--- 131,143 ----
// prevent table name conflict
! if (_tableMap.containsKey(tableName.toUpperCase()))
{
throw new AmbiguousTableNameException(tableName);
}
! nameList.add(tableName);
! _tableMap.put(tableName.toUpperCase(), null);
}
! _nameList = nameList;
}
finally
***************
*** 151,200 ****
////////////////////////////////////////////////////////////////////////////
// IDataSet interface
public String[] getTableNames() throws DataSetException
{
! return (String[])getTableMap().keySet().toArray(new String[0]);
}
public ITableMetaData getTableMetaData(String tableName) throws DataSetException
{
! for (Iterator it = getTableMap().entrySet().iterator(); it.hasNext();)
{
! Map.Entry entry = (Map.Entry)it.next();
! if (tableName.equalsIgnoreCase((String)entry.getKey()))
! {
! ITableMetaData metaData = (ITableMetaData)entry.getValue();
! if (metaData != null)
! {
! return metaData;
! }
! metaData = new DatabaseTableMetaData((String)entry.getKey(), _connection);
! getTableMap().put(metaData.getTableName(), metaData);
! return metaData;
! }
}
! throw new NoSuchTableException(tableName);
! // ITableMetaData metaData = (ITableMetaData)getTableMap().get(tableName);
! // if (metaData != null)
! // {
! // return metaData;
! // }
! //
! // if (!getTableMap().containsKey(tableName))
! // {
! // throw new NoSuchTableException(tableName);
! // }
! //
! // metaData = new DatabaseTableMetaData(tableName, _connection);
! // getTableMap().put(tableName, metaData);
! // return metaData;
}
public ITable getTable(String tableName) throws DataSetException
{
try
{
--- 153,219 ----
////////////////////////////////////////////////////////////////////////////
+ // AbstractDataSet class
+
+ protected ITableIterator createIterator(boolean reversed)
+ throws DataSetException
+ {
+ String[] names = getTableNames();
+ if (reversed)
+ {
+ names = DataSetUtils.reverseStringArray(names);
+ }
+
+ return new SequenceTableIterator(names, this);
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
// IDataSet interface
public String[] getTableNames() throws DataSetException
{
! initialize();
!
! return (String[])_nameList.toArray(new String[0]);
}
public ITableMetaData getTableMetaData(String tableName) throws DataSetException
{
! initialize();
!
! // Verify if table exist in the database
! String upperTableName = tableName.toUpperCase();
! if (!_tableMap.containsKey(upperTableName))
{
! throw new NoSuchTableException(tableName);
! }
! // Try to find cached metadata
! ITableMetaData metaData = (ITableMetaData)_tableMap.get(upperTableName);
! if (metaData != null)
! {
! return metaData;
}
! // Search for original database table name
! for (Iterator it = _nameList.iterator(); it.hasNext();)
! {
! String databaseTableName = (String)it.next();
! if (databaseTableName.equalsIgnoreCase(tableName))
! {
! // Create metadata and cache it
! metaData = new DatabaseTableMetaData(
! databaseTableName, _connection);
! _tableMap.put(upperTableName, metaData);
! break;
! }
! }
! return metaData;
}
public ITable getTable(String tableName) throws DataSetException
{
+ initialize();
+
try
{
***************
*** 227,241 ****
throw new DataSetException(e);
}
- }
-
- public ITable[] getTables() throws DataSetException
- {
- String[] names = getTableNames();
- List tableList = new ArrayList(names.length);
- for (int i = 0; i < names.length; i++)
- {
- tableList.add(getTable(names[i]));
- }
- return (ITable[])tableList.toArray(new ITable[0]);
}
}
--- 246,249 ----
Index: QueryDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/QueryDataSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryDataSet.java 16 Feb 2003 06:27:27 -0000 1.2
--- QueryDataSet.java 9 Apr 2003 22:52:08 -0000 1.3
***************
*** 29,32 ****
--- 29,34 ----
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.ITableIterator;
+ import org.dbunit.dataset.DefaultTableIterator;
/**
***************
*** 66,96 ****
////////////////////////////////////////////////////////////////////////////
! // IDataSet interface
!
! /**
! * Gets the tableNames attribute of the QueryDataSet object
! *
! * @return An array of all the table names
! * @exception org.dbunit.dataset.DataSetException Thrown if there is an issue.
! */
! public String[] getTableNames() throws DataSetException
! {
! List names = new ArrayList();
! for (Iterator it = _tables.iterator(); it.hasNext();)
! {
! TableEntry entry = (TableEntry)it.next();
! names.add(entry.getTableName());
! }
!
! return (String[])names.toArray(new String[0]);
! }
! /**
! * Gets the tables attribute of the QueryDataSet object
! *
! * @return The tables value
! * @exception org.dbunit.dataset.DataSetException Thrown if there is an issue.
! */
! public ITable[] getTables() throws DataSetException
{
try
--- 68,74 ----
////////////////////////////////////////////////////////////////////////////
! // AbstractDataSet class
! protected ITableIterator createIterator(boolean reversed) throws DataSetException
{
try
***************
*** 111,115 ****
}
! return (ITable[])tableList.toArray(new ITable[0]);
}
catch (SQLException e)
--- 89,94 ----
}
! ITable[] tables = (ITable[])tableList.toArray(new ITable[0]);
! return new DefaultTableIterator(tables, reversed);
}
catch (SQLException e)
***************
*** 117,120 ****
--- 96,114 ----
throw new DataSetException(e);
}
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
+ // IDataSet interface
+
+ public String[] getTableNames() throws DataSetException
+ {
+ List names = new ArrayList();
+ for (Iterator it = _tables.iterator(); it.hasNext();)
+ {
+ TableEntry entry = (TableEntry)it.next();
+ names.add(entry.getTableName());
+ }
+
+ return (String[])names.toArray(new String[0]);
}
|
|
From: <mla...@us...> - 2003-04-09 22:52:42
|
Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit
Modified Files:
profile.properties
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: profile.properties
===================================================================
RCS file: /cvsroot/dbunit/dbunit/profile.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** profile.properties 13 Dec 2002 21:40:32 -0000 1.22
--- profile.properties 9 Apr 2003 22:52:07 -0000 1.23
***************
*** 6,10 ****
#dbunit.profile = oracle
#dbunit.profile = mysql
- #dbunit.profile = antoine
#dbunit.profile = mssql
--- 6,9 ----
***************
*** 27,41 ****
dbunit.profile.oracle.password = dbunit
! dbunit.profile.antoine.driverClass = oracle.jdbc.driver.OracleDriver
! dbunit.profile.antoine.connectionUrl = jdbc:oracle:thin:@demowin:1521:demowin
! dbunit.profile.antoine.schema = ANTOINE
! dbunit.profile.antoine.user = antoine
! dbunit.profile.antoine.password = antoine
!
! dbunit.profile.mysql.driverClass = org.gjt.mm.mysql.Driver
dbunit.profile.mysql.connectionUrl = jdbc:mysql://localhost:3306/dbunit
#dbunit.profile.mysql.schema = DBUNIT
! dbunit.profile.mysql.user = root
! dbunit.profile.mysql.password =
dbunit.profile.mssql.driverClass = com.microsoft.jdbc.sqlserver.SQLServerDriver
--- 26,34 ----
dbunit.profile.oracle.password = dbunit
! dbunit.profile.mysql.driverClass = com.mysql.jdbc.Driver
dbunit.profile.mysql.connectionUrl = jdbc:mysql://localhost:3306/dbunit
#dbunit.profile.mysql.schema = DBUNIT
! dbunit.profile.mysql.user = dbunit
! dbunit.profile.mysql.password = dbunit
dbunit.profile.mssql.driverClass = com.microsoft.jdbc.sqlserver.SQLServerDriver
***************
*** 51,54 ****
--- 44,53 ----
dbunit.profile.user = ${dbunit.profile.hypersonic.user}
dbunit.profile.password = ${dbunit.profile.hypersonic.password}
+
+ #dbunit.profile.driverClass = ${dbunit.profile.mysql.driverClass}
+ #dbunit.profile.connectionUrl = ${dbunit.profile.mysql.connectionUrl}
+ ##dbunit.profile.schema = ${dbunit.profile.mysql.schema}
+ #dbunit.profile.user = ${dbunit.profile.mysql.user}
+ #dbunit.profile.password = ${dbunit.profile.mysql.password}
#dbunit.profile.driverClass = ${dbunit.profile.mssql.driverClass}
|
|
From: <mla...@us...> - 2003-04-09 22:52:22
|
Update of /cvsroot/dbunit/dbunit/src/sql In directory sc8-pr-cvs1:/tmp/cvs-serv18568/dbunit/src/sql Added Files: mysql.sql 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. |
|
From: <mla...@us...> - 2003-04-09 18:19:19
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv28119/src/java/org/dbunit/dataset
Modified Files:
Tag: branch-iterator
AbstractDataSet.java CompositeDataSet.java IDataSet.java
Log Message:
Deprecated the IDataSet.getTables() method and replaced usage with
the iterator() methods. Only code that explicitly test the getTable()
method continue to use it.
Index: AbstractDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/AbstractDataSet.java,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -C2 -d -r1.9.4.1 -r1.9.4.2
*** AbstractDataSet.java 6 Apr 2003 13:56:29 -0000 1.9.4.1
--- AbstractDataSet.java 9 Apr 2003 18:18:44 -0000 1.9.4.2
***************
*** 31,35 ****
/**
* This abstract class provides the basic implementation of the IDataSet
! * interface. Subclass are only required to implement the {@link #getTables}
* method.
*
--- 31,35 ----
/**
* This abstract class provides the basic implementation of the IDataSet
! * interface. Subclass are only required to implement the {@link #createIterator}
* method.
*
Index: CompositeDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CompositeDataSet.java,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -C2 -d -r1.11.4.1 -r1.11.4.2
*** CompositeDataSet.java 6 Apr 2003 13:56:29 -0000 1.11.4.1
--- CompositeDataSet.java 9 Apr 2003 18:18:45 -0000 1.11.4.2
***************
*** 101,104 ****
--- 101,119 ----
/**
+ * Creates a composite dataset that combines dsuplicate tables of the specified dataset.
+ *
+ * @param dataSet
+ * the dataset
+ * @param combine
+ * if <code>true</code>, tables having the same name are merged into
+ * one table.
+ */
+ public CompositeDataSet(IDataSet dataSet, boolean combine)
+ throws DataSetException
+ {
+ this(new IDataSet[]{dataSet}, combine);
+ }
+
+ /**
* Creates a composite dataset that combines tables having identical name.
* Tables having the same name are merged into one table.
Index: IDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/IDataSet.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** IDataSet.java 6 Apr 2003 13:56:29 -0000 1.11.2.1
--- IDataSet.java 9 Apr 2003 18:18:45 -0000 1.11.2.2
***************
*** 34,40 ****
{
/**
! * Returns table names this dataset contains. Multiple occurence of a name
! * may be present in the returned list if the dataset contains multiple
! * tables having the same name.
*/
public String[] getTableNames() throws DataSetException;
--- 34,40 ----
{
/**
! * Returns names of tables in this dataset in proper sequence. Multiple
! * occurence of the same name may be returned if multiple tables having
! * the same name are present in the dataset.
*/
public String[] getTableNames() throws DataSetException;
***************
*** 44,48 ****
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
--- 44,48 ----
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #iterator} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
***************
*** 56,60 ****
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #getTables} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
--- 56,60 ----
*
* @throws AmbiguousTableNameException if dataset contains multiple tables
! * having the specified name. Use {@link #iterator} to access
* to all tables.
* @throws NoSuchTableException if dataset do not contains the specified
***************
*** 64,73 ****
/**
! * Returns tables contained by this dataset. Multiple table having the same
! * name but different data may be returned.
*/
public ITable[] getTables() throws DataSetException;
public ITableIterator iterator() throws DataSetException;
public ITableIterator reverseIterator() throws DataSetException;
}
--- 64,82 ----
/**
! * Returns tables in this dataset in proper sequence. Multiple tables having
! * the same name but different data may be returned.
! *
! * @deprecated Use {@link #iterator} or {@link #reverseIterator} instead.
*/
public ITable[] getTables() throws DataSetException;
+ /**
+ * Returns an iterator over the tables in this dataset in proper sequence.
+ */
public ITableIterator iterator() throws DataSetException;
+
+ /**
+ * Returns an iterator over the tables in this dataset in reverse sequence.
+ */
public ITableIterator reverseIterator() throws DataSetException;
}
|
