From 179a047da47258c51038a99f974a32b28fb3df43 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 27 Mar 2015 22:56:18 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 99765: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 99696: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 99593: Merged DEV to V4.2-BUG-FIX (4.2.5) 99564: MNT-13567: [Workflow Public API] : incorrect hasMoreItems value - Fixed test failures. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/workflow/api/tests/DeploymentWorkflowApiTest.java | 2 +- .../workflow/api/tests/ProcessDefinitionWorkflowApiTest.java | 2 +- .../alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java index a6a18b1154..f4e64d1638 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java @@ -161,7 +161,7 @@ public class DeploymentWorkflowApiTest extends EnterpriseWorkflowTestApi assertEquals(3l, paginationJSON.get("count")); assertEquals(5l, paginationJSON.get("totalItems")); assertEquals(2l, paginationJSON.get("skipCount")); - assertEquals(true, paginationJSON.get("hasMoreItems")); + assertEquals(false, paginationJSON.get("hasMoreItems")); params = new HashMap(); params.put("skipCount", "0"); diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java index 862dd4425e..b598932d01 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java @@ -128,7 +128,7 @@ public class ProcessDefinitionWorkflowApiTest extends EnterpriseWorkflowTestApi assertEquals(3l, paginationJSON.get("count")); assertEquals(5l, paginationJSON.get("totalItems")); assertEquals(2l, paginationJSON.get("skipCount")); - assertEquals(true, paginationJSON.get("hasMoreItems")); + assertEquals(false, paginationJSON.get("hasMoreItems")); params = new HashMap(); params.put("skipCount", "0"); diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java index b5c785ed9a..6ab7bc3bca 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java @@ -1807,7 +1807,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi assertEquals(4l, paginationJSON.get("count")); assertEquals(6l, paginationJSON.get("totalItems")); assertEquals(2l, paginationJSON.get("skipCount")); - assertEquals(true, paginationJSON.get("hasMoreItems")); + assertEquals(false, paginationJSON.get("hasMoreItems")); jsonEntries = (JSONArray) taskListJSONObject.get("entries"); assertEquals(4, jsonEntries.size()); @@ -1837,7 +1837,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi assertEquals(2l, paginationJSON.get("count")); assertEquals(6l, paginationJSON.get("totalItems")); assertEquals(4l, paginationJSON.get("skipCount")); - assertEquals(true, paginationJSON.get("hasMoreItems")); + assertEquals(false, paginationJSON.get("hasMoreItems")); jsonEntries = (JSONArray) taskListJSONObject.get("entries"); assertEquals(2, jsonEntries.size()); }