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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
63065: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62754: MNT-9587: Workflows task properties values are not compliant with data-dictionary-property-definitions.
      Correct count of task properties which increased after fix that returns default value for properties with no value.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-14 15:32:01 +00:00
parent 2bbf9c822e
commit 8e7f620ac1
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2013,7 +2013,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId()); Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId()); Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
assertEquals(5, actualGlobalVariables.size()); assertEquals(5, actualGlobalVariables.size());
assertEquals(7, actualLocalVariables.size()); assertEquals(8, actualLocalVariables.size());
TasksClient tasksClient = publicApiClient.tasksClient(); TasksClient tasksClient = publicApiClient.tasksClient();
JSONObject variables = tasksClient.findTaskVariables(task.getId()); JSONObject variables = tasksClient.findTaskVariables(task.getId());
@@ -2026,8 +2026,8 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
// Check pagination object for size // Check pagination object for size
JSONObject pagination = (JSONObject) list.get("pagination"); JSONObject pagination = (JSONObject) list.get("pagination");
assertNotNull(pagination); assertNotNull(pagination);
assertEquals(11L, pagination.get("count")); assertEquals(12L, pagination.get("count"));
assertEquals(11L, pagination.get("totalItems")); assertEquals(12L, pagination.get("totalItems"));
assertEquals(0L, pagination.get("skipCount")); assertEquals(0L, pagination.get("skipCount"));
assertFalse((Boolean) pagination.get("hasMoreItems")); assertFalse((Boolean) pagination.get("hasMoreItems"));
@@ -2075,7 +2075,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
// Check correct count of globas vs. local // Check correct count of globas vs. local
assertEquals(4, globalResults.size()); assertEquals(4, globalResults.size());
assertEquals(7, localResults.size()); assertEquals(8, localResults.size());
// Check if all variables are present // Check if all variables are present
assertEquals(0, expectedGlobalVars.size()); assertEquals(0, expectedGlobalVars.size());
@@ -2126,7 +2126,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId()); Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId()); Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
assertEquals(5, actualGlobalVariables.size()); assertEquals(5, actualGlobalVariables.size());
assertEquals(7, actualLocalVariables.size()); assertEquals(8, actualLocalVariables.size());
// Update a global value that is present in the model with type given // Update a global value that is present in the model with type given
JSONObject variableBody = new JSONObject(); JSONObject variableBody = new JSONObject();
@@ -2183,7 +2183,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId()); Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId()); Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
assertEquals(5, actualGlobalVariables.size()); assertEquals(5, actualGlobalVariables.size());
assertEquals(7, actualLocalVariables.size()); assertEquals(8, actualLocalVariables.size());
// Set a new global value that is NOT present in the model with type given // Set a new global value that is NOT present in the model with type given
JSONObject variableBody = new JSONObject(); JSONObject variableBody = new JSONObject();
@@ -2223,7 +2223,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId()); Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId()); Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
assertEquals(5, actualGlobalVariables.size()); assertEquals(5, actualGlobalVariables.size());
assertEquals(7, actualLocalVariables.size()); assertEquals(8, actualLocalVariables.size());
// Raw number value // Raw number value
JSONObject variableBody = new JSONObject(); JSONObject variableBody = new JSONObject();
@@ -2654,7 +2654,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId()); Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId()); Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
assertEquals(5, actualGlobalVariables.size()); assertEquals(5, actualGlobalVariables.size());
assertEquals(7, actualLocalVariables.size()); assertEquals(8, actualLocalVariables.size());
// Update a global value that is present in the model with type given // Update a global value that is present in the model with type given
JSONArray variablesArray = new JSONArray(); JSONArray variablesArray = new JSONArray();
@@ -2826,7 +2826,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId()); Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId()); Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
assertEquals(5, actualGlobalVariables.size()); assertEquals(5, actualGlobalVariables.size());
assertEquals(7, actualLocalVariables.size()); assertEquals(8, actualLocalVariables.size());
TasksClient tasksClient = publicApiClient.tasksClient(); TasksClient tasksClient = publicApiClient.tasksClient();
@@ -2840,8 +2840,8 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
// Check pagination object for size // Check pagination object for size
JSONObject pagination = (JSONObject) list.get("pagination"); JSONObject pagination = (JSONObject) list.get("pagination");
assertNotNull(pagination); assertNotNull(pagination);
assertEquals(7L, pagination.get("count")); assertEquals(8L, pagination.get("count"));
assertEquals(7L, pagination.get("totalItems")); assertEquals(8L, pagination.get("totalItems"));
assertEquals(0L, pagination.get("skipCount")); assertEquals(0L, pagination.get("skipCount"));
assertFalse((Boolean) pagination.get("hasMoreItems")); assertFalse((Boolean) pagination.get("hasMoreItems"));
@@ -2940,8 +2940,8 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
// Check pagination object for size // Check pagination object for size
JSONObject pagination = (JSONObject) list.get("pagination"); JSONObject pagination = (JSONObject) list.get("pagination");
assertNotNull(pagination); assertNotNull(pagination);
assertEquals(40L, pagination.get("count")); assertEquals(42L, pagination.get("count"));
assertEquals(40L, pagination.get("totalItems")); assertEquals(42L, pagination.get("totalItems"));
assertEquals(0L, pagination.get("skipCount")); assertEquals(0L, pagination.get("skipCount"));
assertFalse((Boolean) pagination.get("hasMoreItems")); assertFalse((Boolean) pagination.get("hasMoreItems"));
} }