dao sql tests: run on postgresql with in-memory disk using testcontainers jdbc (jdbc:tc:postgresql:12.8)

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

@@ -1,30 +0,0 @@
-/**
- * Copyright © 2016-2021 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao;
-
-import org.junit.extensions.cpsuite.ClasspathSuite;
-import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
-import org.junit.runner.RunWith;
-
-@RunWith(ClasspathSuite.class)
-@ClassnameFilters({
-        "org.thingsboard.server.dao.service.psql.*SqlTest",
-        "org.thingsboard.server.dao.service.attributes.psql.*SqlTest",
-        "org.thingsboard.server.dao.service.event.psql.*SqlTest",
-        "org.thingsboard.server.dao.service.timeseries.psql.*SqlTest"
-})
-public class PostgreSqlDaoServiceTestSuite {
-}

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

@@ -15,48 +15,16 @@
  */
 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.service.sql.*SqlTest",
         "org.thingsboard.server.dao.service.attributes.sql.*SqlTest",
         "org.thingsboard.server.dao.service.event.sql.*SqlTest",
-        "org.thingsboard.server.dao.service.timeseries.sql.*SqlTest"
-
+        "org.thingsboard.server.dao.service.sql.*SqlTest",
+        "org.thingsboard.server.dao.service.timeseries.sql.*SqlTest",
 })
 public class SqlDaoServiceTestSuite {
-
-    @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/system-test.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/schema-entities-idx.sql"
-//                    , "sql/system-data.sql", "sql/system-test.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-entities.sql", "sql/schema-entities-idx.sql", "sql/system-data.sql", "sql/system-test.sql"),
-//            "sql/timescale/drop-all-tables.sql",
-//            "sql-test.properties"
-//    );
-
 }

dao/src/test/java/org/thingsboard/server/dao/service/DaoPostgreSqlTest.java

@@ -1,33 +0,0 @@
-/**
- * Copyright © 2016-2021 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.service;
-
-import org.springframework.test.context.TestPropertySource;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-@TestPropertySource(locations = {"classpath:application-test.properties", "classpath:psql-test.properties"})
-public @interface DaoPostgreSqlTest {
-}

dao/src/test/java/org/thingsboard/server/dao/service/psql/EntityServicePostgreSqlTest.java → dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceSqlTest.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.service.psql;
+package org.thingsboard.server.dao.service.sql;
 
 import org.thingsboard.server.dao.service.BaseEntityServiceTest;
-import org.thingsboard.server.dao.service.DaoPostgreSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 
-@DaoPostgreSqlTest
-public class EntityServicePostgreSqlTest extends BaseEntityServiceTest {
+@DaoSqlTest
+public class EntityServiceSqlTest extends BaseEntityServiceTest {
 }

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

@@ -1,47 +0,0 @@
-database.ts.type=sql
-database.ts_latest.type=sql
-sql.ts_inserts_executor_type=fixed
-sql.ts_inserts_fixed_thread_pool_size=200
-sql.ts_key_value_partitioning=MONTHS
-#
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-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.PostgreSQLDialect
-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
-#org.postgresql.Driver
-spring.datasource.hikari.maximumPoolSize=50
-service.type=monolith
-#database.ts.type=timescale
-#database.ts.type=sql
-#database.entities.type=sql
-#
-#sql.ts_inserts_executor_type=fixed
-#sql.ts_inserts_fixed_thread_pool_size=200
-#sql.ts_key_value_partitioning=MONTHS
-#
-#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-#spring.jpa.show-sql=false
-#spring.jpa.hibernate.ddl-auto=none
-#spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-#
-#spring.datasource.username=postgres
-#spring.datasource.password=postgres
-#spring.datasource.url=jdbc:postgresql://localhost:5432/sqltest
-#spring.datasource.driverClassName=org.postgresql.Driver
-#spring.datasource.hikari.maximumPoolSize = 50
-queue.core.pack-processing-timeout=3000
-queue.rule-engine.pack-processing-timeout=3000
-queue.rule-engine.queues[0].name=Main
-queue.rule-engine.queues[0].topic=tb_rule_engine.main
-queue.rule-engine.queues[0].poll-interval=25
-queue.rule-engine.queues[0].partitions=3
-queue.rule-engine.queues[0].pack-processing-timeout=3000
-queue.rule-engine.queues[0].processing-strategy.type=SKIP_ALL_FAILURES
-queue.rule-engine.queues[0].submit-strategy.type=BURST
-sql.log_entity_queries=true

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

@@ -10,14 +10,15 @@ 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=validate
-spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect
-
-spring.datasource.username=sa
-spring.datasource.password=
-spring.datasource.url=jdbc:hsqldb:file:target/tmp/testDb;sql.enforce_size=false;sql.syntax_pgs=true
-spring.datasource.driverClassName=org.hsqldb.jdbc.JDBCDriver
-spring.datasource.hikari.maximumPoolSize = 50
+
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
+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 = 20
 
 service.type=monolith