tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

improve and fix JpaWidgetsBundleDaoTest

pull/6009/head
van-vanich 5 years ago
parent
7f104e5159
commit
00540a8b09
2 changed files with 104 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
  2. 157
      dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java

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 {

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

@ -45,38 +45,54 @@ 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_");
assertEquals(30, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size()); try {
// Get first page assertEquals(30, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
PageLink pageLink = new PageLink(10, 0, "WB"); // Get first page
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink); PageLink pageLink = new PageLink(10, 0, "WB");
assertEquals(10, widgetsBundles1.getData().size()); PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
// Get next page assertEquals(10, widgetsBundles1.getData().size());
pageLink = pageLink.nextPageLink(); // Get next page
PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink); pageLink = pageLink.nextPageLink();
assertEquals(10, widgetsBundles2.getData().size()); PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
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,23 +102,33 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
createWidgetBundles(5, tenantId2, "WB2_"); createWidgetBundles(5, tenantId2, "WB2_");
createSystemWidgetBundles(10, "WB_SYS_"); createSystemWidgetBundles(10, "WB_SYS_");
} }
assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size()); try {
assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
PageLink pageLink1 = new PageLink(40, 0, "WB");
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId1, pageLink1); PageLink pageLink1 = new PageLink(40, 0, "WB");
assertEquals(30, widgetsBundles1.getData().size()); PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId1, pageLink1);
assertEquals(30, widgetsBundles1.getData().size());
PageLink pageLink2 = new PageLink(40, 0, "WB");
PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2); PageLink pageLink2 = new PageLink(40, 0, "WB");
assertEquals(40, widgetsBundles2.getData().size()); PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
assertEquals(40, widgetsBundles2.getData().size());
pageLink2 = pageLink2.nextPageLink();
PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2); pageLink2 = pageLink2.nextPageLink();
assertEquals(10, widgetsBundles3.getData().size()); PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
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,35 +138,51 @@ 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());
pageLink = pageLink.nextPageLink(); pageLink = pageLink.nextPageLink();
PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink); PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
assertEquals(30, widgetsBundles2.getData().size()); assertEquals(30, widgetsBundles2.getData().size());
pageLink = pageLink.nextPageLink(); pageLink = pageLink.nextPageLink();
PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink); PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
assertEquals(10, widgetsBundles3.getData().size()); assertEquals(10, widgetsBundles3.getData().size());
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());
}
}
} }

Write Preview
Loading…
Cancel
Save