diff --git a/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java b/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java index a1897a46dc..cf830fa8e3 100644 --- a/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java +++ b/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java @@ -495,7 +495,7 @@ public class ProcessesImpl extends WorkflowRestImpl implements Processes page.add(processInfo); } - return CollectionWithPagingInfo.asPaged(paging, page, page.size() != totalCount, totalCount); + return CollectionWithPagingInfo.asPaged(paging, page, (page.size() + paging.getSkipCount()) != totalCount, totalCount); } @Override diff --git a/source/test-java/org/alfresco/RemoteApi01TestSuite.java b/source/test-java/org/alfresco/RemoteApi01TestSuite.java index b1295f89d3..c4c5e817af 100644 --- a/source/test-java/org/alfresco/RemoteApi01TestSuite.java +++ b/source/test-java/org/alfresco/RemoteApi01TestSuite.java @@ -81,6 +81,7 @@ public class RemoteApi01TestSuite extends TestSuite { suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.workflow.api.tests.DeploymentWorkflowApiTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.workflow.api.tests.ProcessDefinitionWorkflowApiTest.class)); + suite.addTestSuite(org.alfresco.rest.workflow.api.impl.ProcessesImplTest.class); } static void tests7(TestSuite suite) // diff --git a/source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java b/source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java new file mode 100644 index 0000000000..9da5a43886 --- /dev/null +++ b/source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2005-2014 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ +package org.alfresco.rest.workflow.api.impl; + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.transaction.Status; +import javax.transaction.UserTransaction; + +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.repo.workflow.WorkflowModel; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; +import org.alfresco.rest.framework.resource.parameters.Paging; +import org.alfresco.rest.framework.resource.parameters.Parameters; +import org.alfresco.rest.framework.resource.parameters.Params; +import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams; +import org.alfresco.rest.framework.resource.parameters.where.Query; +import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper; +import org.alfresco.rest.workflow.api.Processes; +import org.alfresco.rest.workflow.api.model.ProcessInfo; +import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.service.cmr.workflow.WorkflowDefinition; +import org.alfresco.service.cmr.workflow.WorkflowService; +import org.alfresco.service.namespace.QName; +import org.alfresco.util.ApplicationContextHelper; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; + +/** + * + * @author Dmitry Velichkevich + */ +public class ProcessesImplTest extends Assert +{ + private static final int ACTIVE_WORKFLOWS_INITIAL_AMOUNT = 25; + + + private static final String PROCESSES_BEAN_NAME = "processes"; + + private static final String DESIRED_WORKFLOW_ID_PREFIX = "activiti$activitiReview"; + + + private static final String QUERY_STATUS_ACTIVE = "(status=active)"; + + + private ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + + private WorkflowService workflowService; + + private PersonService personService; + + private Processes processes; + + + private UserTransaction transaction; + + + @Before + public void setUp() throws Exception + { + processes = (Processes) applicationContext.getBean(PROCESSES_BEAN_NAME); + + ServiceRegistry registry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY); + workflowService = registry.getWorkflowService(); + personService = registry.getPersonService(); + + transaction = registry.getTransactionService().getUserTransaction(); + transaction.begin(); + + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); + AuthenticationUtil.setRunAsUser(AuthenticationUtil.getAdminUserName()); + + NodeRef adminUserNodeRef = personService.getPerson(AuthenticationUtil.getAdminUserName()); + + WorkflowDefinition workflowDefinition = findAppropriateWorkflowDefinitionId(); + + for (int i = 0; i < ACTIVE_WORKFLOWS_INITIAL_AMOUNT; i++) + { + startWorkflow(workflowDefinition, adminUserNodeRef); + } + } + + private void startWorkflow(WorkflowDefinition neededDefinition, NodeRef assignee) + { + Map parameters = new HashMap(); + parameters.put(WorkflowModel.ASSOC_ASSIGNEE, (Serializable) Collections.singletonList(assignee)); + parameters.put(WorkflowModel.ASSOC_PACKAGE, workflowService.createPackage(null)); + + workflowService.startWorkflow(neededDefinition.getId(), parameters); + } + + private WorkflowDefinition findAppropriateWorkflowDefinitionId() + { + WorkflowDefinition result = null; + List definitions = workflowService.getDefinitions(); + + for (WorkflowDefinition definition : definitions) + { + if (definition.getId().startsWith(DESIRED_WORKFLOW_ID_PREFIX)) + { + result = definition; + break; + } + } + + return (null != result) ? (result) : (definitions.iterator().next()); + } + + @After + public void tearDown() throws Exception + { + AuthenticationUtil.clearCurrentSecurityContext(); + + if ((null != transaction) && (Status.STATUS_COMMITTED != transaction.getStatus()) && (Status.STATUS_ROLLEDBACK != transaction.getStatus())) + { + transaction.rollback(); + } + } + + @Test + public void testHasMoreItemsTrue() throws Exception + { + CollectionWithPagingInfo actualProcesses = queryActiveProcessesAndAssertResult(0, (ACTIVE_WORKFLOWS_INITIAL_AMOUNT - 5)); + assertTrue(actualProcesses.hasMoreItems()); + + actualProcesses = queryActiveProcessesAndAssertResult(10, (ACTIVE_WORKFLOWS_INITIAL_AMOUNT - 15)); + assertTrue(actualProcesses.hasMoreItems()); + } + + @Test + public void testHasMoreFalseAsPerMnt10977() throws Exception + { + CollectionWithPagingInfo actualProcesses = queryActiveProcessesAndAssertResult(5, ACTIVE_WORKFLOWS_INITIAL_AMOUNT); + assertFalse(actualProcesses.hasMoreItems()); + } + + private CollectionWithPagingInfo queryActiveProcessesAndAssertResult(int skipCount, int maxItems) + { + Query query = ResourceWebScriptHelper.getWhereClause(QUERY_STATUS_ACTIVE); + Parameters parameters = Params.valueOf(new RecognizedParams(null, Paging.valueOf(skipCount, maxItems), null, null, null, query, null), null, null); + + CollectionWithPagingInfo result = processes.getProcesses(parameters); + + assertNotNull(result); + assertNotNull(result.getCollection()); + + int remainingProcessesAmount = ACTIVE_WORKFLOWS_INITIAL_AMOUNT - skipCount; + if (maxItems >= remainingProcessesAmount) + { + assertEquals(remainingProcessesAmount, result.getCollection().size()); + } + else + { + assertEquals(maxItems, result.getCollection().size()); + } + + return result; + } +}