clean up tests

orkes-io · Sep 8, 2022 · d5a85dc · d5a85dc
1 parent bf70eb9
commit d5a85dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/...nductor-queues/src/test/java/io/orkes/conductor/queue/dao/ClusteredRedisQueueDAOTest.java b/...nductor-queues/src/test/java/io/orkes/conductor/queue/dao/ClusteredRedisQueueDAOTest.java
@@ -18,7 +18,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Rule;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
@@ -40,8 +39,7 @@ class ClusteredRedisQueueDAOTest {
 
     int[] ports = new int[] {7000, 7001, 7002, 7003, 7004, 7005};
 
-    @Rule
-    public static FixedPortContainer redis =
+    private static FixedPortContainer redis =
             new FixedPortContainer(DockerImageName.parse("orkesio/redis-cluster"));
 
     static {

diff --git a/orkes-conductor-queues/src/test/java/io/orkes/conductor/queue/dao/QueueDAOTest.java b/orkes-conductor-queues/src/test/java/io/orkes/conductor/queue/dao/QueueDAOTest.java
@@ -18,7 +18,6 @@
 import java.util.stream.Collectors;
 
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
@@ -45,12 +44,11 @@ public class QueueDAOTest {
 
     private static final String queueName = "test";
 
-    @Rule
-    public static GenericContainer redis =
+    private static GenericContainer redis =
             new GenericContainer(DockerImageName.parse("redis:6.2.6-alpine"))
                     .withExposedPorts(6379);
 
-    @Rule static QueueDAO redisQueue;
+    private static QueueDAO redisQueue;
 
     private static JedisPool jedisPool;
 

diff --git a/orkes-redis-queues/src/test/java/io/orkes/conductor/mq/ConductorRedisQueueTest.java b/orkes-redis-queues/src/test/java/io/orkes/conductor/mq/ConductorRedisQueueTest.java
@@ -19,7 +19,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import org.junit.Rule;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
@@ -39,12 +38,11 @@ public class ConductorRedisQueueTest {
 
     private static final String queueName = "test";
 
-    @Rule
-    public static GenericContainer redis =
+    private static GenericContainer redis =
             new GenericContainer(DockerImageName.parse("redis:6.2.6-alpine"))
                     .withExposedPorts(6379);
 
-    @Rule static ConductorRedisQueue redisQueue;
+    private static ConductorRedisQueue redisQueue;
 
     private static JedisPool jedisPool;