From ea5f4d78f0ba7ba793a1e8a75ab67f86beba07e1 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 3 Jul 2017 09:36:27 +0300
Subject: [PATCH] Fixed device api sql test

---
 .../src/main/resources/thingsboard.yml        |  1 -
 .../server/system/sql/DeviceApiSqlTest.java   |  2 +-
 .../thingsboard/server/dao/CustomSqlUnit.java | 19 +++++++++++--------
 dao/src/test/resources/sql-test.properties    |  4 +++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index a06b9d3765..e82f0d0d35 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -235,7 +235,6 @@ spring:
         enabled: "true"
   jpa:
     show-sql: "false"
-    generate-ddl: "true"
     database-platform: "org.hibernate.dialect.PostgreSQLDialect"
     hibernate:
       ddl-auto: "validate"
diff --git a/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java
index bf533132c7..23430874df 100644
--- a/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java
@@ -22,5 +22,5 @@ import org.thingsboard.server.system.BaseHttpDeviceApiTest;
  * Created by Valerii Sosliuk on 6/27/2017.
  */
 @DaoSqlTest
-public class DeviceApiSqlTest extends BaseHttpDeviceApiTest{
+public class DeviceApiSqlTest extends BaseHttpDeviceApiTest {
 }
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 3c41d1537a..8bac128906 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java
@@ -37,21 +37,22 @@ import java.util.Properties;
 public class CustomSqlUnit extends ExternalResource {
 
     private List<String> sqlFiles;
-    private Properties properties;
     private String dropAllTablesSqlFile;
+    private String dbUrl;
+    private String dbUserName;
+    private String dbPassword;
 
     public CustomSqlUnit(List<String> sqlFiles, String configurationFileName, String dropAllTablesSqlFile) {
         this.sqlFiles = sqlFiles;
-        this.properties = loadProperties(configurationFileName);
         this.dropAllTablesSqlFile = dropAllTablesSqlFile;
+        loadProperties(configurationFileName);
     }
 
     @Override
     public void before() {
         Connection conn = null;
         try {
-            String url = properties.getProperty("spring.datasource.url");
-            conn = DriverManager.getConnection(url, "sa", "");
+            conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
             for (String sqlFile : sqlFiles) {
                 URL sqlFileUrl = Resources.getResource(sqlFile);
                 String sql = Resources.toString(sqlFileUrl, Charsets.UTF_8);
@@ -74,8 +75,7 @@ public class CustomSqlUnit extends ExternalResource {
     public void after() {
         Connection conn = null;
         try {
-            String url = properties.getProperty("spring.datasource.url");
-            conn = DriverManager.getConnection(url, "sa", "");
+            conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
             URL dropAllTableSqlFileUrl = Resources.getResource(dropAllTablesSqlFile);
             String dropAllTablesSql = Resources.toString(dropAllTableSqlFileUrl, Charsets.UTF_8);
             conn.createStatement().execute(dropAllTablesSql);
@@ -92,13 +92,16 @@ public class CustomSqlUnit extends ExternalResource {
         }
     }
 
-    private Properties loadProperties(String fileName) {
+    private void loadProperties(String fileName) {
         final Properties properties = new Properties();
         try (final InputStream stream = this.getClass().getClassLoader().getResourceAsStream(fileName)) {
             properties.load(stream);
-            return properties;
+            this.dbUrl = properties.getProperty("spring.datasource.url");
+            this.dbUserName = properties.getProperty("spring.datasource.username");
+            this.dbPassword = properties.getProperty("spring.datasource.password");
         } catch (IOException e) {
             throw new RuntimeException(e.getMessage(), e);
         }
+
     }
 }
diff --git a/dao/src/test/resources/sql-test.properties b/dao/src/test/resources/sql-test.properties
index 16a9d8cc00..be6d35329d 100644
--- a/dao/src/test/resources/sql-test.properties
+++ b/dao/src/test/resources/sql-test.properties
@@ -2,7 +2,9 @@ database.type=sql
 
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=validate
+spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect
 
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.url=jdbc:hsqldb:mem:thingsboardTestDb;sql.enforce_size=false
+spring.datasource.url=jdbc:hsqldb:mem:testDb;sql.enforce_size=false
+spring.datasource.driverClassName=org.hsqldb.jdbc.JDBCDriver
\ No newline at end of file