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

Merge branch 'TAS-1963' into '5.1.N-newDSL'

Browse Source 
Tas 1963

Refactor Test: UpdateTaskVariableSanityTests.java

See merge request !200
This commit is contained in:
Paul Brodner
2016-11-17 13:08:04 +00:00
parent 72d16c5caf 6cdf1c64a4
commit b3018d439d
1 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java
+23 -31
View File
@@ -3,8 +3,6 @@ package org.alfresco.rest.workflow.tasks;
import org.alfresco.dataprep.CMISUtil.DocumentType;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.model.RestVariableModel;
import org.alfresco.rest.requests.RestTasksApi;
import org.alfresco.rest.requests.RestTenantApi;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TaskModel;
@@ -12,7 +10,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -23,65 +20,62 @@ import org.testng.annotations.Test;
@Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.TASKS, TestGroup.SANITY })
public class UpdateTaskVariableSanityTests extends RestTest
{
@Autowired
RestTasksApi tasksApi;
@Autowired
RestTenantApi tenantApi;
private UserModel userModel;
private UserModel adminUser;
private SiteModel siteModel;
private FileModel fileModel;
private UserModel assigneeUser;
private TaskModel taskModel, tenantTask;
private UserModel adminTenantUser, tenantUser, tenantUserAssignee;
private RestVariableModel taskVariable;
private RestVariableModel variableModel;
@BeforeClass(alwaysRun=true)
public void dataPreparation() throws Exception
{
adminUser = dataUser.getAdminUser();
userModel = dataUser.createRandomTestUser();
siteModel = dataSite.usingUser(userModel).createPublicRandomSite();
fileModel = dataContent.usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
assigneeUser = dataUser.createRandomTestUser();
taskModel = dataWorkflow.usingUser(userModel).usingSite(siteModel).usingResource(fileModel).createNewTaskAndAssignTo(assigneeUser);
tasksApi.useRestClient(restClient);
}
@TestRail(section = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.TASKS }, executionType = ExecutionType.SANITY,
description = "Create non-existing task variable")
public void createTaskVariable() throws Exception
{
UserModel adminUser = dataUser.getAdminUser();
restClient.authenticateUser(adminUser);
RestVariableModel variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text");
taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel);
variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text");
taskVariable = restClient.withWorkflowAPI().usingTask(taskModel).updateTaskVariable(variableModel);
restClient.assertStatusCodeIs(HttpStatus.OK);
taskVariable.assertThat().field("scope").is(taskVariable.getScope())
.and().field("name").is(taskVariable.getName())
.and().field("type").is(taskVariable.getType())
.and().field("value").is(taskVariable.getValue());
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@TestRail(section = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.TASKS }, executionType = ExecutionType.SANITY,
description = "Update existing task variable")
public void updateTaskVariable() throws Exception
public void updateExistingTaskVariable() throws Exception
{
UserModel adminUser = dataUser.getAdminUser();
restClient.authenticateUser(adminUser);
RestVariableModel variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text");
taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel);
taskVariable.and().field("scope").is(taskVariable.getScope())
variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text");
taskVariable = restClient.withWorkflowAPI().usingTask(taskModel).updateTaskVariable(variableModel);
restClient.assertStatusCodeIs(HttpStatus.OK);
taskVariable.assertThat().field("scope").is(taskVariable.getScope())
.and().field("name").is(taskVariable.getName())
.and().field("type").is(taskVariable.getType())
.and().field("value").is(taskVariable.getValue());
variableModel.setValue("updatedValue");
taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel).and().field("value").is("updatedValue");
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
taskVariable = restClient.withWorkflowAPI().usingTask(taskModel).updateTaskVariable(variableModel);
restClient.assertStatusCodeIs(HttpStatus.OK);
taskVariable.assertThat().field("value").is("updatedValue");
}
@Test(groups = {TestGroup.NETWORKS })
@@ -89,12 +83,10 @@ public class UpdateTaskVariableSanityTests extends RestTest
description = "Update existing task variable by admin in the same network")
public void updateTaskVariableByAdminInSameNetwork() throws Exception
{
UserModel adminUser = dataUser.getAdminUser();
restClient.authenticateUser(adminUser);
adminTenantUser = UserModel.getAdminTenantUser();
tenantApi.useRestClient(restClient);
tenantApi.createTenant(adminTenantUser);
restClient.usingTenant().createTenant(adminTenantUser);
tenantUser = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenant");
tenantUserAssignee = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenantAssignee");
@@ -102,16 +94,16 @@ public class UpdateTaskVariableSanityTests extends RestTest
siteModel = dataSite.usingUser(adminTenantUser).createPublicRandomSite();
tenantTask = dataWorkflow.usingUser(tenantUser).usingSite(siteModel).usingResource(fileModel).createNewTaskAndAssignTo(tenantUserAssignee);
RestVariableModel variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text");
taskVariable = tasksApi.updateTaskVariable(tenantTask, variableModel);
variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text");
taskVariable = restClient.withWorkflowAPI().usingTask(tenantTask).updateTaskVariable(variableModel);
restClient.assertStatusCodeIs(HttpStatus.OK);
taskVariable.assertThat().field("scope").is(taskVariable.getScope())
.and().field("name").is(taskVariable.getName())
.and().field("type").is(taskVariable.getType())
.and().field("value").is(taskVariable.getValue());
variableModel.setValue("updatedValue");
taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel).and().field("value").is("updatedValue");
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
taskVariable = restClient.withWorkflowAPI().usingTask(taskModel).updateTaskVariable(variableModel).and().field("value").is("updatedValue");
restClient.assertStatusCodeIs(HttpStatus.OK);
}
}