dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed test

Browse Source
This commit is contained in:
dashevchenko 2022-12-21 13:41:42 +02:00
parent c81e442b35
commit 2db28e2296
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentService.java
View File

@ -29,7 +29,7 @@ public interface AlarmCommentService {
AlarmCommentOperationResult deleteAlarmComment(TenantId tenantId, AlarmCommentId alarmCommentId); AlarmCommentOperationResult deleteAlarmComment(TenantId tenantId, AlarmCommentId alarmCommentId);
PageData<AlarmCommentInfo>findAlarmComments(TenantId tenantId, AlarmId alarmId, PageLink pageLink); PageData<AlarmCommentInfo> findAlarmComments(TenantId tenantId, AlarmId alarmId, PageLink pageLink);
ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId); ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId);

6
dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
View File

@ -64,6 +64,8 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
user.setAuthority(Authority.TENANT_ADMIN); user.setAuthority(Authority.TENANT_ADMIN);
user.setTenantId(tenantId); user.setTenantId(tenantId);
user.setEmail("tenant@thingsboard.org"); user.setEmail("tenant@thingsboard.org");
user.setFirstName("John");
user.setLastName("Brown");
user = userService.saveUser(user); user = userService.saveUser(user);
} }
@ -98,7 +100,7 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
PageData<AlarmCommentInfo> alarmComments = alarmCommentService.findAlarmComments(tenantId, alarm.getId(), new PageLink(10, 0)); PageData<AlarmCommentInfo> alarmComments = alarmCommentService.findAlarmComments(tenantId, alarm.getId(), new PageLink(10, 0));
Assert.assertNotNull(alarmComments.getData()); Assert.assertNotNull(alarmComments.getData());
Assert.assertEquals(1, alarmComments.getData().size()); Assert.assertEquals(1, alarmComments.getData().size());
Assert.assertEquals(createdComment, alarmComments.getData().get(0)); Assert.assertEquals(createdComment, new AlarmComment(alarmComments.getData().get(0)));
} }
@Test @Test
@ -134,7 +136,7 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
PageData<AlarmCommentInfo> alarmComments = alarmCommentService.findAlarmComments(tenantId, alarm.getId(), new PageLink(10, 0)); PageData<AlarmCommentInfo> alarmComments = alarmCommentService.findAlarmComments(tenantId, alarm.getId(), new PageLink(10, 0));
Assert.assertNotNull(alarmComments.getData()); Assert.assertNotNull(alarmComments.getData());
Assert.assertEquals(1, alarmComments.getData().size()); Assert.assertEquals(1, alarmComments.getData().size());
Assert.assertEquals(new AlarmCommentInfo(updatedComment), alarmComments.getData().get(0)); Assert.assertEquals(updatedComment, new AlarmComment(alarmComments.getData().get(0)));
} }
@Test @Test