inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2015-03-27 22:56:18 +00:00
parent 6095d2399e
commit 179a047da4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/test-java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java
View File

@@ -161,7 +161,7 @@ public class DeploymentWorkflowApiTest extends EnterpriseWorkflowTestApi
assertEquals(3l, paginationJSON.get("count")); assertEquals(3l, paginationJSON.get("count"));
assertEquals(5l, paginationJSON.get("totalItems")); assertEquals(5l, paginationJSON.get("totalItems"));
assertEquals(2l, paginationJSON.get("skipCount")); assertEquals(2l, paginationJSON.get("skipCount"));
assertEquals(true, paginationJSON.get("hasMoreItems")); assertEquals(false, paginationJSON.get("hasMoreItems"));
params = new HashMap<String, String>(); params = new HashMap<String, String>();
params.put("skipCount", "0"); params.put("skipCount", "0");

2
source/test-java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java
View File

@@ -128,7 +128,7 @@ public class ProcessDefinitionWorkflowApiTest extends EnterpriseWorkflowTestApi
assertEquals(3l, paginationJSON.get("count")); assertEquals(3l, paginationJSON.get("count"));
assertEquals(5l, paginationJSON.get("totalItems")); assertEquals(5l, paginationJSON.get("totalItems"));
assertEquals(2l, paginationJSON.get("skipCount")); assertEquals(2l, paginationJSON.get("skipCount"));
assertEquals(true, paginationJSON.get("hasMoreItems")); assertEquals(false, paginationJSON.get("hasMoreItems"));
params = new HashMap<String, String>(); params = new HashMap<String, String>();
params.put("skipCount", "0"); params.put("skipCount", "0");

4
source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
View File

@@ -1807,7 +1807,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
assertEquals(4l, paginationJSON.get("count")); assertEquals(4l, paginationJSON.get("count"));
assertEquals(6l, paginationJSON.get("totalItems")); assertEquals(6l, paginationJSON.get("totalItems"));
assertEquals(2l, paginationJSON.get("skipCount")); assertEquals(2l, paginationJSON.get("skipCount"));
assertEquals(true, paginationJSON.get("hasMoreItems")); assertEquals(false, paginationJSON.get("hasMoreItems"));
jsonEntries = (JSONArray) taskListJSONObject.get("entries"); jsonEntries = (JSONArray) taskListJSONObject.get("entries");
assertEquals(4, jsonEntries.size()); assertEquals(4, jsonEntries.size());
@@ -1837,7 +1837,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
assertEquals(2l, paginationJSON.get("count")); assertEquals(2l, paginationJSON.get("count"));
assertEquals(6l, paginationJSON.get("totalItems")); assertEquals(6l, paginationJSON.get("totalItems"));
assertEquals(4l, paginationJSON.get("skipCount")); assertEquals(4l, paginationJSON.get("skipCount"));
assertEquals(true, paginationJSON.get("hasMoreItems")); assertEquals(false, paginationJSON.get("hasMoreItems"));
jsonEntries = (JSONArray) taskListJSONObject.get("entries"); jsonEntries = (JSONArray) taskListJSONObject.get("entries");
assertEquals(2, jsonEntries.size()); assertEquals(2, jsonEntries.size());
} }