Fixed tests

aws-samples · Feb 21, 2018 · cf158fa · cf158fa
1 parent bf14046
commit cf158fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/...tracking-service/reactive-vertx/src/test/java/com/amazon/verticles/CacheVerticleTest.java b/...tracking-service/reactive-vertx/src/test/java/com/amazon/verticles/CacheVerticleTest.java
@@ -22,6 +22,7 @@
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonObject;
 import io.vertx.core.logging.Logger;
 import io.vertx.core.logging.LoggerFactory;
 import io.vertx.ext.unit.TestContext;
@@ -70,7 +71,7 @@ public void after(TestContext context) {
     public void writeFromRedisTest() {
         LOGGER.info(" ---> Testcase: writeFromRedisTest");
 
-        String message = Json.encode(prepareData());
+        JsonObject message = JsonObject.mapFrom(prepareData());
         eb.send(Constants.CACHE_REDIS_EVENTBUS_ADDRESS, message, res -> {
             if (res.succeeded()) {
                 Object body = res.result().body();
@@ -88,13 +89,14 @@ public void readFromCacheTest() {
         LOGGER.info(" ---> Testcase: readFromCacheTest");
 
         TrackingMessage testMessage = prepareData();
-        String message = Json.encode(testMessage);
+        JsonObject message = JsonObject.mapFrom(testMessage);
         eb.send(Constants.CACHE_EVENTBUS_ADDRESS, message, res -> {
             if (res.succeeded()) {
-                Object body = res.result().body();
+                JsonObject body = (JsonObject)res.result().body();
                 LOGGER.info("Received result " + body + " -> " + body.getClass().getName());
                 Assert.assertNotNull(body);
-                TrackingMessage resultMessage = Json.decodeValue((String)body, TrackingMessage.class);
+                LOGGER.info(body.getClass().getName());
+                TrackingMessage resultMessage = Json.decodeValue(body.encode(), TrackingMessage.class);
 
                 Assert.assertEquals(testMessage.getProgramId(), resultMessage.getProgramId());
 

diff --git a/...tracking-service/reactive-vertx/src/test/java/com/amazon/verticles/RedisVerticleTest.java b/...tracking-service/reactive-vertx/src/test/java/com/amazon/verticles/RedisVerticleTest.java
@@ -136,21 +136,21 @@ public void pubSubTest() throws Exception{
         // But first we wait a second ...
 
         Thread.sleep(1000);
-        Long result = jedis.publish(Constants.REDIS_PUBSUB_CHANNEL, prepareData().getProgramId());
+        Long result = jedis.publish(Constants.REDIS_PUBSUB_CHANNEL, Json.encode(prepareData()));
 
         LOGGER.info("Result: " + result);
 
         // CacheVerticle should be called -> data should be in the cache
 
         TrackingMessage testMessage = prepareData();
-        String message = Json.encode(testMessage);
+        JsonObject message = JsonObject.mapFrom(testMessage);
         try {
             eb.send(Constants.CACHE_EVENTBUS_ADDRESS, message, res -> {
                 if (res.succeeded()) {
-                    Object body = res.result().body();
+                    JsonObject body = (JsonObject)res.result().body();
                     LOGGER.info("Received result " + body + " -> " + body.getClass().getName());
                     Assert.assertNotNull(body);
-                    TrackingMessage resultMessage = Json.decodeValue((String) body, TrackingMessage.class);
+                    TrackingMessage resultMessage = Json.decodeValue(body.encode(), TrackingMessage.class);
 
                     Assert.assertEquals(testMessage.getProgramId(), resultMessage.getProgramId());
 
@@ -170,7 +170,7 @@ public void pubSubTest() throws Exception{
     public void readFromRedisTest() {
 
         TrackingMessage testMessage = prepareData();
-        String message = Json.encode(testMessage);
+        JsonObject message = JsonObject.mapFrom(testMessage);
 
         try {