Merge pull request #5 from mcweba/master

Using RedisquesConfiguration in unit tests

Author: lbovet

gradle.properties

@@ -1,6 +1,6 @@
 modowner=org.swisspush
 modname=redisques
-version=2.1.1
+version=2.1.2
 
 gradleVersion=2.3
 vertxVersion=3.2.0

src/main/java/org/swisspush/redisques/RedisQues.java

@@ -456,15 +456,21 @@ private void processMessageWithTimeout(final String queue, final String payload,
 
         // start a timer, which will cancel the processing, if the consumer didn't respond
         final long timeoutId = vertx.setTimer(processorTimeout, timeoutId1 -> {
-            log.debug("RedisQues QUEUE_ERROR: Consumer timeout " + uid + " queue: " + queue);
+            log.info("RedisQues QUEUE_ERROR: Consumer timeout " + uid + " queue: " + queue);
             handler.handle(new SendResult(false, timeoutId1));
         });
 
         // send the message to the consumer
         eb.send(processorAddress, message, new Handler<AsyncResult<Message<JsonObject>>>() {
             @Override
             public void handle(AsyncResult<Message<JsonObject>> reply) {
-                handler.handle(new SendResult(reply.result().body().getString(STATUS).equals(OK), timeoutId));
+                Boolean success;
+                if(reply.succeeded()){
+                    success = OK.equals(reply.result().body().getString(STATUS));
+                } else {
+                    success = Boolean.FALSE;
+                }
+                handler.handle(new SendResult(success, timeoutId));
             }
         });
         updateTimestamp(queue, null);

src/test/java/org/swisspush/redisques/AbstractTestCase.java

@@ -18,6 +18,7 @@
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
+import org.swisspush.redisques.util.RedisquesConfiguration;
 import redis.clients.jedis.Jedis;
 
 import javax.xml.bind.DatatypeConverter;
@@ -93,14 +94,14 @@ private static void setUp(TestContext context) {
         vertx = Vertx.vertx();
         initProcessor(vertx.eventBus());
 
-        JsonObject redisquesConfig = new JsonObject();
-        redisquesConfig.put("redisHost", "localhost");
-        redisquesConfig.put("redisPort", 6379);
-        redisquesConfig.put("redisEncoding", "ISO-8859-1");
-        redisquesConfig.put("processor-address", "processor-address");
+        JsonObject config = RedisquesConfiguration.with()
+                .processorAddress("processor-address")
+                .redisEncoding("ISO-8859-1")
+                .build()
+                .asJsonObject();
 
         RedisQues redisQues = new RedisQues();
-        vertx.deployVerticle(redisQues, new DeploymentOptions().setConfig(redisquesConfig), context.asyncAssertSuccess(event -> {
+        vertx.deployVerticle(redisQues, new DeploymentOptions().setConfig(config), context.asyncAssertSuccess(event -> {
             log.info("vert.x Deploy - " + redisQues.getClass().getSimpleName() + " was successful.");
             jedis = new Jedis("localhost", 6379, 5000);
         }));