From 6098f19dc23163185ffb7a10e72d942cb87e6e53 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 9 Sep 2024 13:51:49 +0300
Subject: [PATCH] Refactoring to remove duplicates

---
 .../thingsboard/server/edge/AbstractEdgeTest.java | 15 +++++++++++----
 .../server/edge/RuleChainEdgeTest.java            |  5 +----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
index 34f7da02e6..5484c29305 100644
--- a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
@@ -103,6 +103,7 @@ import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Random;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -124,6 +125,8 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
     protected EdgeImitator edgeImitator;
     protected Edge edge;
 
+    private Random random = new Random();
+
     @Autowired
     protected EdgeEventService edgeEventService;
 
@@ -191,10 +194,7 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
 
         Asset savedAsset = saveAsset("Edge Asset 1");
 
-        RuleChainId rootRuleChainId = getEdgeRootRuleChainId();
-        RuleChainMetaData rootRuleChainMetadata = doGet("/api/ruleChain/" + rootRuleChainId.getId().toString() + "/metadata", RuleChainMetaData.class);
-        rootRuleChainMetadata.getNodes().forEach(n -> n.setDebugMode(true));
-        doPost("/api/ruleChain/metadata", rootRuleChainMetadata, RuleChainMetaData.class);
+        updateRootRuleChainMetadata();
 
         edge = doPost("/api/edge", constructEdge("Test Edge", "test"), Edge.class);
 
@@ -207,6 +207,13 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         TimeUnit.MILLISECONDS.sleep(1000);
     }
 
+    protected void updateRootRuleChainMetadata() throws Exception {
+        RuleChainId rootRuleChainId = getEdgeRootRuleChainId();
+        RuleChainMetaData rootRuleChainMetadata = doGet("/api/ruleChain/" + rootRuleChainId.getId().toString() + "/metadata", RuleChainMetaData.class);
+        rootRuleChainMetadata.getNodes().forEach(n -> n.setDebugMode(random.nextBoolean()));
+        doPost("/api/ruleChain/metadata", rootRuleChainMetadata, RuleChainMetaData.class);
+    }
+
     protected void extendDeviceProfileData(DeviceProfile deviceProfile) {
         DeviceProfileData profileData = deviceProfile.getProfileData();
         List<DeviceProfileAlarm> alarms = new ArrayList<>();
diff --git a/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java
index 6dafeefa80..eaf4468156 100644
--- a/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java
@@ -187,11 +187,8 @@ public class RuleChainEdgeTest extends AbstractEdgeTest {
 
     @Test
     public void testUpdateRootRuleChain() throws Exception {
-        RuleChainMetaData rootRuleChainMetadata = doGet("/api/ruleChain/" + edge.getRootRuleChainId().getId().toString() + "/metadata", RuleChainMetaData.class);
-
-        rootRuleChainMetadata.getNodes().forEach(n -> n.setDebugMode(true));
         edgeImitator.expectMessageAmount(2);
-        doPost("/api/ruleChain/metadata", rootRuleChainMetadata, RuleChainMetaData.class);
+        updateRootRuleChainMetadata();
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         Optional<RuleChainUpdateMsg> ruleChainUpdateMsgOpt = edgeImitator.findMessageByType(RuleChainUpdateMsg.class);