Merge branch 'develop'HEADv3.0master

1 files changed, 11 insertions, 8 deletions

diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/JdbcTestCase.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/JdbcTestCase.java
index c509a1f..e419ab0 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/JdbcTestCase.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/JdbcTestCase.java
@@ -19,7 +19,7 @@ import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.datatype.DataType;
 import org.dbunit.dataset.datatype.DataTypeException;
 import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
+import org.dbunit.ext.h2.H2DataTypeFactory;
 import org.dbunit.operation.DatabaseOperation;
 import org.junit.After;
 import org.junit.Before;
@@ -96,13 +96,14 @@ public abstract class JdbcTestCase {
 
     // override DBUnit's enum handling
     private void setUpDatabaseConfig(DatabaseConfig config) {
-        PostgresqlDataTypeFactory factory =
-                new PostgresqlDataTypeFactory() {
-                    @Override
-                    public boolean isEnumType(String sqlTypeName) {
-                        if (sqlTypeName.equalsIgnoreCase("enum")) return true;
+        H2DataTypeFactory factory =
+                new H2DataTypeFactory() {
+                    boolean isEnumType(String sqlTypeName) {
+                        return sqlTypeName.equalsIgnoreCase("enum");
+                    }
 
-                        return super.isEnumType(sqlTypeName);
+                    boolean isTimestampWithTimeZoneType(String sqlTypeName) {
+                        return sqlTypeName.equalsIgnoreCase("timestamp with time zone");
                     }
 
                     @Override
@@ -110,6 +111,8 @@ public abstract class JdbcTestCase {
                             throws DataTypeException {
                         if (isEnumType(sqlTypeName)) {
                             sqlType = Types.VARCHAR;
+                        } else if (isTimestampWithTimeZoneType(sqlTypeName)) {
+                            sqlType = Types.VARCHAR;
                         }
 
                         return super.createDataType(sqlType, sqlTypeName);
@@ -130,7 +133,7 @@ public abstract class JdbcTestCase {
         IDataSet expected = new FlatXmlDataSetBuilder().build(res);
 
         for (String table : tables) {
-            assertEquals(actual.getTable(table), expected.getTable(table));
+            assertEquals(expected.getTable(table), actual.getTable(table));
         }
     }