From 6cdf1c64a43e82867b496c12100cf11a59243c0b Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Thu, 17 Nov 2016 14:41:31 +0200 Subject: [PATCH] Refactor Test: UpdateTaskVariableSanityTests.java --- .../tasks/UpdateTaskVariableSanityTests.java | 54 ++++++++----------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java index 0e493a3e4..35d09eb6a 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java @@ -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); } } \ No newline at end of file