Browse Source

fixed test

pull/8216/head
dashevchenko 4 years ago
parent
commit
a0f46e2e24
  1. 7
      dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java

7
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.Alarm;
import org.thingsboard.server.common.data.alarm.AlarmComment; import org.thingsboard.server.common.data.alarm.AlarmComment;
import org.thingsboard.server.common.data.alarm.AlarmCommentInfo; 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.AlarmSeverity;
import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.alarm.AlarmStatus;
import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.AssetId;
@ -158,7 +159,9 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
alarmCommentService.deleteAlarmComment(tenantId, createdComment, user); alarmCommentService.deleteAlarmComment(tenantId, createdComment, user);
AlarmComment fetched = alarmCommentService.findAlarmCommentByIdAsync(tenantId, createdComment.getId()).get(); AlarmComment fetched = alarmCommentService.findAlarmCommentByIdAsync(tenantId, createdComment.getId()).get();
Assert.assertNull(fetched.getUserId());
Assert.assertNull("Alarm comment was returned when it was expected to be null", fetched); 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()));
} }
} }

Loading…
Cancel
Save