From d0d47f96dbb8589a9be6770161e15e866e5cc8dc Mon Sep 17 00:00:00 2001 From: nickAS21 Date: Thu, 7 Jul 2022 04:40:47 +0300 Subject: [PATCH] refactoring: tests fix bug testSaveEntityView --- .../server/controller/BaseDeviceControllerTest.java | 3 +-- .../server/controller/BaseDeviceProfileControllerTest.java | 2 +- .../server/controller/BaseEntityViewControllerTest.java | 4 ++-- .../server/controller/BaseRuleChainControllerTest.java | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java index d6a77a1d6b..4c4f44aea6 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java @@ -815,6 +815,7 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest { ActionType.ADDED, ActionType.ASSIGNED_TO_CUSTOMER, cntEntity, cntEntity, cntEntity * 2); Mockito.reset(tbClusterService, auditLogService, gatewayNotificationsService); testNotificationUpdateGatewayNever(); + Mockito.reset(tbClusterService, auditLogService, gatewayNotificationsService); List loadedDevices = new ArrayList<>(cntEntity); PageLink pageLink = new PageLink(23); @@ -829,8 +830,6 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest { assertThat(devices).containsExactlyInAnyOrderElementsOf(loadedDevices); - Mockito.reset(tbClusterService, auditLogService, gatewayNotificationsService); - deleteEntitiesAsync("/api/customer/device/", loadedDevices, executor).get(TIMEOUT, TimeUnit.SECONDS); testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAnyAdditionalInfoAny(new Device(), new Device(), diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java index 61d35a972b..1fb5316a17 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java @@ -387,7 +387,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new DeviceProfile(), new DeviceProfile(), savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, ActionType.ADDED, cntEntity, cntEntity, cntEntity); - Mockito.reset(tbClusterService, auditLogService, gatewayNotificationsService); + Mockito.reset(tbClusterService, auditLogService); List loadedDeviceProfiles = new ArrayList<>(); pageLink = new PageLink(17); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java index a66f3e4095..f1121dfb14 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java @@ -149,7 +149,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(foundEntityView, foundEntityView, tenantId, tenantAdminCustomerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ADDED, ActionType.ADDED, 1, 0, 1); - Mockito.reset(tbClusterService, auditLogService, gatewayNotificationsService); + Mockito.reset(tbClusterService, auditLogService); savedView.setName("New test entity view"); @@ -265,7 +265,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(savedView, savedView, tenantId, tenantAdminCustomerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.UPDATED, ActionType.UPDATED, 1, 1, 5); - Mockito.reset(tbClusterService, auditLogService, gatewayNotificationsService); + Mockito.reset(tbClusterService, auditLogService); EntityView assignedView = doPost( "/api/customer/" + savedCustomer.getId().getId().toString() + "/entityView/" + savedView.getId().getId().toString(), diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java index 62880848e9..33602bbfa9 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java @@ -185,6 +185,7 @@ public abstract class BaseRuleChainControllerTest extends AbstractControllerTest savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_EDGE, ActionType.ASSIGNED_TO_EDGE, cntEntity, cntEntity, cntEntity * 2, new String(), new String(), new String()); + Mockito.reset(tbClusterService, auditLogService); List loadedEdgeRuleChains = new ArrayList<>(); pageLink = new PageLink(17); @@ -203,8 +204,6 @@ public abstract class BaseRuleChainControllerTest extends AbstractControllerTest Assert.assertEquals(edgeRuleChains, loadedEdgeRuleChains); - Mockito.reset(tbClusterService, auditLogService); - for (RuleChain ruleChain : loadedEdgeRuleChains) { if (!ruleChain.isRoot()) { doDelete("/api/edge/" + savedEdge.getId().getId().toString()