#49 Fixed bug in QueueBrowser by deleting it. Is deprecated since 2021

swisspost · Jun 5, 2024 · 2b37662 · 2b37662
1 parent 515ad2a
commit 2b37662
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/AbstractTest.java b/gateleen-test/src/test/java/org/swisspush/gateleen/AbstractTest.java
@@ -104,6 +104,7 @@ public abstract class AbstractTest {
     protected static final int REDIS_PORT = 6379;
     protected static final int STORAGE_PORT = 8989;
     private static final int CIRCUIT_BREAKER_REST_API_PORT = 7014;
+    protected static final int REDISQUES_API_PORT = 7015;
 
     /**
      * Basis configuration for RestAssured

diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/TestUtils.java b/gateleen-test/src/test/java/org/swisspush/gateleen/TestUtils.java
@@ -114,6 +114,23 @@ public static void waitSomeTime(int seconds) {
         }
     }
 
+    /**
+     * Adds the routing rule for queuing to the given routing rules.
+     *
+     * @param rules current rules.
+     */
+    public static JsonObject addRoutingRuleQueuing(JsonObject rules) {
+
+        JsonObject queuing = createRoutingRule(ImmutableMap.of(
+                "description",
+                "vertx-redisques API",
+                "url",
+                "http://localhost:" + AbstractTest.REDISQUES_API_PORT + "/queuing/$1"));
+
+        rules = addRoutingRule(rules, AbstractTest.SERVER_ROOT + "/queuing/(.*)", queuing);
+        return rules;
+    }
+
     /**
      * Adds the routing rule for cleanup to the given routing rules.
      * 

diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/hook/ListenerTest.java b/gateleen-test/src/test/java/org/swisspush/gateleen/hook/ListenerTest.java
@@ -63,6 +63,7 @@ private void initRoutingRules() {
         // add a routing
         JsonObject rules = new JsonObject();
         rules = TestUtils.addRoutingRuleMainStorage(rules);
+        rules = TestUtils.addRoutingRuleQueuing(rules);
         rules = TestUtils.addRoutingRuleHooks(rules);
         TestUtils.putRoutingRules(rules);
     }

diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/queue/QueueTest.java b/gateleen-test/src/test/java/org/swisspush/gateleen/queue/QueueTest.java
@@ -30,6 +30,7 @@ public void init() {
         // add a routing
         JsonObject rules = new JsonObject();
         rules = TestUtils.addRoutingRuleMainStorage(rules);
+        rules = TestUtils.addRoutingRuleQueuing(rules);
         rules = TestUtils.addRoutingRuleCleanup(rules);
         TestUtils.putRoutingRules(rules);
     }