From 6c92640117e4664cbd781062274eccc1c85fde1f Mon Sep 17 00:00:00 2001 From: van-vanich Date: Wed, 2 Feb 2022 17:40:28 +0200 Subject: [PATCH] delete componentDescriptors after test for JpaBaseComponentDescriptorDaoTest --- .../thingsboard/server/dao/JpaDaoTestSuite.java | 2 +- .../JpaBaseComponentDescriptorDaoTest.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java index 3f7d01e688..8a7a1e8543 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; "org.thingsboard.server.dao.sql.customer.*Test", "org.thingsboard.server.dao.sql.dashboard.*Test", "org.thingsboard.server.dao.sql.query.*Test", - "org.thingsboard.server.dao.sql.device.*DeviceDaoTest", + "org.thingsboard.server.dao.sql.device.*DeviceDaoTest" }) public class JpaDaoTestSuite { diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java index 8e7225ec7f..31814aa6aa 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java @@ -54,6 +54,7 @@ public class JpaBaseComponentDescriptorDaoTest extends AbstractJpaDaoTest { pageLink = pageLink.nextPageLink(); PageData components2 = componentDescriptorDao.findByTypeAndPageLink(AbstractServiceTest.SYSTEM_TENANT_ID,ComponentType.FILTER, pageLink); assertEquals(5, components2.getData().size()); + deleteComponentDescription(List.of(ComponentType.FILTER, ComponentType.ACTION)); } @Test @@ -73,6 +74,7 @@ public class JpaBaseComponentDescriptorDaoTest extends AbstractJpaDaoTest { PageData components2 = componentDescriptorDao.findByScopeAndTypeAndPageLink(AbstractServiceTest.SYSTEM_TENANT_ID, ComponentScope.SYSTEM, ComponentType.FILTER, pageLink); assertEquals(5, components2.getData().size()); + deleteComponentDescription(List.of(ComponentType.FILTER, ComponentType.ACTION, ComponentType.ENRICHMENT)); } private void createComponentDescriptor(ComponentType type, ComponentScope scope, int index) { @@ -84,4 +86,14 @@ public class JpaBaseComponentDescriptorDaoTest extends AbstractJpaDaoTest { componentDescriptorDao.save(AbstractServiceTest.SYSTEM_TENANT_ID,component); } -} + void deleteComponentDescription(List componentTypes) { + for (ComponentType componentType : componentTypes) { + List byTypeAndPageLink = componentDescriptorDao.findByTypeAndPageLink(AbstractServiceTest.SYSTEM_TENANT_ID, + componentType, + new PageLink(100)).getData(); + for (ComponentDescriptor descriptor : byTypeAndPageLink) { + componentDescriptorDao.deleteById(AbstractServiceTest.SYSTEM_TENANT_ID, descriptor.getId()); + } + } + } +} \ No newline at end of file