CustomSqlUnit removed from test suites. dependency added for testcontainers for application test scope.

application/pom.xml

@@ -311,8 +311,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hsqldb</groupId>
+            <groupId>org.testcontainers</groupId>
-            <artifactId>hsqldb</artifactId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

application/src/test/java/org/thingsboard/server/controller/ControllerSqlTestSuite.java

@@ -16,14 +16,10 @@
 package org.thingsboard.server.controller;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
 //        "org.thingsboard.server.controller.sql.WebsocketApiSqlTest",
@@ -31,17 +27,12 @@ import java.util.Arrays;
 //        "org.thingsboard.server.controller.sql.TbResourceControllerSqlTest",
 //        "org.thingsboard.server.controller.sql.DeviceProfileControllerSqlTest",
         "org.thingsboard.server.controller.sql.*Test",
-        })
+})
 public class ControllerSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/schema-entities-idx.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties");
-
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
+
 }

application/src/test/java/org/thingsboard/server/edge/EdgeSqlTestSuite.java

@@ -16,26 +16,18 @@
 package org.thingsboard.server.edge;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
-@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.edge.sql.*Test"})
+@ClasspathSuite.ClassnameFilters({
+        "org.thingsboard.server.edge.sql.*Test",
+})
 public class EdgeSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties");
-
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
 }

application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java

@@ -16,28 +16,20 @@
 package org.thingsboard.server.rules;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
         "org.thingsboard.server.rules.flow.sql.*Test",
-        "org.thingsboard.server.rules.lifecycle.sql.*Test"})
+        "org.thingsboard.server.rules.lifecycle.sql.*Test",
+})
 public class RuleEngineSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties");
-
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
+
 }

application/src/test/java/org/thingsboard/server/service/ServiceSqlTestSuite.java

@@ -16,28 +16,19 @@
 package org.thingsboard.server.service;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
         "org.thingsboard.server.service.resource.sql.*Test",
-        })
+})
 public class ServiceSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/schema-entities-idx.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties");
-
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
+
 }

application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java

@@ -16,29 +16,21 @@
 package org.thingsboard.server.system;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
-import java.util.Arrays;
-
 /**
  * Created by Valerii Sosliuk on 6/27/2017.
  */
 @RunWith(ClasspathSuite.class)
-@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.sql.*SqlTest"})
+@ClasspathSuite.ClassnameFilters({
+        "org.thingsboard.server.system.sql.*SqlTest",
+})
 public class SystemSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties");
-
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
 

application/src/test/java/org/thingsboard/server/transport/TransportNoSqlTestSuite.java

@@ -21,22 +21,16 @@ import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
 import org.thingsboard.server.dao.CustomCassandraCQLUnit;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
 import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
-        "org.thingsboard.server.transport.*.telemetry.timeseries.nosql.*Test"})
+        "org.thingsboard.server.transport.*.telemetry.timeseries.nosql.*Test",
+})
 public class TransportNoSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "nosql-test.properties");
-
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
             new CustomCassandraCQLUnit(
@@ -47,7 +41,8 @@ public class TransportNoSqlTestSuite {
                     "cassandra-test.yaml", 30000l);
 
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
+
 }

application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java

@@ -16,14 +16,10 @@
 package org.thingsboard.server.transport;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomSqlUnit;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
         "org.thingsboard.server.transport.*.rpc.sql.*Test",
@@ -37,14 +33,9 @@ import java.util.Arrays;
 })
 public class TransportSqlTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties");
-
     @BeforeClass
-    public static void cleanupInMemStorage(){
+    public static void cleanupInMemStorage() {
         InMemoryStorage.getInstance().cleanup();
     }
+
 }

dao/pom.xml

@@ -211,11 +211,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>

dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java

@@ -32,8 +32,11 @@ import java.util.Properties;
 
 /**
  * Created by Valerii Sosliuk on 6/24/2017.
+ *
+ * Deprecated. Use PostgreSqlInitializer class instead
  */
 @Slf4j
+@Deprecated
 public class CustomSqlUnit extends ExternalResource {
 
     private final List<String> sqlFiles;

dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java

@@ -15,38 +15,14 @@
  */
 package org.thingsboard.server.dao;
 
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
 import org.junit.runner.RunWith;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
-        "org.thingsboard.server.dao.sql.*THIS_MUST_BE_FIXED_Test"
+        "org.thingsboard.server.dao.sql.*THIS_MUST_BE_FIXED_Test",
 })
 public class JpaDaoTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "sql-test.properties"
-    );
-
-//    @ClassRule
-//    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-//            Arrays.asList("sql/schema-ts-psql.sql", "sql/schema-entities.sql", "sql/system-data.sql"),
-//            "sql/psql/drop-all-tables.sql",
-//            "sql-test.properties"
-//    );
-
-//    @ClassRule
-//    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-//            Arrays.asList("sql/schema-timescale.sql", "sql/schema-timescale-idx.sql", "sql/schema-entities.sql", "sql/system-data.sql"),
-//            "sql/timescale/drop-all-tables.sql",
-//            "sql-test.properties"
-//    );
-
 }

dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java

@@ -25,17 +25,10 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
-        "org.thingsboard.server.dao.service.nosql.*ServiceNoSqlTest"
+        "org.thingsboard.server.dao.service.nosql.*ServiceNoSqlTest",
 })
 public class NoSqlDaoServiceTestSuite {
 
-    @ClassRule
-    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
-            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-entities-hsql.sql", "sql/schema-entities-idx.sql", "sql/system-data.sql", "sql/system-test.sql"),
-            "sql/hsql/drop-all-tables.sql",
-            "nosql-test.properties"
-    );
-
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
             new CustomCassandraCQLUnit(

dao/src/test/resources/nosql-test.properties

@@ -9,11 +9,11 @@ spring.jpa.properties.hibernate.order_by.default_null_ordering=last
 spring.jpa.properties.hibernate.jdbc.log.warnings=false
 
 spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect
 
-spring.datasource.username=sa
+spring.jpa.hibernate.ddl-auto=none
-spring.datasource.password=
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-spring.datasource.url=jdbc:hsqldb:file:/tmp/testDb;sql.enforce_size=false
+spring.datasource.username=postgres
-spring.datasource.driverClassName=org.hsqldb.jdbc.JDBCDriver
+spring.datasource.password=postgres
+spring.datasource.url=jdbc:tc:postgresql:12.8:///thingsboard?TC_DAEMON=true&TC_TMPFS=/testtmpfs:rw&?TC_INITFUNCTION=org.thingsboard.server.dao.PostgreSqlInitializer::initDb
+spring.datasource.driverClassName=org.testcontainers.jdbc.ContainerDatabaseDriver
 spring.datasource.hikari.maximumPoolSize = 50

dao/src/test/resources/sql-test.properties

@@ -17,8 +17,7 @@ spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.datasource.url=jdbc:tc:postgresql:12.8:///thingsboard?TC_DAEMON=true&TC_TMPFS=/testtmpfs:rw&?TC_INITFUNCTION=org.thingsboard.server.dao.PostgreSqlInitializer::initDb
 spring.datasource.driverClassName=org.testcontainers.jdbc.ContainerDatabaseDriver
-
+spring.datasource.hikari.maximumPoolSize = 50
-spring.datasource.hikari.maximumPoolSize = 20
 
 service.type=monolith