Skip to content

Commit

Permalink
[Fix] fixed broken tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@eitch
eitch committed Jan 27, 2021
1 parent d695879 commit e287523
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 75 deletions.
30 changes: 5 additions & 25 deletions ...ostgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,20 @@
*/
package li.strolch.persistence.postgresql.dao.test;

import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_ARCHIVE;
import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH;
import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchema;
import static org.junit.Assert.assertEquals;

import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.text.MessageFormat;

import li.strolch.db.DbSchemaVersionCheck;
import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.postgresql.DataType;
import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
import li.strolch.testbase.runtime.AbstractModelTest;
import li.strolch.testbase.runtime.RuntimeMock;
import li.strolch.utils.Version;
import li.strolch.utils.helper.StringHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.postgresql.Driver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -58,7 +54,8 @@ protected RuntimeMock getRuntimeMock() {
@BeforeClass
public static void beforeClass() throws Exception {

dropSchema(DB_URL, DB_USERNAME, DB_PASSWORD);
dropSchema(SCRIPT_PREFIX_ARCHIVE, DB_URL, DB_USERNAME, DB_PASSWORD);
dropSchema(SCRIPT_PREFIX_STROLCH, DB_URL, DB_USERNAME, DB_PASSWORD);

File rootPath = new File(RUNTIME_PATH);
File configSrc = new File(CONFIG_SRC);
Expand All @@ -72,23 +69,6 @@ public static void beforeClass() throws Exception {
assertEquals(DataType.json, persistenceHandler.getDataType());
}

public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {

if (!Driver.isRegistered())
Driver.register();

Version dbVersion = DbSchemaVersionCheck
.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class);
logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
String sql = DbSchemaVersionCheck
.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class, dbVersion,
"drop"); //$NON-NLS-1$
logger.info(StringHelper.NEW_LINE + sql);
try (Connection connection = DriverManager.getConnection(dbUrl, dbUsername, dbPassword)) {
connection.prepareStatement(sql).execute();
}
}

@AfterClass
public static void afterClass() {
if (runtimeMock != null)
Expand Down
30 changes: 5 additions & 25 deletions ...src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,20 @@
*/
package li.strolch.persistence.postgresql.dao.test;

import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_ARCHIVE;
import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH;
import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchema;
import static org.junit.Assert.assertEquals;

import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.text.MessageFormat;

import li.strolch.db.DbSchemaVersionCheck;
import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.postgresql.DataType;
import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
import li.strolch.testbase.runtime.AbstractModelTest;
import li.strolch.testbase.runtime.RuntimeMock;
import li.strolch.utils.Version;
import li.strolch.utils.helper.StringHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.postgresql.Driver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -58,7 +54,8 @@ protected RuntimeMock getRuntimeMock() {
@BeforeClass
public static void beforeClass() throws Exception {

dropSchema(DB_URL, DB_USERNAME, DB_PASSWORD);
dropSchema(SCRIPT_PREFIX_ARCHIVE, DB_URL, DB_USERNAME, DB_PASSWORD);
dropSchema(SCRIPT_PREFIX_STROLCH, DB_URL, DB_USERNAME, DB_PASSWORD);

File rootPath = new File(RUNTIME_PATH);
File configSrc = new File(CONFIG_SRC);
Expand All @@ -72,23 +69,6 @@ public static void beforeClass() throws Exception {
assertEquals(DataType.json, persistenceHandler.getDataType());
}

public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {

if (!Driver.isRegistered())
Driver.register();

Version dbVersion = DbSchemaVersionCheck
.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class);
logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
String sql = DbSchemaVersionCheck
.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class, dbVersion,
"drop"); //$NON-NLS-1$
logger.info(StringHelper.NEW_LINE + sql);
try (Connection connection = DriverManager.getConnection(dbUrl, dbUsername, dbPassword)) {
connection.prepareStatement(sql).execute();
}
}

@AfterClass
public static void afterClass() {
if (runtimeMock != null)
Expand Down
30 changes: 5 additions & 25 deletions ...sql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,20 @@
*/
package li.strolch.persistence.postgresql.dao.test;

import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_ARCHIVE;
import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH;
import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchema;
import static org.junit.Assert.assertEquals;

import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.text.MessageFormat;

import li.strolch.db.DbSchemaVersionCheck;
import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.postgresql.DataType;
import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
import li.strolch.testbase.runtime.AbstractModelTest;
import li.strolch.testbase.runtime.RuntimeMock;
import li.strolch.utils.Version;
import li.strolch.utils.helper.StringHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.postgresql.Driver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -58,7 +54,8 @@ protected RuntimeMock getRuntimeMock() {
@BeforeClass
public static void beforeClass() throws Exception {

dropSchema(DB_URL, DB_USERNAME, DB_PASSWORD);
dropSchema(SCRIPT_PREFIX_ARCHIVE, DB_URL, DB_USERNAME, DB_PASSWORD);
dropSchema(SCRIPT_PREFIX_STROLCH, DB_URL, DB_USERNAME, DB_PASSWORD);

File rootPath = new File(RUNTIME_PATH);
File configSrc = new File(CONFIG_SRC);
Expand All @@ -72,23 +69,6 @@ public static void beforeClass() throws Exception {
assertEquals(DataType.xml, persistenceHandler.getDataType());
}

public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {

if (!Driver.isRegistered())
Driver.register();

Version dbVersion = DbSchemaVersionCheck
.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class);
logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
String sql = DbSchemaVersionCheck
.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class, dbVersion,
"drop"); //$NON-NLS-1$
logger.info(StringHelper.NEW_LINE + sql);
try (Connection connection = DriverManager.getConnection(dbUrl, dbUsername, dbPassword)) {
connection.prepareStatement(sql).execute();
}
}

@AfterClass
public static void afterClass() {
if (runtimeMock != null)
Expand Down

0 comments on commit e287523

Please sign in to comment.