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

Fixed test

Browse Source
This commit is contained in:
Volodymyr Babak 2021-07-23 12:46:57 +03:00
parent e8ead2b490
commit 2aea5fc7a9
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java
View File

@ -233,7 +233,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
} }
List<DashboardInfo> loadedMobileDashboards = new ArrayList<>(); List<DashboardInfo> loadedMobileDashboards = new ArrayList<>();
PageLink pageLink = new PageLink(16, 0, null, new SortOrder("createdTime", SortOrder.Direction.ASC)); PageLink pageLink = new PageLink(16, 0, null, new SortOrder("title", SortOrder.Direction.ASC));
PageData<DashboardInfo> pageData = null; PageData<DashboardInfo> pageData = null;
do { do {
pageData = dashboardService.findMobileDashboardsByTenantId(tenantId, pageLink); pageData = dashboardService.findMobileDashboardsByTenantId(tenantId, pageLink);
@ -243,15 +243,11 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
} }
} while (pageData.hasNext()); } while (pageData.hasNext());
Comparator<DashboardInfo> dashboardInfoComparator = (o1, o2) -> { Collections.sort(mobileDashboards, (o1, o2) -> {
Integer order1 = o1.getMobileOrder(); Integer order1 = o1.getMobileOrder();
Integer order2 = o2.getMobileOrder(); Integer order2 = o2.getMobileOrder();
if (order1 == null && order2 == null) { if (order1 == null && order2 == null) {
if (o1.getCreatedTime() == o2.getCreatedTime()) { return o1.getTitle().compareTo(o2.getTitle());
return o1.getUuidId().compareTo(o2.getUuidId());
} else {
return (int) (o1.getCreatedTime() - o2.getCreatedTime());
}
} else if (order1 == null && order2 != null) { } else if (order1 == null && order2 != null) {
return 1; return 1;
} else if (order2 == null) { } else if (order2 == null) {
@ -259,10 +255,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
} else { } else {
return order1 - order2; return order1 - order2;
} }
}; });
Collections.sort(mobileDashboards, dashboardInfoComparator);
Collections.sort(loadedMobileDashboards, dashboardInfoComparator);
Assert.assertEquals(mobileDashboards, loadedMobileDashboards); Assert.assertEquals(mobileDashboards, loadedMobileDashboards);