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

refactoring: customer tests error -> different type exception

Browse Source
This commit is contained in:
nickAS21 2022-06-16 15:33:22 +03:00
parent 7a4be17442
commit 1df23e2a9a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
View File

@ -86,12 +86,7 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
UserId userId, String userName, ActionType actionType, Exception exp, UserId userId, String userName, ActionType actionType, Exception exp,
Object... additionalInfo) { Object... additionalInfo) {
CustomerId customer_NULL_UUID = (CustomerId) EntityIdFactory.getByTypeAndUuid(EntityType.CUSTOMER, ModelConstants.NULL_UUID); CustomerId customer_NULL_UUID = (CustomerId) EntityIdFactory.getByTypeAndUuid(EntityType.CUSTOMER, ModelConstants.NULL_UUID);
EntityId entity_NULL_UUID = EntityIdFactory.getByTypeAndUuid( EntityId entity_NULL_UUID = createEntityId_NULL_UUID (entity);
EntityType
.valueOf(entity.getClass()
.toString()
.substring(entity.getClass().toString().lastIndexOf(".") + 1).toUpperCase(Locale.ENGLISH)),
ModelConstants.NULL_UUID);
testNotificationMsgToEdgeServiceNever(entity_NULL_UUID); testNotificationMsgToEdgeServiceNever(entity_NULL_UUID);
if (additionalInfo.length > 0) { if (additionalInfo.length > 0) {
Mockito.verify(auditLogService, times(1)) Mockito.verify(auditLogService, times(1))
@ -114,6 +109,7 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
} }
protected void testNotifyEntityNever(EntityId entityId, HasName entity) { protected void testNotifyEntityNever(EntityId entityId, HasName entity) {
entityId = entityId == null ? createEntityId_NULL_UUID (entity) : entityId;
testNotificationMsgToEdgeServiceNever(entityId); testNotificationMsgToEdgeServiceNever(entityId);
testLogEntityActionNever(entityId, entity); testLogEntityActionNever(entityId, entity);
testPushMsgToRuleEngineNever(entityId); testPushMsgToRuleEngineNever(entityId);
@ -176,4 +172,10 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
} }
return result; return result;
} }
private EntityId createEntityId_NULL_UUID (HasName entity) {
return EntityIdFactory.getByTypeAndUuid(EntityType.valueOf(entity.getClass().toString()
.substring(entity.getClass().toString().lastIndexOf(".") + 1).toUpperCase(Locale.ENGLISH)),
ModelConstants.NULL_UUID);
}
} }