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

black-box-test: cleanup code

Browse Source
This commit is contained in:
Sergey Matvienko 2022-06-24 03:06:53 +03:00
parent 2aeb735b95
commit d828ea2e17
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
View File

@ -77,7 +77,8 @@ public class ContainerTestSuite {
} }
} }
List<File> composeFiles = new ArrayList<>(Arrays.asList(new File(targetDir + "docker-compose.yml"), List<File> composeFiles = new ArrayList<>(Arrays.asList(
new File(targetDir + "docker-compose.yml"),
new File(targetDir + "docker-compose.volumes.yml"), new File(targetDir + "docker-compose.volumes.yml"),
IS_HYBRID_MODE IS_HYBRID_MODE
? new File(targetDir + "docker-compose.hybrid.yml") ? new File(targetDir + "docker-compose.hybrid.yml")
@ -85,11 +86,11 @@ public class ContainerTestSuite {
new File(targetDir + "docker-compose.postgres.volumes.yml"), new File(targetDir + "docker-compose.postgres.volumes.yml"),
new File(targetDir + "docker-compose.kafka.yml"), new File(targetDir + "docker-compose.kafka.yml"),
IS_REDIS_CLUSTER IS_REDIS_CLUSTER
? new File("./../../docker/docker-compose.redis-cluster.yml") ? new File(targetDir + "docker-compose.redis-cluster.yml")
: new File("./../../docker/docker-compose.redis.yml"), : new File(targetDir + "docker-compose.redis.yml"),
IS_REDIS_CLUSTER IS_REDIS_CLUSTER
? new File("./../../docker/docker-compose.redis-cluster.volumes.yml") ? new File(targetDir + "docker-compose.redis-cluster.volumes.yml")
: new File("./../../docker/docker-compose.redis.volumes.yml"))); : new File(targetDir + "docker-compose.redis.volumes.yml")));
if (IS_HYBRID_MODE) { if (IS_HYBRID_MODE) {
composeFiles.add(new File(targetDir + "docker-compose.cassandra.volumes.yml")); composeFiles.add(new File(targetDir + "docker-compose.cassandra.volumes.yml"));

6
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
View File

@ -21,7 +21,11 @@ import org.junit.rules.ExternalResource;
import org.testcontainers.utility.Base58; import org.testcontainers.utility.Base58;
import java.io.File; import java.io.File;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;