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

changed method of generating event in tests

Browse Source
This commit is contained in:
IrynaMatveieva 2024-03-19 13:32:59 +02:00
parent 683fdfb539
commit 8767b6d845
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
View File

@ -98,6 +98,10 @@ public abstract class AbstractServiceTest {
protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId) throws IOException { protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId) throws IOException {
return generateEvent(tenantId, entityId, null);
}
protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId, String eventType) throws IOException {
if (tenantId == null) { if (tenantId == null) {
tenantId = TenantId.fromUUID(Uuids.timeBased()); tenantId = TenantId.fromUUID(Uuids.timeBased());
} }
@ -105,6 +109,7 @@ public abstract class AbstractServiceTest {
.tenantId(tenantId) .tenantId(tenantId)
.entityId(entityId.getId()) .entityId(entityId.getId())
.serviceId("server A") .serviceId("server A")
.eventType(eventType)
.data(JacksonUtil.toString(readFromResource("TestJsonData.json"))) .data(JacksonUtil.toString(readFromResource("TestJsonData.json")))
.build(); .build();
} }

23
dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
View File

@ -133,12 +133,12 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest {
} }
@Test @Test
public void findLatestDebugRuleNodeInEvent() { public void findLatestDebugRuleNodeInEvent() throws Exception {
CustomerId customerId = new CustomerId(Uuids.timeBased()); CustomerId customerId = new CustomerId(Uuids.timeBased());
TenantId tenantId = TenantId.fromUUID(Uuids.timeBased()); TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
Event event1 = saveDebugEvent(customerId, tenantId); Event event1 = saveEventWithProvidedTimeAndEventType(eventTime, "IN", customerId, tenantId);
Event event2 = saveDebugEvent(customerId, tenantId); Event event2 = saveEventWithProvidedTimeAndEventType(eventTime + 1, "IN", customerId, tenantId);
EventInfo event = eventService.findLatestDebugRuleNodeInEvent(tenantId, customerId); EventInfo event = eventService.findLatestDebugRuleNodeInEvent(tenantId, customerId);
@ -149,21 +149,14 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest {
} }
private Event saveEventWithProvidedTime(long time, EntityId entityId, TenantId tenantId) throws Exception { private Event saveEventWithProvidedTime(long time, EntityId entityId, TenantId tenantId) throws Exception {
RuleNodeDebugEvent event = generateEvent(tenantId, entityId); return saveEventWithProvidedTimeAndEventType(time, null, entityId, tenantId);
}
private Event saveEventWithProvidedTimeAndEventType(long time, String eventType, EntityId entityId, TenantId tenantId) throws Exception {
RuleNodeDebugEvent event = generateEvent(tenantId, entityId, eventType);
event.setId(new EventId(Uuids.timeBased())); event.setId(new EventId(Uuids.timeBased()));
event.setCreatedTime(time); event.setCreatedTime(time);
eventService.saveAsync(event).get(); eventService.saveAsync(event).get();
return event; return event;
} }
private Event saveDebugEvent(EntityId entityId, TenantId tenantId) {
Event event = RuleNodeDebugEvent.builder()
.tenantId(tenantId)
.entityId(entityId.getId())
.serviceId("server A")
.eventType("IN")
.build();
eventService.saveAsync(event);
return event;
}
} }

13
dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
View File

@ -112,14 +112,15 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
} }
@Test @Test
public void findLatestDebugRuleNodeInEvent() { public void findLatestDebugRuleNodeInEvent() throws Exception {
UUID entityId = Uuids.timeBased(); UUID entityId = Uuids.timeBased();
RuleNodeDebugEventEntity event = getDebugEventEntity(Uuids.timeBased(), tenantId, entityId); RuleNodeDebugEventEntity event = getDebugInEventEntity(Uuids.timeBased(), tenantId, entityId);
eventDao.saveAsync(event.toData()); eventDao.saveAsync(event.toData()).get(1, TimeUnit.MINUTES);
RuleNodeDebugEventEntity event2 = getDebugEventEntity(Uuids.timeBased(), tenantId, entityId); Thread.sleep(2);
eventDao.saveAsync(event2.toData()); RuleNodeDebugEventEntity event2 = getDebugInEventEntity(Uuids.timeBased(), tenantId, entityId);
eventDao.saveAsync(event2.toData()).get(1, TimeUnit.MINUTES);
RuleNodeDebugEventEntity foundEvent = ruleNodeDebugEventRepository.findLatestDebugRuleNodeInEvent(tenantId, entityId).get(); RuleNodeDebugEventEntity foundEvent = ruleNodeDebugEventRepository.findLatestDebugRuleNodeInEvent(tenantId, entityId).get();
assertNotNull("Events expected to be not null", foundEvent); assertNotNull("Events expected to be not null", foundEvent);
@ -139,7 +140,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
return event.build(); return event.build();
} }
private RuleNodeDebugEventEntity getDebugEventEntity(UUID eventId, UUID tenantId, UUID entityId) { private RuleNodeDebugEventEntity getDebugInEventEntity(UUID eventId, UUID tenantId, UUID entityId) {
RuleNodeDebugEventEntity event = new RuleNodeDebugEventEntity(); RuleNodeDebugEventEntity event = new RuleNodeDebugEventEntity();
event.setId(eventId); event.setId(eventId);
event.setEventType("IN"); event.setEventType("IN");