Adjusted tests to 'graph' wrapper JsonObject in reply message

engagingspaces · Oct 12, 2013 · 539e1fe · 539e1fe
1 parent e640932
commit 539e1fe
Showing 1 changed file with 37 additions and 17 deletions.
diff --git a/...va/eu/tradegrid/tinkerpop/persistor/integration/java/TinkerpopModuleIntegrationTests.java b/...va/eu/tradegrid/tinkerpop/persistor/integration/java/TinkerpopModuleIntegrationTests.java
@@ -108,6 +108,7 @@ public void call(Exception e) {
 
             @Override
             public void call(RxMessage<JsonObject> message) {
+                assertEquals("ok", message.body().getString("status"));
                 assertEquals(vertexId, message.body().getField("_id"));
                 testComplete();
             }
@@ -118,10 +119,16 @@ public void call(RxMessage<JsonObject> message) {
 
             @Override
             public Observable<RxMessage<JsonObject>> call(RxMessage<JsonObject> message) {
-                assertNotNull("Message body cannot be null", message.body());
-                assertEquals("vert.x", message.body().getString("project"));
+                assertEquals("ok", message.body().getString("status"));
+                assertNotNull("GraphSON: 'graph' object missing", message.body().getObject("graph"));
+                assertNotNull("GraphSON: 'vertices' array missing", message.body().getObject("graph").getArray("vertices"));
+                assertEquals(1, message.body().getObject("graph").getArray("vertices").size());
+                assertTrue(message.body().getObject("graph").getArray("vertices").get(0) instanceof JsonObject);
 
-                vertexId = message.body().getField("_id");
+                JsonObject vertex = message.body().getObject("graph").getArray("vertices").get(0);
+                assertEquals("vert.x", vertex.getString("project"));
+                assertNotNull(vertex.getField("_id"));
+                vertexId = vertex.getField("_id");
 
                 JsonObject vertexToRemove = new JsonObject();
                 vertexToRemove.putString("action", "removeVertex");
@@ -136,6 +143,9 @@ public Observable<RxMessage<JsonObject>> call(RxMessage<JsonObject> message) {
 
             @Override
             public Observable<RxMessage<JsonObject>> call(RxMessage<JsonObject> message) {
+                assertEquals("ok", message.body().getString("status"));
+                assertNotNull(message.body().getValue("_id"));
+
                 Object addedVertexId = message.body().getField("_id");
 
                 // NOTE: The id returned depends on the graphdb implementation used and is not
@@ -182,10 +192,10 @@ public void handle(Message<JsonObject> message) {
                     public void handle(Message<JsonObject> message) {
                         JsonObject reply = message.body();
                         assertEquals("ok", reply.getString("status"));
-                        assertNotNull(((JsonObject) message.body()
+                        assertNotNull(((JsonObject) message.body().getObject("graph")
                                 .getArray("vertices").get(0)).getField("_id"));
 
-                        outVertex = ((JsonObject) message.body()
+                        outVertex = ((JsonObject) message.body().getObject("graph")
                                 .getArray("vertices").get(0)).getField("_id");
 
                         final JsonObject addVertex = new JsonObject()
@@ -247,16 +257,25 @@ public void handle(Message<JsonObject> message) {
 
                 assertEquals("ok", reply.getString("status"));
 
-                if (config.getObject("tinkerpopConfig")
-                        .getString("blueprints.neo4j.directory") != null) {
-
-                    // In Neo4J we have to account for auto-generated root vertex.
-                    assertEquals(13, reply.getArray("vertices").size());
-                } else {
-                    assertEquals(12, reply.getArray("vertices").size());
+                // Graph is only returned if ID's were generated by the db
+                if (reply.getObject("graph") != null) {
+                    assertNotNull("GraphSON: 'vertices' array missing", message.body().getObject("graph").getArray("vertices"));
+                    assertNotNull("GraphSON: 'edges' array missing", message.body().getObject("graph").getArray("edges"));
+                    assertEquals(19, message.body().getObject("graph").getArray("edges").size());
+
+                    JsonArray vertices = message.body().getObject("graph").getArray("vertices");
+                    if (config.getObject("tinkerpopConfig").getString("blueprints.neo4j.directory") != null) {
+
+                        // In Neo4J we have to account for auto-generated root vertex.
+                        assertEquals(13, vertices.size());
+                    } else {
+                        assertEquals(12, vertices.size());
+                    }
+
+                    assertTrue(message.body().getObject("graph").getArray("vertices").get(0) instanceof JsonObject);
+                    assertTrue(message.body().getObject("graph").getArray("edges").get(0) instanceof JsonObject);
                 }
-                assertEquals(19, reply.getArray("edges").size());
-
+
                 testComplete();
             }            
         });
@@ -289,10 +308,11 @@ public void handle(Message<JsonObject> message) {
                     public void handle(Message<JsonObject> message) {
                         JsonObject reply = message.body();
                         assertEquals("ok", reply.getString("status"));
-                        assertNotNull(reply.getArray("vertices"));
-                        assertEquals(1, reply.getArray("vertices").size());
+                        assertNotNull("GraphSON: 'graph' object missing", message.body().getObject("graph"));
+                        assertNotNull("GraphSON: 'vertices' array missing", message.body().getObject("graph").getArray("vertices"));
+                        assertEquals(1, message.body().getObject("graph").getArray("vertices").size());
 
-                        final Object id = ((JsonObject) reply.getArray("vertices").get(0)).getField("_id");
+                        final Object id = ((JsonObject) reply.getObject("graph").getArray("vertices").get(0)).getField("_id");
                         final JsonObject queryRootFolder = new JsonObject()
                                 .putString("action", "query")
                                 .putString("query", query)