From 4065c94131165ded41d38eccc43c4ec6fd1ede64 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Mon, 5 Jun 2023 17:15:32 +0300
Subject: [PATCH] Refactor naming to resolve redis compose in black-box tests

---
 .../thingsboard/server/msa/ContainerTestSuite.java   |  8 ++++----
 .../server/msa/ThingsBoardDbInstaller.java           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index 95b1b2129e..dd3948c495 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -111,8 +111,8 @@ public class ContainerTestSuite {
                     new File(targetDir + (IS_HYBRID_MODE ? "docker-compose.hybrid-test-extras.yml" : "docker-compose.postgres-test-extras.yml")),
                     new File(targetDir + "docker-compose.postgres.volumes.yml"),
                     new File(targetDir + "docker-compose." + QUEUE_TYPE + ".yml"),
-                    new File(targetDir + resolveComposeFile()),
-                    new File(targetDir + resolveComposeVolumesFile()),
+                    new File(targetDir + resolveRedisComposeFile()),
+                    new File(targetDir + resolveRedisComposeVolumesFile()),
                     new File(targetDir + ("docker-selenium.yml"))
             ));
 
@@ -179,7 +179,7 @@ public class ContainerTestSuite {
         }
     }
 
-    private static String resolveComposeFile() {
+    private static String resolveRedisComposeFile() {
         if (IS_REDIS_CLUSTER) {
             return "docker-compose.redis-cluster.yml";
         }
@@ -189,7 +189,7 @@ public class ContainerTestSuite {
         return "docker-compose.redis.yml";
     }
 
-    private static String resolveComposeVolumesFile() {
+    private static String resolveRedisComposeVolumesFile() {
         if (IS_REDIS_CLUSTER) {
             return "docker-compose.redis-cluster.volumes.yml";
         }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
index ea3c9c637a..e41bbc3449 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
@@ -77,8 +77,8 @@ public class ThingsBoardDbInstaller {
                        ? new File("./../../docker/docker-compose.hybrid.yml")
                        : new File("./../../docker/docker-compose.postgres.yml"),
                 new File("./../../docker/docker-compose.postgres.volumes.yml"),
-                resolveComposeFile(),
-                resolveComposeVolumesFile()
+                resolveRedisComposeFile(),
+                resolveRedisComposeVolumesFile()
         ));
         if (IS_HYBRID_MODE) {
             composeFiles.add(new File("./../../docker/docker-compose.cassandra.volumes.yml"));
@@ -132,7 +132,7 @@ public class ThingsBoardDbInstaller {
         dockerCompose.withEnv(env);
     }
 
-    private static File resolveComposeVolumesFile() {
+    private static File resolveRedisComposeVolumesFile() {
         if (IS_REDIS_CLUSTER) {
             return new File("./../../docker/docker-compose.redis-cluster.volumes.yml");
         }
@@ -142,7 +142,7 @@ public class ThingsBoardDbInstaller {
         return new File("./../../docker/docker-compose.redis.volumes.yml");
     }
 
-    private static File resolveComposeFile() {
+    private static File resolveRedisComposeFile() {
         if (IS_REDIS_CLUSTER) {
             return new File("./../../docker/docker-compose.redis-cluster.yml");
         }
@@ -241,11 +241,11 @@ public class ThingsBoardDbInstaller {
 
         dockerCompose.withCommand("volume rm -f " + postgresDataVolume + " " + tbLogVolume +
                 " " + tbCoapTransportLogVolume + " " + tbLwm2mTransportLogVolume + " " + tbHttpTransportLogVolume +
-                " " + tbMqttTransportLogVolume + " " + tbSnmpTransportLogVolume + " " + tbVcExecutorLogVolume + resolveComposeVolumeLog());
+                " " + tbMqttTransportLogVolume + " " + tbSnmpTransportLogVolume + " " + tbVcExecutorLogVolume + resolveRedisComposeVolumeLog());
         dockerCompose.invokeDocker();
     }
 
-    private String resolveComposeVolumeLog() {
+    private String resolveRedisComposeVolumeLog() {
         if (IS_REDIS_CLUSTER) {
             return IntStream.range(0, 6).mapToObj(i -> " " + redisClusterDataVolume + "-" + i).collect(Collectors.joining());
         }