dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve and fix JpaWidgetsBundleDaoTest

Browse Source
This commit is contained in:
van-vanich 2022-02-02 17:51:23 +02:00
parent 7f104e5159
commit 00540a8b09
2 changed files with 98 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
View File

@ -27,6 +27,7 @@ import org.junit.runner.RunWith;
"org.thingsboard.server.dao.sql.dashboard.*Test", "org.thingsboard.server.dao.sql.dashboard.*Test",
"org.thingsboard.server.dao.sql.query.*Test", "org.thingsboard.server.dao.sql.query.*Test",
"org.thingsboard.server.dao.sql.device.*DeviceDaoTest", "org.thingsboard.server.dao.sql.device.*DeviceDaoTest",
"org.thingsboard.server.dao.sql.widget.*JpaWidgetsBundleDaoTest",
"org.thingsboard.server.dao.sql.user.*JpaUserCredentialsDaoTest" "org.thingsboard.server.dao.sql.user.*JpaUserCredentialsDaoTest"
}) })
public class JpaDaoTestSuite { public class JpaDaoTestSuite {

77
dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
View File

@ -45,25 +45,37 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
private WidgetsBundleDao widgetsBundleDao; private WidgetsBundleDao widgetsBundleDao;
@Test @Test
@DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml",type= DatabaseOperation.CLEAN_INSERT)
@DatabaseTearDown(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL)
public void testFindAll() { public void testFindAll() {
assertEquals(7, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size()); createSystemWidgetBundles(7, "WB_");
List<WidgetsBundle> widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
try {
assertEquals(7, widgetsBundles.size());
} finally {
for (WidgetsBundle widgetsBundle:widgetsBundles) {
widgetsBundleDao.removeById(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle.getUuidId());
}
}
} }
@Test @Test
@DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml",type= DatabaseOperation.CLEAN_INSERT)
@DatabaseTearDown(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL)
public void testFindWidgetsBundleByTenantIdAndAlias() { public void testFindWidgetsBundleByTenantIdAndAlias() {
createSystemWidgetBundles(1, "CHECK");
WidgetsBundle widgetsBundle = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias( WidgetsBundle widgetsBundle = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(
UUID.fromString("250aca8e-2825-11e7-93ae-92361f002671"), "WB3"); AbstractServiceTest.SYSTEM_TENANT_ID.getId(), "CHECK" + 0);
assertEquals("44e6af4e-2825-11e7-93ae-92361f002671", widgetsBundle.getId().toString()); try {
System.out.println(widgetsBundle);
assertEquals("CHECK" + 0, widgetsBundle.getAlias());
} finally {
List<WidgetsBundle> allWidgets = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(TenantId.SYS_TENANT_ID.getId(),
new PageLink(1, 0, "CHECK" + 0)).getData();
deleteWidgetBundles(allWidgets);
}
} }
@Test @Test
@DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL)
public void testFindSystemWidgetsBundles() { public void testFindSystemWidgetsBundles() {
createSystemWidgetBundles(30, "WB_"); createSystemWidgetBundles(30, "WB_");
try {
assertEquals(30, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size()); assertEquals(30, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
// Get first page // Get first page
PageLink pageLink = new PageLink(10, 0, "WB"); PageLink pageLink = new PageLink(10, 0, "WB");
@ -73,10 +85,14 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
pageLink = pageLink.nextPageLink(); pageLink = pageLink.nextPageLink();
PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink); PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
assertEquals(10, widgetsBundles2.getData().size()); assertEquals(10, widgetsBundles2.getData().size());
} finally {
List<WidgetsBundle> allWidgets = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(TenantId.SYS_TENANT_ID.getId(),
new PageLink(500, 0, "WB")).getData();
deleteWidgetBundles(allWidgets);
}
} }
@Test @Test
@DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL)
public void testFindWidgetsBundlesByTenantId() { public void testFindWidgetsBundlesByTenantId() {
UUID tenantId1 = Uuids.timeBased(); UUID tenantId1 = Uuids.timeBased();
UUID tenantId2 = Uuids.timeBased(); UUID tenantId2 = Uuids.timeBased();
@ -86,6 +102,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
createWidgetBundles(5, tenantId2, "WB2_"); createWidgetBundles(5, tenantId2, "WB2_");
createSystemWidgetBundles(10, "WB_SYS_"); createSystemWidgetBundles(10, "WB_SYS_");
} }
try {
assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size()); assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
PageLink pageLink1 = new PageLink(40, 0, "WB"); PageLink pageLink1 = new PageLink(40, 0, "WB");
@ -99,10 +116,19 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
pageLink2 = pageLink2.nextPageLink(); pageLink2 = pageLink2.nextPageLink();
PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2); PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
assertEquals(10, widgetsBundles3.getData().size()); assertEquals(10, widgetsBundles3.getData().size());
} finally {
List<WidgetsBundle> allWidgets =
widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1,
new PageLink(500, 0, "WB1_")).getData();
allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId2,
new PageLink(500, 0, "WB2_")).getData());
allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(TenantId.SYS_TENANT_ID.getId(),
new PageLink(500, 0, "WB_SYS_")).getData());
deleteWidgetBundles(allWidgets);
}
} }
@Test @Test
@DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL)
public void testFindAllWidgetsBundlesByTenantId() { public void testFindAllWidgetsBundlesByTenantId() {
UUID tenantId1 = Uuids.timeBased(); UUID tenantId1 = Uuids.timeBased();
UUID tenantId2 = Uuids.timeBased(); UUID tenantId2 = Uuids.timeBased();
@ -112,7 +138,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
createWidgetBundles(3, tenantId2, "WB2_"); createWidgetBundles(3, tenantId2, "WB2_");
createSystemWidgetBundles(2, "WB_SYS_"); createSystemWidgetBundles(2, "WB_SYS_");
} }
try {
PageLink pageLink = new PageLink(30, 0, "WB"); PageLink pageLink = new PageLink(30, 0, "WB");
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink); PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
assertEquals(30, widgetsBundles1.getData().size()); assertEquals(30, widgetsBundles1.getData().size());
@ -128,19 +154,35 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
pageLink = pageLink.nextPageLink(); pageLink = pageLink.nextPageLink();
PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink); PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
assertEquals(0, widgetsBundles4.getData().size()); assertEquals(0, widgetsBundles4.getData().size());
} finally {
List<WidgetsBundle> allWidgets =
widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1,
new PageLink(500, 0, "WB1_")).getData();
allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId2,
new PageLink(500, 0, "WB2_")).getData());
allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(TenantId.SYS_TENANT_ID.getId(),
new PageLink(500, 0, "WB_SYS_")).getData());
deleteWidgetBundles(allWidgets);
}
} }
@Test @Test
@DatabaseSetup("classpath:dbunit/empty_dataset.xml")
@DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml", type= DatabaseOperation.DELETE_ALL)
public void testSearchTextNotFound() { public void testSearchTextNotFound() {
UUID tenantId = Uuids.timeBased(); UUID tenantId = Uuids.timeBased();
createWidgetBundles(5, tenantId, "ABC_"); createWidgetBundles(5, tenantId, "ABC_");
createSystemWidgetBundles(5, "SYS_"); createSystemWidgetBundles(5, "SYS_");
try {
PageLink textPageLink = new PageLink(30, 0, "TEXT_NOT_FOUND"); PageLink textPageLink = new PageLink(30, 0, "TEXT_NOT_FOUND");
PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink); PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink);
assertEquals(0, widgetsBundles4.getData().size()); assertEquals(0, widgetsBundles4.getData().size());
} finally {
List<WidgetsBundle> allWidgets =
widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId,
new PageLink(500, 0, "ABC_")).getData();
allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(TenantId.SYS_TENANT_ID.getId(),
new PageLink(500, 0, "SYS_")).getData());
deleteWidgetBundles(allWidgets);
}
} }
private void createWidgetBundles(int count, UUID tenantId, String prefix) { private void createWidgetBundles(int count, UUID tenantId, String prefix) {
@ -153,6 +195,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle); widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle);
} }
} }
private void createSystemWidgetBundles(int count, String prefix) { private void createSystemWidgetBundles(int count, String prefix) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
WidgetsBundle widgetsBundle = new WidgetsBundle(); WidgetsBundle widgetsBundle = new WidgetsBundle();
@ -163,4 +206,10 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle); widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle);
} }
} }
void deleteWidgetBundles(List<WidgetsBundle> widgetsBundles) {
for (WidgetsBundle widgetsBundle : widgetsBundles) {
widgetsBundleDao.removeById(widgetsBundle.getTenantId(), widgetsBundle.getUuidId());
}
}
} }