From a0f46e2e242027d61ad527f7d4d243810f9bed45 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Wed, 15 Mar 2023 18:37:42 +0200 Subject: [PATCH] fixed test --- .../server/dao/service/BaseAlarmCommentServiceTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java index ea7e19c058..0f2ef81eb5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java @@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmComment; import org.thingsboard.server.common.data.alarm.AlarmCommentInfo; +import org.thingsboard.server.common.data.alarm.AlarmCommentType; import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.id.AssetId; @@ -158,7 +159,9 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest { alarmCommentService.deleteAlarmComment(tenantId, createdComment, user); AlarmComment fetched = alarmCommentService.findAlarmCommentByIdAsync(tenantId, createdComment.getId()).get(); - - Assert.assertNull("Alarm comment was returned when it was expected to be null", fetched); + Assert.assertNull(fetched.getUserId()); + Assert.assertEquals(AlarmCommentType.SYSTEM, fetched.getType()); + Assert.assertEquals(fetched.getComment().get("text").asText(), String.format("User %s deleted his comment", + (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName())); } }