inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix input data for all tests from DeleteProcessItemFullTests and some imports

Browse Source
This commit is contained in:
Cristina Axinte
2017-02-07 12:07:41 +02:00
parent 25cc89214c
commit 6427e0b72c
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/workflow/processes/DeleteProcessItemFullTests.java
+11 -9
View File
@@ -10,12 +10,14 @@ import org.alfresco.rest.model.RestItemModelsCollection;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.ProcessModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TaskModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class DeleteProcessItemFullTests extends RestTest
@@ -35,7 +37,15 @@ public class DeleteProcessItemFullTests extends RestTest
assignee = dataUser.createRandomTestUser();
siteModel = dataSite.usingUser(userWhoStartsProcess).createPublicRandomSite();
document = dataContent.usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
dataWorkflow.usingUser(userWhoStartsProcess).usingSite(siteModel).usingResource(document).createNewTaskAndAssignTo(assignee);
}
@BeforeMethod(alwaysRun = true)
public void createProcess() throws Exception
{
TaskModel task = dataWorkflow.usingUser(userWhoStartsProcess).usingSite(siteModel).usingResource(document).createNewTaskAndAssignTo(assignee);
processModel = new ProcessModel();
processModel.setId(task.getProcessId());
processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().usingProcess(processModel).getProcess();
}
@TestRail(section = { TestGroup.REST_API, TestGroup.PROCESSES }, executionType = ExecutionType.REGRESSION,
@@ -43,7 +53,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void deleteProcessItemUsingEmptyProcessId() throws Exception
{
processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
document2 = dataContent.usingAdmin().usingSite(siteModel).createContent(DocumentType.MSPOWERPOINT);
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -63,7 +72,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void createUpdateDeleteProcessItem() throws Exception
{
processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
document2 = dataContent.usingAdmin().usingSite(siteModel).createContent(DocumentType.MSPOWERPOINT);
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -84,7 +92,6 @@ public class DeleteProcessItemFullTests extends RestTest
{
anotherUser = dataUser.createRandomTestUser();
processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
document2 = dataContent.usingAdmin().usingSite(siteModel).createContent(DocumentType.HTML);
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -104,7 +111,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void deleteProcessItemWithAdmin() throws Exception
{
processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
document2 = dataContent.usingAdmin().usingSite(siteModel).createContent(DocumentType.HTML);
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -121,7 +127,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void deleteProcessItemByUserInvolvedInTheProcess() throws Exception
{
processModel = restClient.authenticateUser(assignee).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -137,7 +142,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void deleteProcessItemByUserThatStartedTheProcess() throws Exception
{
processModel = restClient.authenticateUser(userWhoStartsProcess).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -153,7 +157,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void deleteProcessItemsForDeletedProcess() throws Exception
{
processModel = restClient.authenticateUser(userWhoStartsProcess).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
@@ -175,7 +178,6 @@ public class DeleteProcessItemFullTests extends RestTest
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.FULL })
public void deleteProcessItemByInexistentUser() throws Exception
{
processModel = restClient.authenticateUser(userWhoStartsProcess).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel();
processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document);
restClient.assertStatusCodeIs(HttpStatus.CREATED);
e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksCoreTests.java
+3 -3
View File
@@ -19,7 +19,7 @@ import org.testng.annotations.Test;
public class GetProcessTasksCoreTests extends RestTest
{
private FileModel document, document1, document2, document3;
private FileModel document, document1, document2;
private SiteModel siteModel;
private UserModel adminUser, userWhoStartsProcess, candidate, anotherAssignee, assignee;
private ProcessModel process;
@@ -66,7 +66,7 @@ public class GetProcessTasksCoreTests extends RestTest
restClient.authenticateUser(adminUser).usingTenant().createTenant(adminTenant);
SiteModel siteModel = dataSite.usingUser(adminTenant).createPublicRandomSite();
UserModel tenantAssignee = dataUser.usingUser(adminTenant).createUserWithTenant("uTenant");
document3 = dataContent.usingUser(adminTenant).usingSite(siteModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
dataContent.usingUser(adminTenant).usingSite(siteModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
RestProcessModel processModel = restClient.authenticateUser(tenantAssignee).withWorkflowAPI().addProcess("activitiAdhoc", tenantAssignee, false, CMISUtil.Priority.Normal);
@@ -86,7 +86,7 @@ public class GetProcessTasksCoreTests extends RestTest
restClient.authenticateUser(adminUser).usingTenant().createTenant(adminTenant);
SiteModel siteModel = dataSite.usingUser(adminTenant).createPublicRandomSite();
document3 = dataContent.usingUser(adminTenant).usingSite(siteModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
dataContent.usingUser(adminTenant).usingSite(siteModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
tenantAssignee = dataUser.usingUser(adminTenant).createUserWithTenant("uTenant");
RestProcessModel processModel = restClient.authenticateUser(adminTenant).withWorkflowAPI().addProcess("activitiAdhoc", tenantAssignee, false, CMISUtil.Priority.Normal);
e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessVariablesCoreTests.java
-1
View File
@@ -4,7 +4,6 @@ import org.alfresco.dataprep.CMISUtil;
import org.alfresco.dataprep.CMISUtil.DocumentType;
import org.alfresco.dataprep.CMISUtil.Priority;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.exception.JsonToModelConversionException;
import org.alfresco.rest.model.RestErrorModel;
import org.alfresco.rest.model.RestProcessModel;
import org.alfresco.rest.model.RestProcessModelsCollection;