Browse Source

UPD. Refactoring and changes according to comments.

Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
pull/10332/head
Oleksandra Matviienko 2 years ago
committed by Sergey Matvienko
parent
commit
4eeb0b2883
  1. 20
      dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java

20
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<? extends UUIDBased> 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");
}
}

Loading…
Cancel
Save