New Activiti version + new query capabilities and node ref collection fix

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/workflow/api/impl/RestVariableHelper.java

@@ -218,18 +218,53 @@ public class RestVariableHelper
     
     protected Object getSafePropertyValue(Object value)
     {
-        if(value instanceof NodeRef)
+        if (value instanceof NodeRef)
         {
             return value.toString();
         }
-        else if(value instanceof ScriptNode)
+        else if (value instanceof ScriptNode)
         {
-            return ((ScriptNode)value).getNodeRef().toString();
+            NodeRef ref = ((ScriptNode) value).getNodeRef();
+            try
+            {
+                QName nodeQName = nodeService.getType(ref);
+                if (ContentModel.TYPE_PERSON.equals(nodeQName))
+                {
+                    // Extract username from person and return
+                    return (String) nodeService.getProperty(ref, ContentModel.PROP_USERNAME);
+                }
+                else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeQName))
+                {
+                    // Extract name from group and return
+                    return (String) nodeService.getProperty(ref, ContentModel.PROP_AUTHORITY_NAME);
+                }
+                else
+                {
+                    return ((ScriptNode) value).getNodeRef().toString();
+                }
+            }
+            catch (Exception e)
+            {
+                // node ref QName could not be found, just creating a String
+                return ((ScriptNode) value).getNodeRef().toString();
+            }
         }
-        else if(value instanceof QName) 
+        else if (value instanceof QName) 
         {
             return ((QName) value).toPrefixString(namespaceService);
         }
+        else if (value instanceof Collection<?>)
+        {
+            if (value != null)
+            {
+                List<Object> resultValues = new ArrayList<Object>();
+                for (Object itemValue : (Collection<?>) value)
+                {
+                    resultValues.add(getSafePropertyValue(itemValue));
+                }
+                value = resultValues;
+            }
+        }
         
         return value;
     }

source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java

@@ -87,15 +87,15 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
     
     private static final Set<String> TASK_COLLECTION_EQUALS_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
         "status", "assignee", "owner", "candidateUser", "candidateGroup", "name", "description", "priority", "processId",
-        "processBusinessKey", "activityDefinitionId", "processDefinitionId", "processDefinitionName", "startedAt", "dueAt"
+        "processBusinessKey", "activityDefinitionId", "processDefinitionId", "processDefinitionName", "startedAt", "endedAt", "dueAt"
     ));
     
     private static final Set<String> TASK_COLLECTION_MATCHES_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
-        "name", "description", "activityDefinitionId"
+        "assignee", "owner", "name", "description", "processBusinessKey", "activityDefinitionId", "processDefinitionName"
     ));
     
     private static final Set<String> TASK_COLLECTION_GREATERTHAN_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
-        "startedAt", "dueAt"
+        "startedAt", "endedAt", "dueAt"
     ));
     
     private static final Set<String> TASK_COLLECTION_GREATERTHANOREQUAL_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
@@ -103,7 +103,7 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
     ));
     
     private static final Set<String> TASK_COLLECTION_LESSTHAN_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
-        "startedAt", "dueAt"
+        "startedAt", "endedAt", "dueAt"
     ));
     
     private static final Set<String> TASK_COLLECTION_LESSTHANOREQUAL_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
@@ -146,14 +146,16 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
         propertyWalker.setSupportedLessThanOrEqualParameters(TASK_COLLECTION_LESSTHANOREQUAL_QUERY_PROPERTIES);
         propertyWalker.enableVariablesSupport(namespaceService, dictionaryService);
         
-        if(parameters.getQuery() != null)
+        if (parameters.getQuery() != null)
         {
             QueryHelper.walk(parameters.getQuery(), propertyWalker);
         }
         
         String status = propertyWalker.getProperty("status", WhereClauseParser.EQUALS);
         String assignee = propertyWalker.getProperty("assignee", WhereClauseParser.EQUALS);
+        String assigneeLike = propertyWalker.getProperty("assignee", WhereClauseParser.MATCHES);
         String owner = propertyWalker.getProperty("owner", WhereClauseParser.EQUALS);
+        String ownerLike = propertyWalker.getProperty("owner", WhereClauseParser.MATCHES);
         String candidateUser = propertyWalker.getProperty("candidateUser", WhereClauseParser.EQUALS);
         String candidateGroup = propertyWalker.getProperty("candidateGroup", WhereClauseParser.EQUALS);
         String name = propertyWalker.getProperty("name", WhereClauseParser.EQUALS);
@@ -165,13 +167,18 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
         Integer priorityLessThanOrEquals = propertyWalker.getProperty("priority", WhereClauseParser.LESSTHANOREQUALS, Integer.class);
         String processInstanceId = propertyWalker.getProperty("processId", WhereClauseParser.EQUALS);
         String processInstanceBusinessKey = propertyWalker.getProperty("processBusinessKey", WhereClauseParser.EQUALS);
+        String processInstanceBusinessKeyLike = propertyWalker.getProperty("processBusinessKey", WhereClauseParser.MATCHES);
         String activityDefinitionId = propertyWalker.getProperty("activityDefinitionId", WhereClauseParser.EQUALS);
         String activityDefinitionIdLike = propertyWalker.getProperty("activityDefinitionId", WhereClauseParser.MATCHES);
         String processDefinitionId = propertyWalker.getProperty("processDefinitionId", WhereClauseParser.EQUALS);
         String processDefinitionName = propertyWalker.getProperty("processDefinitionName", WhereClauseParser.EQUALS);
+        String processDefinitionNameLike = propertyWalker.getProperty("processDefinitionName", WhereClauseParser.MATCHES);
         Date startedAt = propertyWalker.getProperty("startedAt", WhereClauseParser.EQUALS, Date.class);
         Date startedAtGreaterThan = propertyWalker.getProperty("startedAt", WhereClauseParser.GREATERTHAN, Date.class);
         Date startedAtLessThan = propertyWalker.getProperty("startedAt", WhereClauseParser.LESSTHAN, Date.class);
+        Date endedAt = propertyWalker.getProperty("endedAt", WhereClauseParser.EQUALS, Date.class);
+        Date endedAtGreaterThan = propertyWalker.getProperty("endedAt", WhereClauseParser.GREATERTHAN, Date.class);
+        Date endedAtLessThan = propertyWalker.getProperty("endedAt", WhereClauseParser.LESSTHAN, Date.class);
         Date dueAt = propertyWalker.getProperty("dueAt", WhereClauseParser.EQUALS, Date.class);
         Date dueAtGreaterThan = propertyWalker.getProperty("dueAt", WhereClauseParser.GREATERTHAN, Date.class);
         Date dueAtLessThan = propertyWalker.getProperty("dueAt", WhereClauseParser.LESSTHAN, Date.class);
@@ -184,7 +191,9 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
                     .createTaskQuery();
             
             if (assignee != null) query.taskAssignee(assignee);
+            if (assigneeLike != null) query.taskAssigneeLike(assigneeLike);
             if (owner != null) query.taskOwner(owner);
+            if (ownerLike != null) query.taskOwner(ownerLike);
             if (candidateUser != null)
             {
             	Set<String> parents = authorityService.getContainingAuthorities(AuthorityType.GROUP, candidateUser, false);
@@ -219,10 +228,12 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
             if (priorityLessThanOrEquals != null) query.taskMaxPriority(priorityLessThanOrEquals);
             if (processInstanceId != null) query.processInstanceId(processInstanceId);
             if (processInstanceBusinessKey != null) query.processInstanceBusinessKey(processInstanceBusinessKey);
+            if (processInstanceBusinessKeyLike != null) query.processInstanceBusinessKeyLike(processInstanceBusinessKeyLike);
             if (activityDefinitionId != null) query.taskDefinitionKey(activityDefinitionId);
             if (activityDefinitionIdLike != null) query.taskDefinitionKey(activityDefinitionIdLike);
             if (processDefinitionId != null) query.processDefinitionId(processDefinitionId);
             if (processDefinitionName != null) query.processDefinitionName(processDefinitionName);
+            if (processDefinitionNameLike != null) query.processDefinitionNameLike(processDefinitionNameLike);
             if (dueAt != null) query.dueDate(dueAt);
             if (dueAtGreaterThan != null) query.dueAfter(dueAtGreaterThan);
             if (dueAtLessThan != null) query.dueBefore(dueAtLessThan);
@@ -300,11 +311,11 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
         else if (STATUS_COMPLETED.equals(status) || STATUS_ANY.equals(status))
         {
             // Candidate user and group is only supported with STATUS_ACTIVE
-            if(candidateUser != null)
+            if (candidateUser != null)
             {
                 throw new InvalidArgumentException("Filtering on candidateUser is only allowed in combination with status-parameter 'active'");
             }
-            if(candidateGroup != null)
+            if (candidateGroup != null)
             {
                 throw new InvalidArgumentException("Filtering on candidateGroup is only allowed in combination with status-parameter 'active'");
             }
@@ -315,21 +326,33 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
             
             if (STATUS_COMPLETED.equals(status)) query.finished();
             if (assignee != null) query.taskAssignee(assignee);
+            if (assigneeLike != null) query.taskAssigneeLike(assigneeLike);
             if (owner != null) query.taskOwner(owner);
+            if (ownerLike != null) query.taskOwnerLike(ownerLike);
             if (name != null) query.taskName(name);
             if (nameLike != null) query.taskNameLike(nameLike);
             if (description != null) query.taskDescription(description);
             if (descriptionLike != null) query.taskDescriptionLike(descriptionLike);
             if (priority != null) query.taskPriority(priority);
+            if (priorityGreaterThanOrEquals != null) query.taskMinPriority(priorityGreaterThanOrEquals);
+            if (priorityLessThanOrEquals != null) query.taskMaxPriority(priorityLessThanOrEquals);
             if (processInstanceId != null) query.processInstanceId(processInstanceId);
-            
             if (processInstanceBusinessKey != null) query.processInstanceBusinessKey(processInstanceBusinessKey);
-            
+            if (processInstanceBusinessKeyLike != null) query.processInstanceBusinessKeyLike(processInstanceBusinessKeyLike);
             if (activityDefinitionId != null) query.taskDefinitionKey(activityDefinitionId);
+            if (activityDefinitionIdLike != null) query.taskDefinitionKey(activityDefinitionIdLike);
             if (processDefinitionId != null) query.processDefinitionId(processDefinitionId);
             if (processDefinitionName != null) query.processDefinitionName(processDefinitionName);
+            if (processDefinitionNameLike != null) query.processDefinitionNameLike(processDefinitionNameLike);
             if (dueAt != null) query.taskDueDate(dueAt);
+            if (dueAtGreaterThan != null) query.taskDueAfter(dueAtGreaterThan);
+            if (dueAtLessThan != null) query.taskDueBefore(dueAtLessThan);
             if (startedAt != null) query.taskCreatedOn(startedAt);
+            if (startedAtGreaterThan != null) query.taskCreatedAfter(startedAtGreaterThan);
+            if (startedAtLessThan != null) query.taskCreatedBefore(startedAtLessThan);
+            if (endedAt != null) query.taskCompletedOn(endedAt);
+            if (endedAtGreaterThan != null) query.taskCompletedAfter(endedAtGreaterThan);
+            if (endedAtLessThan != null) query.taskCompletedBefore(endedAtLessThan);
             
             List<QueryVariableHolder> variableProperties = propertyWalker.getVariableProperties();
             if (variableProperties != null)
@@ -377,12 +400,14 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
             }
             
             // Add tenant filtering
-            if(tenantService.isEnabled()) {
+            if (tenantService.isEnabled()) 
+            {
                 query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
             }
             
             // Add involvment filtering if user is not admin
-            if(!authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) {
+            if(!authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) 
+            {
                 query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
             }
             

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

@@ -75,6 +75,9 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
     public void testGetTaskById() throws Exception
     {
         RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
 
         // Alter current engine date
         Calendar createdCal = Calendar.getInstance();
@@ -82,9 +85,10 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         ClockUtil.setCurrentTime(createdCal.getTime());
         
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        
         try
         {
-            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            final Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
             assertNotNull(task);
             
             // Set some task-properties not set by process-definition
@@ -118,6 +122,48 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertEquals("wf:adhocTask", taskJSONObject.get("formResourceKey"));
             assertNull(taskJSONObject.get("endedAt"));
             assertNull(taskJSONObject.get("durationInMs"));
+            
+            // get unclaimed task
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            
+            // get delegated task
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().setOwner(task.getId(), requestContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().delegateTask(task.getId(), otherContext.getRunAsUser());
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(otherContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("owner"));
+            
+            // get resolved task
+            activitiProcessEngine.getTaskService().resolveTask(task.getId());
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("owner"));
+            
+            // get completed task
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("owner"));
+            assertNotNull(taskJSONObject.get("endedAt"));
+            
         }
         finally
         {
@@ -202,6 +248,13 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
     public void testUpdateTask() throws Exception
     {
         RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
         
         try 
@@ -242,6 +295,74 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertEquals("john", task.getAssignee());
             assertEquals("james", task.getOwner());
             assertEquals(dueDate, task.getDueDate());
+            
+            // update owner with admin user id
+            taskBody = new JSONObject();
+            taskBody.put("owner", adminContext.getRunAsUser());
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "owner"}));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(adminContext.getRunAsUser(), result.get("owner"));
+            
+            // update owner with initiator user id
+            taskBody = new JSONObject();
+            taskBody.put("owner", requestContext.getRunAsUser());
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "owner"}));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(requestContext.getRunAsUser(), result.get("owner"));
+            
+            // update owner with other user id
+            taskBody = new JSONObject();
+            taskBody.put("owner", otherContext.getRunAsUser());
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "owner"}));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(otherContext.getRunAsUser(), result.get("owner"));
+            
+            // update due date to date more in the future
+            dueDateCal.add(Calendar.DAY_OF_YEAR, 1);
+            dueDate = dueDateCal.getTime();
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", formatDate(dueDate));
+            
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "dueAt" }));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
+            // update due date to date a day less in the future
+            dueDateCal.add(Calendar.DAY_OF_YEAR, -1);
+            dueDate = dueDateCal.getTime();
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", formatDate(dueDate));
+            
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "dueAt" }));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
+            // update due date to current time
+            dueDateCal = Calendar.getInstance();
+            dueDateCal.set(Calendar.MILLISECOND, 0);
+            dueDate = dueDateCal.getTime();
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", formatDate(dueDate));
+            
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "dueAt" }));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
         }
         finally
         {
@@ -849,6 +970,42 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         }
     }
     
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testTaskStateTransitions() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessInfo processInstance = startAdhocProcess(requestContext, null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService()
+                    .createTaskQuery()
+                    .processInstanceId(processInstance.getId())
+                    .singleResult();
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Unclaimed to claimed
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "claimed");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state", "assignee" }));
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("claimed", result.get("state"));
+            
+            // claimed to unclaimed
+            taskBody = new JSONObject();
+            taskBody.put("state", "unclaimed");
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("unclaimed", result.get("state"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance.getId());
+        }
+    }
+    
     @Test
     @SuppressWarnings("unchecked")
     public void testChangeDueDate() throws Exception
@@ -899,6 +1056,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
     }
     
     @Test
+    @SuppressWarnings("unchecked")
     public void testGetTasks() throws Exception
     {
         // Alter current engine date
@@ -907,6 +1065,10 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         ClockUtil.setCurrentTime(createdCal.getTime());
         
         RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
         try
         {
@@ -949,6 +1111,29 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertEquals("wf:adhocTask", taskJSONObject.get("formResourceKey"));
             assertNull(taskJSONObject.get("endedAt"));
             assertNull(taskJSONObject.get("durationInMs"));
+            
+            // get tasks with user that has no assigned tasks
+            publicApiClient.setRequestContext(otherContext);
+            taskListJSONObject = tasksClient.findTasks(null);
+            assertNotNull(taskListJSONObject);
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(0, jsonEntries.size());
+            
+            // get tasks for user which has one task assigned by somebody else
+            publicApiClient.setRequestContext(requestContext);
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("assignee", otherContext.getRunAsUser());
+            
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "assignee" }));
+            
+            tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            
+            publicApiClient.setRequestContext(otherContext);
+            taskListJSONObject = tasksClient.findTasks(null);
+            assertNotNull(taskListJSONObject);
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(1, jsonEntries.size());
         }
         finally
         {
@@ -961,12 +1146,17 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
     {
         RequestContext requestContext = initApiClientWithTestUser();
         
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
         Calendar taskCreated = Calendar.getInstance();
         taskCreated.set(Calendar.MILLISECOND, 0);
         ClockUtil.setCurrentTime(taskCreated.getTime());
         String businessKey = UUID.randomUUID().toString();
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), businessKey);
         
+        ProcessInfo otherInstance = startReviewPooledProcess(otherContext);
+        
         try
         {
             // Complete the adhoc task
@@ -1017,6 +1207,9 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             activitiProcessEngine.getTaskService().addCandidateUser(activeTask.getId(), anotherUserId);
             activitiProcessEngine.getTaskService().addCandidateGroup(activeTask.getId(), "sales");
             activitiProcessEngine.getTaskService().setVariableLocal(activeTask.getId(), "numberVar", 10);
+            
+            final Task otherTask = activitiProcessEngine.getTaskService().createTaskQuery()
+                    .processInstanceId(otherInstance.getId()).singleResult();
            
             TasksClient tasksClient = publicApiClient.tasksClient();
             
@@ -1088,6 +1281,12 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             activitiProcessEngine.getTaskService().setAssignee(activeTask.getId(), null);
             assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
             
+            // Candidate user with candidate group
+            params.clear();
+            params.put("where", "(status = 'active' AND candidateUser = '" + otherContext.getRunAsUser() + "')");
+            // No tasks expected since assignee is set
+            assertEquals(1L, getResultSizeForTaskQuery(params, tasksClient));
+            
             params.clear();
             params.put("where", "(status = 'completed' AND candidateUser = '" + anotherUserId + "')");
             try
@@ -1224,7 +1423,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
                         "' AND processId='" + processInstance.getId() +"')");
             assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId(), completedTask.getId());
             
-            // Process definition name filerting 
+            // Process definition name filtering 
             params.clear();
             params.put("where", "(status = 'active' AND processDefinitionName = 'Adhoc Activiti Process' AND processId='" + processInstance.getId() +"')");
             assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
@@ -1251,17 +1450,24 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
             
             // Started filtering
+            Calendar compareCal = Calendar.getInstance();
+            compareCal.set(Calendar.MILLISECOND, 0);
+            compareCal.add(Calendar.DAY_OF_YEAR, -1);
             params.clear();
-            params.put("where", "(status = 'active' AND startedAt = '" + ISO8601DateFormat.format(taskCreated.getTime()) +"')");
+            params.put("where", "(status = 'active' AND startedAt > '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
-            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId(), otherTask.getId());
             
             params.clear();
-            params.put("where", "(status = 'completed' AND startedAt = '" + ISO8601DateFormat.format(taskCreated.getTime()) +"')");
+            params.put("where", "(status = 'completed' AND startedAt > '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
             assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
             
             params.clear();
-            params.put("where", "(status = 'any' AND startedAt = '" + ISO8601DateFormat.format(taskCreated.getTime()) +"')");
+            params.put("where", "(status = 'any' AND startedAt > '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
-            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId(), activeTask.getId());
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId(), activeTask.getId(), otherTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND startedAt < '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
             
             params.clear();
             params.put("where", "(variables/numberVar > 'd:int 5')");
@@ -1294,10 +1500,23 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             params.clear();
             params.put("where", "(variables/numberVar < 'd:int 10')");
             assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            // test with OR operator
+            params.clear();
+            params.put("where", "(status = 'any' OR candidateGroup = 'sales')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch (PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+            }
         }
         finally
         {
-            cleanupProcessInstance(processInstance);
+            cleanupProcessInstance(processInstance.getId(), otherInstance.getId());
         }
     }
     
@@ -1629,16 +1848,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertEquals("d:noderef", var.get("type"));
             
             final String userName = requestContext.getRunAsUser();
-            String personNodeRef = TenantUtil.runAsUserTenant(new TenantRunAsWork<String>()
+            assertEquals(userName, var.get("value"));
-                        {
-                @Override
-                public String doWork() throws Exception
-                {
-                    ActivitiScriptNode person = getPersonNodeRef(userName);
-                    return person.getNodeRef().toString();
-                }
-            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
-            assertEquals(personNodeRef, var.get("value"));
             
         }
         finally
@@ -1959,10 +2169,13 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             TasksClient tasksClient = publicApiClient.tasksClient();
             
             // Try updating task variables when NOT involved in the task
-            try {
+            try 
+            {
                 tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
                 fail("Exception expected");
-            } catch(PublicApiException expected) {
+            } 
+            catch(PublicApiException expected) 
+            {
                 assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
                 assertErrorSummary("Permission was denied", expected.getHttpResponse());
             }
@@ -1982,10 +2195,13 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
             tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
             publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
-            try {
+            try 
+            {
                 jsonObject = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
                 fail("Exception expected");
-            } catch(PublicApiException expected) {
+            } 
+            catch(PublicApiException expected) 
+            {
                 assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
                 assertErrorSummary("Permission was denied", expected.getHttpResponse());
             }
@@ -2270,6 +2486,44 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         }
     }
     
+    @Test
+    public void testGetTaskVariablesReview() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInfo processInstance = startParallelReviewProcess(requestContext);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery()
+                    .processInstanceId(processInstance.getId())
+                    .taskAssignee(requestContext.getRunAsUser())
+                    .singleResult();
+            
+            assertNotNull(task);
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            JSONObject variables = tasksClient.findTaskVariables(task.getId());
+            assertNotNull(variables);
+            JSONObject list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            // Check pagination object for size
+            JSONObject pagination = (JSONObject) list.get("pagination");
+            assertNotNull(pagination);
+            assertEquals(31L, pagination.get("count"));
+            assertEquals(31L, pagination.get("totalItems"));
+            assertEquals(0L, pagination.get("skipCount"));
+            assertFalse((Boolean) pagination.get("hasMoreItems"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance.getId());
+        }
+    }
+    
     @Test
     public void testDeleteTaskVariable() throws Exception
     {
@@ -2408,6 +2662,13 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
     public void testGetTaskModel() throws Exception
     {
         RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
         try
         {
@@ -2421,42 +2682,41 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertNotNull(entries);
             
             // Add all entries to a map, to make lookup easier
-            Map<String, JSONObject> modelFieldsByName = new HashMap<String, JSONObject>();
+            Map<String, JSONObject> modelFieldsByName = createEntryMap(entries);
-            JSONObject entry = null;
+            testModelEntries(modelFieldsByName);
-            for(int i=0; i<entries.size(); i++) 
+            
+            // get task form model with admin
+            publicApiClient.setRequestContext(adminContext);
+            model = publicApiClient.tasksClient().findTaskFormModel(task.getId());
+            assertNotNull(model);
+            
+            entries = (JSONArray) model.get("entries");
+            assertNotNull(entries);
+            
+            modelFieldsByName = createEntryMap(entries);
+            testModelEntries(modelFieldsByName);
+            
+            // get task form model with non involved user
+            publicApiClient.setRequestContext(otherContext);
+            try
             {
-                entry = (JSONObject) entries.get(i);
+                publicApiClient.tasksClient().findTaskFormModel(task.getId());
-                assertNotNull(entry);
+            }
-                entry = (JSONObject) entry.get("entry");
+            catch (PublicApiException e)
-                assertNotNull(entry);
+            {
-                modelFieldsByName.put((String) entry.get("name"), entry);
+                assertEquals(403, e.getHttpResponse().getStatusCode());
             }
             
-            // Check well-known properties and their types
+            // get task form model with invalid task id
-            
+            publicApiClient.setRequestContext(requestContext);
-            // Validate bpm:completionDate
+            try
-            JSONObject modelEntry = modelFieldsByName.get("bpm_completionDate");
+            {
-            assertNotNull(modelEntry);
+                publicApiClient.tasksClient().findTaskFormModel("fakeid");
-            assertEquals("Completion Date", modelEntry.get("title"));
+            }
-            assertEquals("{http://www.alfresco.org/model/bpm/1.0}completionDate", modelEntry.get("qualifiedName"));
+            catch (PublicApiException e)
-            assertEquals("d:date", modelEntry.get("dataType"));
+            {
-            assertFalse((Boolean)modelEntry.get("required"));
+                assertEquals(404, e.getHttpResponse().getStatusCode());
-            
+            }
-            // Validate cm:owner
-            modelEntry = modelFieldsByName.get("cm_owner");
-            assertNotNull(modelEntry);
-            assertEquals("Owner", modelEntry.get("title"));
-            assertEquals("{http://www.alfresco.org/model/content/1.0}owner", modelEntry.get("qualifiedName"));
-            assertEquals("d:text", modelEntry.get("dataType"));
-            assertFalse((Boolean)modelEntry.get("required"));
-            
-            // Validate bpm:package
-            modelEntry = modelFieldsByName.get("bpm_package");
-            assertNotNull(modelEntry);
-            assertEquals("Content Package", modelEntry.get("title"));
-            assertEquals("{http://www.alfresco.org/model/bpm/1.0}package", modelEntry.get("qualifiedName"));
-            assertEquals("bpm:workflowPackage", modelEntry.get("dataType"));
-            assertFalse((Boolean)modelEntry.get("required"));
         }
         finally
         {
@@ -2464,6 +2724,50 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         }
     }
     
+    protected Map<String, JSONObject> createEntryMap(JSONArray entries)
+    {
+        Map<String, JSONObject> modelFieldsByName = new HashMap<String, JSONObject>();
+        JSONObject entry = null;
+        for(int i=0; i<entries.size(); i++) 
+        {
+            entry = (JSONObject) entries.get(i);
+            assertNotNull(entry);
+            entry = (JSONObject) entry.get("entry");
+            assertNotNull(entry);
+            modelFieldsByName.put((String) entry.get("name"), entry);
+        }
+        return modelFieldsByName;
+    }
+    
+    protected void testModelEntries(Map<String, JSONObject> modelFieldsByName)
+    {
+        // Check well-known properties and their types
+        
+        // Validate bpm:completionDate
+        JSONObject modelEntry = modelFieldsByName.get("bpm_completionDate");
+        assertNotNull(modelEntry);
+        assertEquals("Completion Date", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}completionDate", modelEntry.get("qualifiedName"));
+        assertEquals("d:date", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate cm:owner
+        modelEntry = modelFieldsByName.get("cm_owner");
+        assertNotNull(modelEntry);
+        assertEquals("Owner", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/content/1.0}owner", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:package
+        modelEntry = modelFieldsByName.get("bpm_package");
+        assertNotNull(modelEntry);
+        assertEquals("Content Package", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}package", modelEntry.get("qualifiedName"));
+        assertEquals("bpm:workflowPackage", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+    }
+    
     @Test
     public void testGetTaskItems() throws Exception
     {
@@ -2479,7 +2783,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         NodeRef[] docNodeRefs = createTestDocuments(requestContext);
         ProcessInfo processInfo = startAdhocProcess(requestContext, docNodeRefs);
         
-        Task task = activitiProcessEngine.getTaskService().createTaskQuery()
+        final Task task = activitiProcessEngine.getTaskService().createTaskQuery()
             .processInstanceId(processInfo.getId()).singleResult();
         
         assertNotNull(task);
@@ -2541,6 +2845,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             try
             {
                 tasksClient.findTaskItems(task.getId());
+                fail("Expected exception");
             }
             catch (PublicApiException e)
             {
@@ -2556,7 +2861,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertNotNull(entriesJSON);
             assertTrue(entriesJSON.size() == 2);
             
-            // get with user from candidate group
+            // get with user from candidate group with no assignee
             List<MemberOfSite> memberships = getTestFixture().getNetwork(otherContext.getNetworkId()).getSiteMemberships(otherContext.getRunAsUser());
             assertTrue(memberships.size() > 0);
             MemberOfSite memberOfSite = memberships.get(0);
@@ -2571,16 +2876,59 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
             assertNotNull(entriesJSON);
             assertTrue(entriesJSON.size() == 2);
             
+            // get with user from candidate group with assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            try
+            {
+                tasksClient.findTaskItems(task.getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
             // invalid task id
             publicApiClient.setRequestContext(requestContext);
             try
             {
                 tasksClient.findTaskItems("fakeid");
+                fail("Expected exception");
             }
             catch (PublicApiException e)
             {
                 assertEquals(404, e.getHttpResponse().getStatusCode());
             }
+            
+            // get items from completed task with initiator
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            publicApiClient.setRequestContext(requestContext);
+            itemsJSON = tasksClient.findTaskItems(task.getId());
+            assertNotNull(itemsJSON);
+            entriesJSON = (JSONArray) itemsJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            // get items from completed task with user from candidate group
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.findTaskItems(task.getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
         }
         finally
         {
@@ -2610,6 +2958,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
                 .singleResult();
         
         assertNotNull(task);
+        activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
         
         try
         {
@@ -2700,6 +3049,47 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
                 assertEquals(403, e.getHttpResponse().getStatusCode());
             }
             
+            // add item with user from candidate group with no assignee
+            List<MemberOfSite> memberships = getTestFixture().getNetwork(otherContext.getNetworkId()).getSiteMemberships(otherContext.getRunAsUser());
+            assertTrue(memberships.size() > 0);
+            MemberOfSite memberOfSite = memberships.get(0);
+            String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+            
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), group);
+            publicApiClient.setRequestContext(otherContext);
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            assertEquals("Test Doc1", result.get("name"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item with user from candidate group with assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
             // invalid task id
             publicApiClient.setRequestContext(requestContext);
             try
@@ -2776,6 +3166,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
                 .singleResult();
         
         assertNotNull(task);
+        activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
         
         try
         {
@@ -2862,6 +3253,74 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
                 assertEquals(403, e.getHttpResponse().getStatusCode());
             }
             
+            // delete item with user from candidate group with no assignee
+            List<MemberOfSite> memberships = getTestFixture().getNetwork(otherContext.getNetworkId()).getSiteMemberships(otherContext.getRunAsUser());
+            assertTrue(memberships.size() > 0);
+            MemberOfSite memberOfSite = memberships.get(0);
+            String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+            
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), group);
+            publicApiClient.setRequestContext(otherContext);
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item with user from candidate group with assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            publicApiClient.setRequestContext(requestContext);
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            publicApiClient.setRequestContext(requestContext);
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
             // invalid task id
             publicApiClient.setRequestContext(requestContext);
             try