diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 24ce820760..8e0804e3df 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -29,8 +29,10 @@ import lombok.extern.slf4j.Slf4j;
import org.hamcrest.Matcher;
import org.hibernate.exception.ConstraintViolationException;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
@@ -196,9 +198,20 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
this.mappingJackson2HttpMessageConverter);
}
+ @BeforeClass
+ public static void beforeWebTestClass() throws Exception {
+
+ }
+
+ @AfterClass
+ public static void afterWebTestClass() throws Exception {
+ Mockito.clearAllCaches();
+ }
+
+
@Before
public void setupWebTest() throws Exception {
- log.info("Executing web test setup");
+ log.debug("Executing web test setup");
if (this.mockMvc == null) {
this.mockMvc = webAppContextSetup(webApplicationContext)
@@ -238,12 +251,12 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
resetTokens();
- log.info("Executed web test setup");
+ log.debug("Executed web test setup");
}
@After
public void teardownWebTest() throws Exception {
- log.info("Executing web test teardown");
+ log.debug("Executing web test teardown");
loginSysAdmin();
doDelete("/api/tenant/" + tenantId.getId().toString())
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java
index 56df8513fe..828d279e93 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java
@@ -192,7 +192,7 @@ public abstract class BaseWidgetsBundleControllerTest extends AbstractController
WidgetsBundle savedWidgetsBundle = doPost("/api/widgetsBundle", widgetsBundle, WidgetsBundle.class);
savedWidgetsBundle.setAlias("new_alias");
- Mockito.reset(tbClusterService);
+ Mockito.clearInvocations(tbClusterService);
doPost("/api/widgetsBundle", savedWidgetsBundle)
.andExpect(status().isBadRequest())
diff --git a/application/src/test/resources/application-test.properties b/application/src/test/resources/application-test.properties
index e4a36c151d..330ae69787 100644
--- a/application/src/test/resources/application-test.properties
+++ b/application/src/test/resources/application-test.properties
@@ -20,6 +20,8 @@ transport.mqtt.enabled=false
transport.coap.enabled=false
transport.lwm2m.enabled=false
transport.snmp.enabled=false
+coap.enabled=false
+integrations.rpc.enabled=false
# Low latency settings to perform tests as fast as possible
sql.attributes.batch_max_delay=5
@@ -63,3 +65,9 @@ sql.ttl.audit_logs.ttl=2592000
sql.edge_events.partition_size=168
sql.ttl.edge_events.edge_event_ttl=2592000
+#spring.jpa.properties.hibernate.generate_statistics=true
+#spring.jpa.properties.hibernate.jmx.enabled=true
+#spring.jpa.properties.hibernate.jmx.usePlatformServer=true
+#spring.jpa.properties.hibernate.cache.use_query_cache=false
+#spring.jpa.properties.hibernate.query.plan_cache_max_size=64
+#spring.jpa.properties.hibernate.query.plan_parameter_metadata_max_size=32
diff --git a/application/src/test/resources/logback-test.xml b/application/src/test/resources/logback-test.xml
index 3762c8aa7c..c79a7d3905 100644
--- a/application/src/test/resources/logback-test.xml
+++ b/application/src/test/resources/logback-test.xml
@@ -15,6 +15,7 @@
+
diff --git a/dao/src/test/resources/nosql-test.properties b/dao/src/test/resources/nosql-test.properties
index 1c6d2442cf..d63a9f7f82 100644
--- a/dao/src/test/resources/nosql-test.properties
+++ b/dao/src/test/resources/nosql-test.properties
@@ -15,7 +15,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=16
queue.rule-engine.queues[0].name=Main
queue.rule-engine.queues[0].topic=tb_rule_engine.main
diff --git a/dao/src/test/resources/sql-test.properties b/dao/src/test/resources/sql-test.properties
index b2ded716c4..2fed33b43a 100644
--- a/dao/src/test/resources/sql-test.properties
+++ b/dao/src/test/resources/sql-test.properties
@@ -16,7 +16,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=16
service.type=monolith