From f5476716fa6aa1c2ce82a4cd116b8e80f2d30896 Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Wed, 30 May 2018 21:38:48 +0200 Subject: fixed "actual" and "expected" values being mixed up --- .../java/at/ac/tuwien/sepm/assignment/groupphase/util/JdbcTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util') 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..fb9c6f7 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 @@ -130,7 +130,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)); } } -- cgit v1.2.3-70-g09d2 From 1611596f6b644ae54a5f1aa6172ebe28397ebc34 Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Sat, 2 Jun 2018 23:20:07 +0200 Subject: added handling for "timestamp with time zone" #27844 --- .../sepm/assignment/groupphase/util/JdbcTestCase.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util') 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 fb9c6f7..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); -- cgit v1.2.3-70-g09d2 From 0aa0eb12a6b96f5fe4cb8b21582799e233e9788c Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Mon, 11 Jun 2018 13:58:28 +0200 Subject: Make HighDpiAwareApplicationTest abstract [#25963] --- .../sepm/assignment/groupphase/util/HighDpiAwareApplicationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util') diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/HighDpiAwareApplicationTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/HighDpiAwareApplicationTest.java index c9816a1..2924b3f 100644 --- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/HighDpiAwareApplicationTest.java +++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/HighDpiAwareApplicationTest.java @@ -7,7 +7,7 @@ import org.testfx.framework.junit.ApplicationTest; import org.testfx.service.locator.impl.BoundsLocatorImpl; import org.testfx.service.locator.impl.PointLocatorImpl; -public class HighDpiAwareApplicationTest extends ApplicationTest { +public abstract class HighDpiAwareApplicationTest extends ApplicationTest { public HighDpiAwareApplicationTest() { FxRobotContext context = robotContext(); -- cgit v1.2.3-70-g09d2