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

refactored tests

Browse Source
This commit is contained in:
IrynaMatveieva 2024-07-09 12:41:33 +03:00
parent a40ce3305e
commit c7005971ad
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java
View File

@ -216,13 +216,14 @@ public class TbMsgGeneratorNode implements TbNode {
} }
case 1: case 1:
String originatorType = "originatorType"; String originatorType = "originatorType";
if (oldConfiguration.has(originatorType)) { String originatorId = "originatorId";
var origType = oldConfiguration.get(originatorType); boolean hasType = oldConfiguration.hasNonNull(originatorType);
var origId = oldConfiguration.get("originatorId"); boolean hasOriginatorId = oldConfiguration.hasNonNull(originatorId) &&
if (origType.isNull() || origType.asText().isEmpty() || origId.isNull() || origId.asText().isEmpty()) { StringUtils.isNotBlank(oldConfiguration.get(originatorId).asText());
((ObjectNode) oldConfiguration).put(originatorType, EntityType.RULE_NODE.name()); boolean hasOriginatorFields = hasType && hasOriginatorId;
hasChanges = true; if (!hasOriginatorFields) {
} hasChanges = true;
((ObjectNode) oldConfiguration).put(originatorType, EntityType.RULE_NODE.name());
} }
break; break;
default: default:

16
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java
View File

@ -38,6 +38,7 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration;
import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.TbNodeException;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.RuleNodeId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.msg.TbMsgType; import org.thingsboard.server.common.data.msg.TbMsgType;
@ -130,7 +131,9 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest {
: "Originator type '" + entityType + "' is not supported."; : "Originator type '" + entityType + "' is not supported.";
assertThatThrownBy(() -> node.init(ctxMock, configuration)) assertThatThrownBy(() -> node.init(ctxMock, configuration))
.isInstanceOf(TbNodeException.class) .isInstanceOf(TbNodeException.class)
.hasMessage(errorMsg); .hasMessage(errorMsg)
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
} }
} }
@ -168,18 +171,15 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest {
// GIVEN // GIVEN
EntityType entityType = EntityType.valueOf(entityTypeStr); EntityType entityType = EntityType.valueOf(entityTypeStr);
config.setOriginatorType(entityType); config.setOriginatorType(entityType);
UUID entityId = UUID.randomUUID(); String entityIdStr = "5751f55e-089e-4be0-b10a-dd942053dcf0";
config.setOriginatorId(entityId.toString()); config.setOriginatorId(entityIdStr);
EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, entityIdStr);
// WHEN // WHEN
node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config))); node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
// THEN // THEN
ArgumentCaptor<EntityId> actualEntityIdCaptor = ArgumentCaptor.forClass(EntityId.class); then(ctxMock).should().isLocalEntity(entityId);
then(ctxMock).should().isLocalEntity(actualEntityIdCaptor.capture());
EntityId actualEntityId = actualEntityIdCaptor.getValue();
assertThat(actualEntityId.getEntityType()).isEqualTo(entityType);
assertThat(actualEntityId.getId()).isEqualTo(entityId);
} }
@Test @Test