From c8a8b4630bd64272d44c153e9964edc291c60540 Mon Sep 17 00:00:00 2001 From: nickAS21 Date: Thu, 7 Jul 2022 15:36:16 +0300 Subject: [PATCH] refactoring: tests TbResource add msgNotFound --- .../controller/BaseTbResourceControllerTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java index 36d8d56fbc..d3153f57bc 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java @@ -188,16 +188,18 @@ public abstract class BaseTbResourceControllerTest extends AbstractControllerTes TbResource savedResource = save(resource); Mockito.reset(tbClusterService, auditLogService); - - doDelete("/api/resource/" + savedResource.getId().getId().toString()) + String resourceIdStr = savedResource.getId().getId().toString(); + doDelete("/api/resource/" + resourceIdStr) .andExpect(status().isOk()); + testNotifyEntityOneTimeMsgToEdgeServiceNever(savedResource, savedResource.getId(), savedResource.getId(), savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(), - ActionType.DELETED, savedResource.getId().getId().toString()); + ActionType.DELETED, resourceIdStr); doGet("/api/resource/" + savedResource.getId().getId().toString()) - .andExpect(status().isNotFound()); + .andExpect(status().isNotFound()) + .andExpect(statusReason(containsString(msgErrorNoFound("Resource", resourceIdStr)))); } @Test