From 51620220d326d71368ebe8586d0df6c77dc934fc Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 4 Jul 2017 09:46:10 +0300 Subject: [PATCH] Fixed hsqldb tests --- .mvn/jvm.config | 1 - .../test/java/org/thingsboard/server/dao/CustomSqlUnit.java | 6 ++++++ dao/src/test/resources/sql-test.properties | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 .mvn/jvm.config diff --git a/.mvn/jvm.config b/.mvn/jvm.config deleted file mode 100644 index 6d111992cb..0000000000 --- a/.mvn/jvm.config +++ /dev/null @@ -1 +0,0 @@ --Xmx8G -Xms1024m diff --git a/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java b/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java index 491e642bdd..9649ad8f8d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java +++ b/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java @@ -58,6 +58,8 @@ public class CustomSqlUnit extends ExternalResource { @Override public void before() { + cleanUpDb(); + Connection conn = null; try { conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword); @@ -81,6 +83,10 @@ public class CustomSqlUnit extends ExternalResource { @Override public void after() { + cleanUpDb(); + } + + private void cleanUpDb() { Connection conn = null; try { conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword); diff --git a/dao/src/test/resources/sql-test.properties b/dao/src/test/resources/sql-test.properties index be6d35329d..0bcc789c91 100644 --- a/dao/src/test/resources/sql-test.properties +++ b/dao/src/test/resources/sql-test.properties @@ -1,4 +1,4 @@ -database.type=sql + database.type=sql spring.jpa.show-sql=false spring.jpa.hibernate.ddl-auto=validate @@ -6,5 +6,5 @@ spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect spring.datasource.username=sa spring.datasource.password= -spring.datasource.url=jdbc:hsqldb:mem:testDb;sql.enforce_size=false +spring.datasource.url=jdbc:hsqldb:file:/tmp/testDb;sql.enforce_size=false spring.datasource.driverClassName=org.hsqldb.jdbc.JDBCDriver \ No newline at end of file