Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)

135139 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135063 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - added the @Category(BaseSpringTestsCategory.class) to ActivitiInvitationServiceImplTests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135149 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Constantin Popa
2017-02-14 16:31:31 +00:00
parent 58322870eb
commit 0138579bac

View File

@@ -26,10 +26,8 @@
package org.alfresco.repo.invitation; package org.alfresco.repo.invitation;
import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.workflow.activiti.ActivitiConstants; import org.alfresco.repo.workflow.activiti.ActivitiConstants;
@@ -39,13 +37,15 @@ import org.alfresco.service.cmr.workflow.WorkflowPath;
import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.cmr.workflow.WorkflowTaskState;
import org.alfresco.service.namespace.QName; import org.alfresco.test_category.BaseSpringTestsCategory;
import org.junit.experimental.categories.Category;
/** /**
* @author Nick Smith * @author Nick Smith
* @since 4.0 * @since 4.0
* *
*/ */
@Category(BaseSpringTestsCategory.class)
public class ActivitiInvitationServiceImplTests extends AbstractInvitationServiceImplTest public class ActivitiInvitationServiceImplTests extends AbstractInvitationServiceImplTest
{ {
private WorkflowService workflowService; private WorkflowService workflowService;