Menu
▾
▴
[dbunit-commit] dbunit/src/test/org/dbunit/operation DeleteAllOperationTest.java,1.10,1.11 UpdateOperationTest.java,1.15,1.16 RefreshOperationTest.java,1.10,1.11 InsertOperationTest.java,1.17,1.18 DeleteOperationTest.java,1.13,1.14
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv29584/dbunit/src/test/org/dbunit/operation
Modified Files:
DeleteAllOperationTest.java UpdateOperationTest.java
RefreshOperationTest.java InsertOperationTest.java
DeleteOperationTest.java
Log Message:
DbUnit is now case insensitive!!!
Index: DeleteAllOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteAllOperationTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DeleteAllOperationTest.java 4 Aug 2002 01:07:13 -0000 1.10
--- DeleteAllOperationTest.java 15 Feb 2003 05:42:42 -0000 1.11
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.AbstractDatabaseTest;
+ import org.dbunit.DatabaseUnitException;
import org.dbunit.database.MockDatabaseConnection;
import org.dbunit.database.statement.MockBatchStatement;
***************
*** 29,32 ****
--- 30,35 ----
import org.dbunit.dataset.*;
+ import java.sql.SQLException;
+
/**
* @author Manuel Laflamme
***************
*** 151,166 ****
public void testExecute() throws Exception
{
! IDataSet databaseDataSet = AbstractDataSetTest.removeExtraTestTables(
_connection.createDataSet());
! ITable[] tablesBefore = DataSetUtils.getTables(databaseDataSet);
! DatabaseOperation.DELETE_ALL.execute(_connection, databaseDataSet);
! ITable[] tablesAfter = DataSetUtils.getTables(databaseDataSet);
! // ITable[] tablesBefore = DataSetUtils.getTables(_connection.createDataSet());
! // DatabaseOperation.DELETE_ALL.execute(_connection,
! // _connection.createDataSet());
! // ITable[] tablesAfter = DataSetUtils.getTables(_connection.createDataSet());
assertTrue("table count > 0", tablesBefore.length > 0);
--- 154,176 ----
public void testExecute() throws Exception
{
! IDataSet dataSet = AbstractDataSetTest.removeExtraTestTables(
_connection.createDataSet());
! testExecute(dataSet);
! }
+ public void testExecuteCaseInsentive() throws Exception
+ {
+ IDataSet dataSet = AbstractDataSetTest.removeExtraTestTables(
+ _connection.createDataSet());
! testExecute(new LowerCaseDataSet(dataSet));
! }
!
! private void testExecute(IDataSet dataSet) throws Exception
! {
! ITable[] tablesBefore = DataSetUtils.getTables(_connection.createDataSet());
! DatabaseOperation.DELETE_ALL.execute(_connection, dataSet);
! ITable[] tablesAfter = DataSetUtils.getTables(_connection.createDataSet());
assertTrue("table count > 0", tablesBefore.length > 0);
***************
*** 171,175 ****
String name = table.getTableMetaData().getTableName();
! if (!name.startsWith("EMPTY"))
{
assertTrue(name + " before", table.getRowCount() > 0);
--- 181,185 ----
String name = table.getTableMetaData().getTableName();
! if (!name.toUpperCase().startsWith("EMPTY"))
{
assertTrue(name + " before", table.getRowCount() > 0);
***************
*** 181,185 ****
ITable table = tablesAfter[i];
String name = table.getTableMetaData().getTableName();
! assertEquals(name + "after", 0, table.getRowCount());
}
}
--- 191,195 ----
ITable table = tablesAfter[i];
String name = table.getTableMetaData().getTableName();
! assertEquals(name + " after " + i, 0, table.getRowCount());
}
}
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** UpdateOperationTest.java 14 Feb 2003 03:22:02 -0000 1.15
--- UpdateOperationTest.java 15 Feb 2003 05:42:42 -0000 1.16
***************
*** 49,57 ****
}
- // public static Test suite()
- // {
- // return new UpdateOperationTest("testUpdateBlob");
- // }
-
////////////////////////////////////////////////////////////////////////////
//
--- 49,52 ----
***************
*** 330,340 ****
public void testExecute() throws Exception
{
! String tableName = "PK_TABLE";
! String[] columnNames = {"PK0", "PK1", "PK2", "NORMAL0", "NORMAL1"};
! int modifiedRow = 1;
Reader in = new FileReader(
new File("src/xml/updateOperationTest.xml"));
! IDataSet xmlDataSet = new XmlDataSet(in);
// verify table before
--- 325,350 ----
public void testExecute() throws Exception
{
! Reader in = new FileReader(
! new File("src/xml/updateOperationTest.xml"));
! IDataSet dataSet = new XmlDataSet(in);
!
! testExecute(dataSet);
!
! }
+ public void testExecuteCaseInsensitive() throws Exception
+ {
Reader in = new FileReader(
new File("src/xml/updateOperationTest.xml"));
! IDataSet dataSet = new XmlDataSet(in);
!
! testExecute(new LowerCaseDataSet(dataSet));
! }
!
! private void testExecute(IDataSet dataSet) throws Exception
! {
! String tableName = "PK_TABLE";
! String[] columnNames = {"PK0", "PK1", "PK2", "NORMAL0", "NORMAL1"};
! int modifiedRow = 1;
// verify table before
***************
*** 342,346 ****
assertEquals("row count before", 3, tableBefore.getRowCount());
! DatabaseOperation.UPDATE.execute(_connection, xmlDataSet);
ITable tableAfter = createOrderedTable(tableName, columnNames[0]);
--- 352,356 ----
assertEquals("row count before", 3, tableBefore.getRowCount());
! DatabaseOperation.UPDATE.execute(_connection, dataSet);
ITable tableAfter = createOrderedTable(tableName, columnNames[0]);
Index: RefreshOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/RefreshOperationTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RefreshOperationTest.java 14 Feb 2003 03:22:01 -0000 1.10
--- RefreshOperationTest.java 15 Feb 2003 05:42:42 -0000 1.11
***************
*** 33,36 ****
--- 33,37 ----
import java.io.FileInputStream;
import java.io.FileReader;
+ import java.io.Reader;
import java.util.ArrayList;
***************
*** 48,58 ****
public void testExecute() throws Exception
{
String[] tableNames = {"PK_TABLE", "ONLY_PK_TABLE"};
int[] tableRowCount = {3, 1};
String primaryKey = "PK0";
- IDataSet xmlDataSet = new FlatXmlDataSet(
- new FileReader("src/xml/refreshOperationTest.xml"));
-
// verify table before
assertEquals("array lenght", tableNames.length, tableRowCount.length);
--- 49,72 ----
public void testExecute() throws Exception
{
+ Reader reader = new FileReader("src/xml/refreshOperationTest.xml");
+ IDataSet dataSet = new FlatXmlDataSet(reader);
+
+ testExecute(dataSet);
+ }
+
+ public void testExecuteCaseInsensitive() throws Exception
+ {
+ Reader reader = new FileReader("src/xml/refreshOperationTest.xml");
+ IDataSet dataSet = new FlatXmlDataSet(reader);
+
+ testExecute(new LowerCaseDataSet(dataSet));
+ }
+
+ private void testExecute(IDataSet dataSet) throws Exception
+ {
String[] tableNames = {"PK_TABLE", "ONLY_PK_TABLE"};
int[] tableRowCount = {3, 1};
String primaryKey = "PK0";
// verify table before
assertEquals("array lenght", tableNames.length, tableRowCount.length);
***************
*** 63,67 ****
}
! DatabaseOperation.REFRESH.execute(_connection, xmlDataSet);
// verify table after
--- 77,81 ----
}
! DatabaseOperation.REFRESH.execute(_connection, dataSet);
// verify table after
***************
*** 76,79 ****
--- 90,94 ----
}
}
+
public void testExecuteWithDuplicateTables() throws Exception
{
Index: InsertOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/InsertOperationTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** InsertOperationTest.java 14 Feb 2003 03:22:01 -0000 1.17
--- InsertOperationTest.java 15 Feb 2003 05:42:42 -0000 1.18
***************
*** 35,38 ****
--- 35,39 ----
import java.util.ArrayList;
import java.util.List;
+ import java.sql.SQLException;
/**
***************
*** 47,55 ****
}
- // public static Test suite()
- // {
- // return new InsertOperationTest("testInsertBlob");
- // }
-
public void testMockExecute() throws Exception
{
--- 48,51 ----
***************
*** 332,368 ****
{
// this won't work because of the timestamp column.
! if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment)){
Reader in = new FileReader("src/xml/insertOperationTest.xml");
! IDataSet xmlDataSet = new XmlDataSet(in);
! ITable[] tablesBefore = DataSetUtils.getTables(_connection.createDataSet());
! DatabaseOperation.INSERT.execute(_connection, xmlDataSet);
! ITable[] tablesAfter = DataSetUtils.getTables(_connection.createDataSet());
! assertEquals("table count", tablesBefore.length, tablesAfter.length);
! for (int i = 0; i < tablesBefore.length; i++)
! {
! ITable table = tablesBefore[i];
! String name = table.getTableMetaData().getTableName();
! if (name.startsWith("EMPTY"))
! {
! assertEquals(name + "before", 0, table.getRowCount());
! }
! }
! for (int i = 0; i < tablesAfter.length; i++)
! {
! ITable table = tablesAfter[i];
! String name = table.getTableMetaData().getTableName();
! if (name.startsWith("EMPTY"))
! {
! Assertion.assertEquals(xmlDataSet.getTable(name), table);
! }
}
}
}
}
--- 328,381 ----
{
// this won't work because of the timestamp column.
! if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment))
! {
Reader in = new FileReader("src/xml/insertOperationTest.xml");
! IDataSet dataSet = new XmlDataSet(in);
! testExecute(dataSet);
! }
! }
! public void testExecuteCaseInsensitive() throws Exception
! {
! // this won't work because of the timestamp column.
! if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment))
! {
! Reader in = new FileReader("src/xml/insertOperationTest.xml");
! IDataSet dataSet = new XmlDataSet(in);
+ testExecute(new LowerCaseDataSet(dataSet));
+ }
+ }
! private void testExecute(IDataSet dataSet) throws Exception, SQLException
! {
! ITable[] tablesBefore = DataSetUtils.getTables(_connection.createDataSet());
! DatabaseOperation.INSERT.execute(_connection, dataSet);
! ITable[] tablesAfter = DataSetUtils.getTables(_connection.createDataSet());
! assertEquals("table count", tablesBefore.length, tablesAfter.length);
! for (int i = 0; i < tablesBefore.length; i++)
! {
! ITable table = tablesBefore[i];
! String name = table.getTableMetaData().getTableName();
!
! if (name.startsWith("EMPTY"))
! {
! assertEquals(name + "before", 0, table.getRowCount());
}
}
+ for (int i = 0; i < tablesAfter.length; i++)
+ {
+ ITable table = tablesAfter[i];
+ String name = table.getTableMetaData().getTableName();
+
+ if (name.startsWith("EMPTY"))
+ {
+ Assertion.assertEquals(dataSet.getTable(name), table);
+ }
+ }
}
}
Index: DeleteOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteOperationTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DeleteOperationTest.java 14 Feb 2003 03:22:01 -0000 1.13
--- DeleteOperationTest.java 15 Feb 2003 05:42:42 -0000 1.14
***************
*** 240,248 ****
public void testExecute() throws Exception
{
- String tableName = "PK_TABLE";
- String columnName = "PK0";
Reader in = new FileReader(
new File("src/xml/deleteOperationTest.xml"));
! IDataSet xmlDataSet = new XmlDataSet(in);
// verify table before
--- 240,264 ----
public void testExecute() throws Exception
{
Reader in = new FileReader(
new File("src/xml/deleteOperationTest.xml"));
! IDataSet dataSet = new XmlDataSet(in);
!
! testExecute(dataSet);
!
! }
!
! public void testExecuteCaseInsensitive() throws Exception
! {
! Reader in = new FileReader(
! new File("src/xml/deleteOperationTest.xml"));
! IDataSet dataSet = new XmlDataSet(in);
!
! testExecute(new LowerCaseDataSet(dataSet));
! }
!
! private void testExecute(IDataSet dataSet) throws Exception
! {
! String tableName = "PK_TABLE";
! String columnName = "PK0";
// verify table before
***************
*** 253,257 ****
assertEquals("before", "2", tableBefore.getValue(2, columnName).toString());
! DatabaseOperation.DELETE.execute(_connection, xmlDataSet);
ITable tableAfter = createOrderedTable(tableName, columnName);
--- 269,273 ----
assertEquals("before", "2", tableBefore.getValue(2, columnName).toString());
! DatabaseOperation.DELETE.execute(_connection, dataSet);
ITable tableAfter = createOrderedTable(tableName, columnName);
|
