From 92911fc17e31df814a682f4243c52ca9ff22f4f8 Mon Sep 17 00:00:00 2001
From: Paul Brodner <paul.brodner@ness.com>
Date: Fri, 27 Jan 2017 09:22:16 +0200
Subject: [PATCH] refactor NodesChildrenTests to use NodeBuilder

---
 .../rest/nodes/NodesChildrenTests.java        | 77 ++++++-------------
 1 file changed, 24 insertions(+), 53 deletions(-)

diff --git a/e2e-test/java/org/alfresco/rest/nodes/NodesChildrenTests.java b/e2e-test/java/org/alfresco/rest/nodes/NodesChildrenTests.java
index 77f305ff9..c981cc2dd 100644
--- a/e2e-test/java/org/alfresco/rest/nodes/NodesChildrenTests.java
+++ b/e2e-test/java/org/alfresco/rest/nodes/NodesChildrenTests.java
@@ -1,11 +1,10 @@
 package org.alfresco.rest.nodes;
 
-import java.util.UUID;
-
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestNodeBodyModel;
 import org.alfresco.rest.model.RestNodeModel;
 import org.alfresco.rest.model.RestNodeModelsCollection;
+import org.alfresco.rest.model.builder.NodesBuilder;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.model.ContentModel;
 import org.alfresco.utility.model.TestGroup;
@@ -62,63 +61,35 @@ public class NodesChildrenTests extends RestTest
     @TestRail(section = { TestGroup.REST_API,TestGroup.NODES }, executionType = ExecutionType.SANITY,
             description = "Verify list children when listing with relativePath and pagination")
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.SANITY})
-    public void listChildrenTest() throws Exception
+    public void checkRelativePathAndPaginationOnCreateChildrenNode() throws Exception
     {
         /*
          * Given we have a folder hierarchy folder1/folder2/folder3 and folder3 containing 3 files file1, file2, and file3
          */
-        restClient.authenticateUser(dataContent.getAdminUser());
-
-        RestNodeModel folder1 = createTestNode(ContentModel.my().getNodeRef(), "F1", "cm:folder");
-        RestNodeModel folder2 = createTestNode(folder1.getId(), "F2", "cm:folder");
-        RestNodeModel folder3 = createTestNode(folder2.getId(), "F3", "cm:folder");
-
-        RestNodeModel file1 = createTestNode(folder3.getId(), "f1", "cm:content");
-        RestNodeModel file2 = createTestNode(folder3.getId(), "f2", "cm:content");
-        RestNodeModel file3 = createTestNode(folder3.getId(), "f3", "cm:content");
-
-        /*
-         * When listing the children of folder1 with relative path folder2/folder3, page size 2 and skip count 1
-         */
-        ContentModel folder1Model = new ContentModel();
-        folder1Model.setNodeRef(folder1.getId());
-        RestNodeModelsCollection files = restClient.withParams("maxItems=2", "skipCount=1", "relativePath="+folder2.getName()+"/"+folder3.getName())
-                                                   .withCoreAPI().usingNode(folder1Model).listChildren();
+        NodesBuilder nodesBuilder = restClient.authenticateUser(dataUser.getAdminUser())
+                                              .withCoreAPI().usingNode(ContentModel.my())
+                                              .defineNodes();        
+        nodesBuilder
+            .folder("F1")
+            .folder("F2")
+            .folder("F3")            
+                .file("f1")
+                .file("f2")
+                .file("f2");
+              
+        RestNodeModelsCollection returnedFiles = restClient.withParams("maxItems=2", 
+                                                               "skipCount=1", 
+                                                               String.format("relativePath=%s/%s", nodesBuilder.getNode("F2").getName(), nodesBuilder.getNode("F3").getName()))                                                               
+                                                               .withCoreAPI().usingNode(nodesBuilder.getNode("F1").toContentModel()).listChildren();
         restClient.assertStatusCodeIs(HttpStatus.OK);
 
         /*
-         * Then I receive file2 and file3
-         */
-        assert(files.getEntries().size() == 2);
-        assert(files.getEntries().get(0).onModel().getId().equals(file2.getId()));
-        assert(files.getEntries().get(1).onModel().getId().equals(file3.getId()));
-    }
-
-    /**
-     * Helper method that creates a node in a specified folder
-     * 
-     * @param parentId id of the parent folder
-     * @param name the name if the new node (a random string will be appended at the end)
-     * @param nodeType the type of the new node
-     * @return the model of the created node
-     * @throws Exception if the node failed to be created
-     */
-    private RestNodeModel createTestNode(String parentId, String name, String nodeType) throws Exception
-    {
-        // define the new node model
-        RestNodeBodyModel model = new RestNodeBodyModel();
-        model.setName(name + "-" + UUID.randomUUID().toString());
-        model.setNodeType(nodeType);
-
-        // define the parent
-        ContentModel parent = new ContentModel();
-        parent.setNodeRef(parentId);
-
-        // call the create children api
-        RestNodeModel newNode = restClient.withCoreAPI().usingNode(parent).createNode(model);
-
-        // check and return the result
-        restClient.assertStatusCodeIs(HttpStatus.CREATED);
-        return newNode;
+        * Then I receive file2 and file3
+        * 
+        */
+        returnedFiles.assertThat().entriesListCountIs(2);
+        returnedFiles.getEntries().get(0).onModel().assertThat().field("id").equals(nodesBuilder.getNode("F2").getId());
+        returnedFiles.getEntries().get(1).onModel().assertThat().field("id").equals(nodesBuilder.getNode("F3").getId());        
     }
+    
 }