updated upgrade tests for versioned nodes

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java

@@ -154,12 +154,12 @@ public class TbFetchDeviceCredentialsNodeTest {
     }
 
     @Test
-    void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         String oldConfig = "{\"fetchToMetadata\":true}";
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         assertTrue(upgrade.getFirst());
-        assertEquals(JacksonUtil.valueToTree(config), upgrade.getSecond());
+        assertEquals(config, JacksonUtil.treeToValue(upgrade.getSecond(), config.getClass()));
     }
 
     private TbMsg getTbMsg(EntityId entityId) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java

@@ -251,7 +251,7 @@ public class TbGetAttributesNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetAttributesNodeConfiguration().defaultConfiguration();
         var node = new TbGetAttributesNode();
         String oldConfig = "{\"fetchToData\":false," +
@@ -264,7 +264,7 @@ public class TbGetAttributesNodeTest {
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
     private TbMsg checkMsg(boolean checkSuccess) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java

@@ -455,14 +455,14 @@ public class TbGetCustomerAttributeNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetEntityDataNodeConfiguration().defaultConfiguration();
         var node = new TbGetCustomerAttributeNode();
         String oldConfig = "{\"attrMapping\":{\"alarmThreshold\":\"threshold\"},\"telemetry\":false}";
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
     private void prepareMsgAndConfig(FetchTo fetchTo, DataToFetch dataToFetch, EntityId originator) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java

@@ -448,14 +448,14 @@ public class TbGetCustomerDetailsNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetCustomerDetailsNodeConfiguration().defaultConfiguration();
         var node = new TbGetCustomerDetailsNode();
         String oldConfig = "{\"detailsList\":[],\"addToMetadata\":false}";
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
     private void prepareMsgAndConfig(FetchTo fetchTo, List<ContactBasedEntityDetails> detailsList, EntityId originator) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java

@@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.util.TbPair;
 public class TbGetDeviceAttrNodeTest {
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetDeviceAttrNodeConfiguration().defaultConfiguration();
         var node = new TbGetDeviceAttrNode();
         String oldConfig = "{\"fetchToData\":false," +
@@ -39,7 +39,7 @@ public class TbGetDeviceAttrNodeTest {
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
 }

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java

@@ -344,14 +344,14 @@ public class TbGetOriginatorFieldsNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetOriginatorFieldsConfiguration().defaultConfiguration();
         var node = new TbGetOriginatorFieldsNode();
         String oldConfig = "{\"fieldsMapping\":{\"name\":\"originatorName\",\"type\":\"originatorType\"},\"ignoreNullStrings\":false}";
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
 }

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java

@@ -569,7 +569,7 @@ public class TbGetRelatedAttributeNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetRelatedDataNodeConfiguration().defaultConfiguration();
         var node = new TbGetRelatedAttributeNode();
         String oldConfig = "{\"attrMapping\":{\"serialNumber\":\"sn\"}," +
@@ -580,7 +580,7 @@ public class TbGetRelatedAttributeNodeTest {
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
     private void prepareMsgAndConfig(FetchTo fetchTo, DataToFetch dataToFetch, EntityId originator) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java

@@ -385,14 +385,14 @@ public class TbGetTenantAttributeNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetEntityDataNodeConfiguration().defaultConfiguration();
         var node = new TbGetTenantAttributeNode();
         String oldConfig = "{\"attrMapping\":{\"alarmThreshold\":\"threshold\"},\"telemetry\":false}";
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
     private void prepareMsgAndConfig(FetchTo fetchTo, DataToFetch dataToFetch, EntityId originator) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java

@@ -263,14 +263,14 @@ public class TbGetTenantDetailsNodeTest {
     }
 
     @Test
-    public void givenOldConfig_whenUpgrade_thenShouldReturnSuccessResult() throws Exception {
+    public void givenOldConfig_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
         var defaultConfig = new TbGetTenantDetailsNodeConfiguration().defaultConfiguration();
         var node = new TbGetTenantDetailsNode();
         String oldConfig = "{\"detailsList\":[],\"addToMetadata\":false}";
         JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
         TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
         Assertions.assertTrue(upgrade.getFirst());
-        Assertions.assertEquals(JacksonUtil.valueToTree(defaultConfig), upgrade.getSecond());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
     private void prepareMsgAndConfig(FetchTo fetchTo, List<ContactBasedEntityDetails> detailsList) {