Browse Source

Merge branch 'feature/iot-hub' into feature/lts-4.3-iot-hub

pull/15540/head
Igor Kulikov 4 months ago
parent
commit
475d680d74
  1. 3
      application/src/test/java/org/thingsboard/server/service/iot_hub/DefaultIotHubServiceTest.java

3
application/src/test/java/org/thingsboard/server/service/iot_hub/DefaultIotHubServiceTest.java

@ -180,7 +180,7 @@ class DefaultIotHubServiceTest {
String versionId = UUID.randomUUID().toString(); String versionId = UUID.randomUUID().toString();
UUID rootItemId = UUID.randomUUID(); UUID rootItemId = UUID.randomUUID();
when(iotHubRestClient.getVersionInfo(versionId)) when(iotHubRestClient.getVersionInfo(versionId))
.thenReturn(version(versionId, rootItemId.toString(), "DASHBOARD", "Root", "1.0")); .thenReturn(version(versionId, rootItemId.toString(), "WIDGET", "Root", "1.0"));
when(iotHubInstalledItemService.findInstalledItemIdsByTenantIdAndItemIdIn(eq(tenantId), any())).thenReturn(List.of(rootItemId)); when(iotHubInstalledItemService.findInstalledItemIdsByTenantIdAndItemIdIn(eq(tenantId), any())).thenReturn(List.of(rootItemId));
InstallPlan plan = service.resolveInstallPlan(user, versionId); InstallPlan plan = service.resolveInstallPlan(user, versionId);
@ -231,6 +231,7 @@ class DefaultIotHubServiceTest {
InstallPlanEntry entry = new InstallPlanEntry(); InstallPlanEntry entry = new InstallPlanEntry();
entry.setItemId(itemId.toString()); entry.setItemId(itemId.toString());
entry.setVersionId(UUID.randomUUID().toString()); entry.setVersionId(UUID.randomUUID().toString());
entry.setType("WIDGET");
entry.setStatus(InstallPlanEntry.Status.WILL_INSTALL); entry.setStatus(InstallPlanEntry.Status.WILL_INSTALL);
entry.setRoot(true); entry.setRoot(true);
// The item is reported as already installed at install time, even though the plan says WILL_INSTALL. // The item is reported as already installed at install time, even though the plan says WILL_INSTALL.

Loading…
Cancel
Save