[dbunit-commit] dbunit/src/test/org/dbunit/database DatabaseDataSetTest.java,1.17,1.18 DatabaseTableMetaDataTest.java,1.11,1.12

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv32358

Modified Files:
	DatabaseDataSetTest.java DatabaseTableMetaDataTest.java 
Log Message:
fixes to support running test cases against MSSQL

Index: DatabaseDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DatabaseDataSetTest.java	9 Dec 2002 17:59:14 -0000	1.17
--- DatabaseDataSetTest.java	13 Dec 2002 21:44:46 -0000	1.18
***************
*** 23,26 ****
--- 23,27 ----
  package org.dbunit.database;
  
+ import org.dbunit.*;
  import org.dbunit.DatabaseEnvironment;
  import org.dbunit.dataset.*;
***************
*** 160,189 ****
      public void testGetQualifiedTableNames() throws Exception
      {
!         String[] expectedNames = getExpectedNames();
!         sort(expectedNames);
  
!         try
!         {
!             System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "true");
  
!             IDatabaseConnection connection = new DatabaseConnection(
!                     _connection.getConnection(), _connection.getSchema());
  
!             IDataSet dataSet = removeExtraTestTables(connection.createDataSet());
!             String[] actualNames = dataSet.getTableNames();
!             sort(actualNames);
  
!             assertEquals("name count", expectedNames.length, actualNames.length);
!             for (int i = 0; i < actualNames.length; i++)
              {
!                 String expected = DataSetUtils.getQualifiedName(
!                         _connection.getSchema(), expectedNames[i]);
!                 String actual = actualNames[i];
!                 assertEquals("name", expected, actual);
              }
-         }
-         finally
-         {
-             System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "false");
          }
      }
--- 161,193 ----
      public void testGetQualifiedTableNames() throws Exception
      {
!         // this won't work because of the timestamp column.
!         if (!(DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment)){
!             String[] expectedNames = getExpectedNames();
!             sort(expectedNames);
  
!             try
!             {
!                 System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "true");
  
!                 IDatabaseConnection connection = new DatabaseConnection(
!                         _connection.getConnection(), _connection.getSchema());
  
!                 IDataSet dataSet = removeExtraTestTables(connection.createDataSet());
!                 String[] actualNames = dataSet.getTableNames();
!                 sort(actualNames);
  
!                 assertEquals("name count", expectedNames.length, actualNames.length);
!                 for (int i = 0; i < actualNames.length; i++)
!                 {
!                     String expected = DataSetUtils.getQualifiedName(
!                             _connection.getSchema(), expectedNames[i]);
!                     String actual = actualNames[i];
!                     assertEquals("name", expected, actual);
!                 }
!             }
!             finally
              {
!                 System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "false");
              }
          }
      }

Index: DatabaseTableMetaDataTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DatabaseTableMetaDataTest.java	7 Aug 2002 01:32:12 -0000	1.11
--- DatabaseTableMetaDataTest.java	13 Dec 2002 21:44:47 -0000	1.12
***************
*** 23,26 ****
--- 23,27 ----
  package org.dbunit.database;
  
+ import org.dbunit.*;
  import org.dbunit.AbstractDatabaseTest;
  import org.dbunit.dataset.*;
***************
*** 33,36 ****
--- 34,62 ----
  public class DatabaseTableMetaDataTest extends AbstractDatabaseTest
  {
+     private static final DataType[] EXPECTED_DATA_TYPES = {
+             DataType.VARCHAR,
+             DataType.NUMERIC,
+             DataType.TIMESTAMP,
+             DataType.VARBINARY,
+     };
+ 
+     private static final DataType[] EXPECTED_DATA_TYPES_MSSQLSERVER = {
+             DataType.VARCHAR,
+             DataType.NUMERIC,
+             DataType.BINARY,
+             DataType.VARBINARY,
+     };
+ 
+     protected static DataType[] getExpectedDataTypes() throws Exception
+     {
+         if (DatabaseEnvironment.getInstance() instanceof MSSQLServerEnvironment){
+             return (DataType[])EXPECTED_DATA_TYPES_MSSQLSERVER.clone();
+         }
+         else {
+             return (DataType[])EXPECTED_DATA_TYPES.clone();
+         }
+ 
+     }
+ 
      public DatabaseTableMetaDataTest(String s)
      {
***************
*** 128,137 ****
              "VARBINARY_COL",
          };
!         DataType[] expectedTypes = {
!             DataType.VARCHAR,
!             DataType.NUMERIC,
!             DataType.TIMESTAMP,
!             DataType.VARBINARY,
!         };
  
          ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
--- 154,158 ----
              "VARBINARY_COL",
          };
!         DataType[] expectedTypes = getExpectedDataTypes();
  
          ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
***************
*** 148,152 ****
          }
      }
- 
  }
  
--- 169,172 ----