From 4eeb0b288352be691811c8d0f0d60ba52f6ddb2f Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Fri, 15 Mar 2024 12:13:08 +0100 Subject: [PATCH] UPD. Refactoring and changes according to comments. Signed-off-by: Oleksandra Matviienko --- .../server/dao/service/ValidatorTest.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java index 7a6fa231b2..9bfb0b6c8f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java @@ -42,7 +42,7 @@ class ValidatorTest { Validator.validateEntityId(TenantId.SYS_TENANT_ID, id -> "Incorrect entityId " + id); Validator.validateEntityId((goodDeviceId), id -> "Incorrect entityId " + id); - assertThatThrownBy(() -> Validator.validateEntityId( null, id -> "Incorrect entityId " + id)) + assertThatThrownBy(() -> Validator.validateEntityId(null, id -> "Incorrect entityId " + id)) .as("EntityId is null") .isInstanceOf(IncorrectParameterException.class) .hasMessageContaining("Incorrect entityId null"); @@ -107,7 +107,7 @@ class ValidatorTest { @Test void validateIdsTest() { List list = List.of(goodDeviceId); - Validator.validateIds( list, ids -> "Incorrect Id " + ids); + Validator.validateIds(list, ids -> "Incorrect Id " + ids); assertThatThrownBy(() -> Validator.validateIds(null, id -> "Incorrect Ids " + id)) .as("Ids are null") @@ -132,20 +132,4 @@ class ValidatorTest { .hasMessageContaining("null"); } - - @Test - void validateIdSupplier() { - Validator.validateId(TenantId.SYS_TENANT_ID, () -> "Incorrect Id null"); - Validator.validateId((goodDeviceId), () -> "Incorrect Id null"); - - assertThatThrownBy(() -> Validator.validateId((UUIDBased) null, () -> "Incorrect Id null")) - .as("Id is null") - .isInstanceOf(IncorrectParameterException.class) - .hasMessageContaining("Incorrect Id null"); - - assertThatThrownBy(() -> Validator.validateId(nullUserId, () -> "Incorrect Id null")) - .as("Id with null UUIDBased") - .isInstanceOf(IncorrectParameterException.class) - .hasMessageContaining("Incorrect Id null"); - } }