Unit Tests added

rule-engine/rule-engine-api/pom.xml

@@ -88,6 +88,17 @@
             <artifactId>javax.mail</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/util/TbNodeUtils.java

@@ -41,7 +41,7 @@ public class TbNodeUtils {
 
     private static final String METADATA_VARIABLE_TEMPLATE = "${%s}";
 
-    private static final Pattern DATA_PATTERN = Pattern.compile("(\\$\\[)(.*?)(\\])");
+    private static final Pattern DATA_PATTERN = Pattern.compile("(\\$\\[)(.*?)(])");
 
     private static final String DATA_VARIABLE_TEMPLATE = "$[%s]";
 
@@ -66,7 +66,6 @@ public class TbNodeUtils {
             JsonNode json = mapper.readTree(tbMsg.getData());
             if (json.isObject()) {
                 Matcher matcher = DATA_PATTERN.matcher(result);
-
                 while (matcher.find()) {
                     String group = matcher.group(2);
                     String[] keys = group.split("\\.");

rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java

@@ -0,0 +1,115 @@
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.api.util;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.dao.util.mapping.JacksonUtil;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TbNodeUtilsTest {
+
+    @Test
+    public void testSimpleReplacement() {
+        String pattern = "ABC ${metadata_key} $[data_key]";
+        TbMsgMetaData md = new TbMsgMetaData();
+        md.putValue("metadata_key", "metadata_value");
+
+        ObjectNode node = JacksonUtil.newObjectNode();
+        node.put("data_key", "data_value");
+
+        TbMsg msg = TbMsg.newMsg("CUSTOM", TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        String result = TbNodeUtils.processPattern(pattern, msg);
+        Assert.assertEquals("ABC metadata_value data_value", result);
+    }
+
+    @Test
+    public void testNoReplacement() {
+        String pattern = "ABC ${metadata_key} $[data_key]";
+        TbMsgMetaData md = new TbMsgMetaData();
+        md.putValue("key", "metadata_value");
+
+        ObjectNode node = JacksonUtil.newObjectNode();
+        node.put("key", "data_value");
+
+        TbMsg msg = TbMsg.newMsg("CUSTOM", TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        String result = TbNodeUtils.processPattern(pattern, msg);
+        Assert.assertEquals(pattern, result);
+    }
+
+    @Test
+    public void testSameKeysReplacement() {
+        String pattern = "ABC ${key} $[key]";
+        TbMsgMetaData md = new TbMsgMetaData();
+        md.putValue("key", "metadata_value");
+
+        ObjectNode node = JacksonUtil.newObjectNode();
+        node.put("key", "data_value");
+
+        TbMsg msg = TbMsg.newMsg("CUSTOM", TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        String result = TbNodeUtils.processPattern(pattern, msg);
+        Assert.assertEquals("ABC metadata_value data_value", result);
+    }
+
+    @Test
+    public void testComplexObjectReplacement() {
+        String pattern = "ABC ${key} $[key1.key2.key3]";
+        TbMsgMetaData md = new TbMsgMetaData();
+        md.putValue("key", "metadata_value");
+
+        ObjectNode key2Node = JacksonUtil.newObjectNode();
+        key2Node.put("key3", "value3");
+
+        ObjectNode key1Node = JacksonUtil.newObjectNode();
+        key1Node.set("key2", key2Node);
+
+
+        ObjectNode node = JacksonUtil.newObjectNode();
+        node.set("key1", key1Node);
+
+        TbMsg msg = TbMsg.newMsg("CUSTOM", TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        String result = TbNodeUtils.processPattern(pattern, msg);
+        Assert.assertEquals("ABC metadata_value value3", result);
+    }
+
+    @Test
+    public void testArrayReplacementDoesNotWork() {
+        String pattern = "ABC ${key} $[key1.key2[0].key3]";
+        TbMsgMetaData md = new TbMsgMetaData();
+        md.putValue("key", "metadata_value");
+
+        ObjectNode key2Node = JacksonUtil.newObjectNode();
+        key2Node.put("key3", "value3");
+
+        ObjectNode key1Node = JacksonUtil.newObjectNode();
+        key1Node.set("key2", key2Node);
+
+
+        ObjectNode node = JacksonUtil.newObjectNode();
+        node.set("key1", key1Node);
+
+        TbMsg msg = TbMsg.newMsg("CUSTOM", TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        String result = TbNodeUtils.processPattern(pattern, msg);
+        Assert.assertEquals("ABC metadata_value $[key1.key2[0].key3]", result);
+    }
+
+}