From fe3cca7cb3486fbccce40f054a40da4193343e3c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 25 Dec 2013 17:40:30 +0100 Subject: [PATCH] [Minor] schema must be dropped in all tests... --- .../persistence/postgresql/dao/test/ObserverUpdateTest.java | 5 ++++- .../persistence/postgresql/dao/test/XmlCachedDaoTest.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java b/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java index b2542bf34..ce20eaee6 100644 --- a/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java +++ b/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java @@ -20,6 +20,7 @@ import static li.strolch.model.ModelGenerator.createResource; import static org.junit.Assert.assertEquals; import java.io.File; +import java.sql.SQLException; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -56,7 +57,9 @@ public class ObserverUpdateTest { } @BeforeClass - public static void beforeClass() { + public static void beforeClass() throws SQLException { + + XmlCachedDaoTest.dropSchema(); File rootPath = new File(RUNTIME_PATH); File configSrc = new File(CONFIG_SRC); diff --git a/src/test/java/li/strolch/persistence/postgresql/dao/test/XmlCachedDaoTest.java b/src/test/java/li/strolch/persistence/postgresql/dao/test/XmlCachedDaoTest.java index 70389ca86..d55057582 100644 --- a/src/test/java/li/strolch/persistence/postgresql/dao/test/XmlCachedDaoTest.java +++ b/src/test/java/li/strolch/persistence/postgresql/dao/test/XmlCachedDaoTest.java @@ -57,7 +57,7 @@ public class XmlCachedDaoTest extends AbstractModelTest { runtimeMock.startContainer(rootPath); } - private static void dropSchema() throws SQLException { + public static void dropSchema() throws SQLException { String dbVersion = DbSchemaVersionCheck.getExpectedDbVersion(); String sql = DbSchemaVersionCheck.getSql(dbVersion, "drop"); //$NON-NLS-1$ try (Connection connection = DriverManager.getConnection(DB_URL, DB_USERNAME, DB_PASSWORD)) {