make findAll to return DataNode

Author: MykolaGolubyev

webtau-rest-groovy/src/main/groovy/com/twosigma/webtau/http/datanode/GroovyDataNode.groovy

@@ -103,8 +103,9 @@ class GroovyDataNode implements DataNodeExpectations, DataNode {
             result
     }
 
-    List<DataNode> findAll(Closure predicate) {
-        return node.elements().findAll(removedDataNodeFromClosure(predicate))
+    DataNode findAll(Closure predicate) {
+        def list = node.elements().findAll(removedDataNodeFromClosure(predicate))
+        return wrapIntoDataNode('findAll', list)
     }
 
     List collect(Closure transformation) {
@@ -121,6 +122,10 @@ class GroovyDataNode implements DataNodeExpectations, DataNode {
         return node.actualPath()
     }
 
+    private DataNode wrapIntoDataNode(String operationId, List list) {
+        return new GroovyDataNode(new StructuredDataNode(node.id().child(operationId), list))
+    }
+
     private static Closure removedDataNodeFromClosure(Closure closure) {
         def newClosure = { dataNode ->
             def converter = new DataNodeToMapOfValuesConverter({ id, traceableValue ->

webtau-rest-groovy/src/test/groovy/com/twosigma/webtau/http/HttpTest.groovy

@@ -124,8 +124,8 @@ class HttpTest {
         http.get("/end-point") {
             complexList.should == ["k1"   | "k2"] {
                                   __________________
-                                    "v1"  | "v2"
-                                    "v11" | "v22" }
+                                    "v1"  | 30
+                                    "v11" | 40 }
         }
     }
 
@@ -195,7 +195,7 @@ class HttpTest {
             return complexList
         }
 
-        assert complexList == [[id: 'id1', k1: 'v1', k2: 'v2'], [id: 'id2', k1: 'v11', k2: 'v22']]
+        assert complexList == [[id: 'id1', k1: 'v1', k2: 30], [id: 'id2', k1: 'v11', k2: 40]]
         assert complexList.getClass() == ArrayList
         assert complexList[0].getClass() == LinkedHashMap
     }
@@ -381,6 +381,18 @@ class HttpTest {
         assert found[0].getClass() == Integer
     }
 
+    @Test
+    void "groovy findAlll, collect, and sum"() {
+        def sum = http.get("/end-point") {
+            return complexList
+                    .findAll { it.k1.startsWith('v1') }
+                    .collect { it.k2 }
+                    .sum()
+        }
+
+        assert sum == 70
+    }
+
     @Test
     void "groovy findAll on body that is not a list"() {
         def found = http.get("/end-point") {
@@ -415,6 +427,15 @@ class HttpTest {
         assert transformed[0] instanceof GString
     }
 
+    @Test
+    void "groovy transform list by referencing node"() {
+        def ids = http.get("/end-point") {
+            return complexList.collect { it.id }
+        }
+
+        assert ids == ['id1', 'id2']
+    }
+
     @Test
     void "groovy transform on body that is not a list"() {
         def transformed = http.get("/end-point") {
@@ -610,8 +631,8 @@ class HttpTest {
 
             complexList.should == ["k1"   | "k2"] { // matching only specified fields, but number of entries must be exact
                                    ________________
-                                    "v1"  | "v2"
-                                    "v11" | "v22" }
+                                    "v1"  | 30
+                                    "v11" | 40 }
         }
 
         http.doc.capture("end-point-object-equality-matchers")

webtau-rest-groovy/src/test/resources/objectTestResponse.json

@@ -16,12 +16,12 @@
     {
       "id": "id1",
       "k1": "v1",
-      "k2": "v2"
+      "k2": 30
     },
     {
       "id": "id2",
       "k1": "v11",
-      "k2": "v22"
+      "k2": 40
     }
   ]
 }