From f2dd9045227ba9c97d5ab6727c9ab23d42afe668 Mon Sep 17 00:00:00 2001 From: nickAS21 Date: Wed, 6 Jul 2022 14:03:33 +0300 Subject: [PATCH] refactoring: tests add sgErrorNotFound --- .../server/controller/AbstractNotifyEntityTest.java | 1 + .../server/controller/BaseEntityRelationControllerTest.java | 4 ++-- .../server/controller/BaseEntityViewControllerTest.java | 2 +- .../server/controller/BaseOtaPackageControllerTest.java | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java index 85a2fbc9e6..51b26649c0 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java @@ -63,6 +63,7 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest { protected final String msgErrorPermission = "You don't have permission to perform this operation!"; protected final String msgErrorShouldBeSpecified = "should be specified"; + protected final String msgErrorNotFound = "Requested item wasn't found!"; protected void testNotifyEntityAllOneTime(HasName entity, EntityId entityId, EntityId originatorId, diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java index f78fd6ce8b..2d28e32906 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java @@ -354,7 +354,7 @@ public abstract class BaseEntityRelationControllerTest extends AbstractControlle doDelete(url) .andExpect(status().isNotFound()) - .andExpect(statusReason(containsString("Requested item wasn't found!"))); + .andExpect(statusReason(containsString(msgErrorNotFound))); testNotifyEntityNever(mainDevice.getId(), null); } @@ -376,7 +376,7 @@ public abstract class BaseEntityRelationControllerTest extends AbstractControlle doDelete(url) .andExpect(status().isNotFound()) - .andExpect(statusReason(containsString("Requested item wasn't found!"))); + .andExpect(statusReason(containsString(msgErrorNotFound))); testNotifyEntityNever(mainDevice.getId(), null); } 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 4f8737270e..55ec008d56 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java @@ -164,7 +164,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes doGet("/api/tenant/entityViews?entityViewName=" + name) .andExpect(status().isNotFound()) - .andExpect(statusReason(containsString("Requested item wasn't found!"))); + .andExpect(statusReason(containsString(msgErrorNotFound))); } @Test diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java index 8557c7c008..18d76d96e8 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java @@ -304,7 +304,8 @@ public abstract class BaseOtaPackageControllerTest extends AbstractControllerTes ActionType.DELETED, savedFirmwareInfo.getId().getId().toString()); doGet("/api/otaPackage/info/" + savedFirmwareInfo.getId().getId().toString()) - .andExpect(status().isNotFound()); + .andExpect(status().isNotFound()) + .andExpect(statusReason(containsString(msgErrorNotFound))); } @Test