diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java index f96f19728..4b9396a2f 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java @@ -59,18 +59,9 @@ public class AddProcessItemSanityTests extends RestWorkflowTest document2 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); processModel = processesApi.getProcesses().getOneRandomEntry(); processItem = processesApi.addProcessItem(processModel, document2); - processItem.and().assertField("createdAt").is(processItem.getCreatedAt()) - .and().assertField("size").is(processItem.getSize()) - .and().assertField("createdBy").is(processItem.getCreatedBy()) - .and().assertField("modifiedAt").is(processItem.getModifiedAt()) - .and().assertField("name").is(processItem.getName()) - .and().assertField("modifiedBy").is(processItem.getModifiedBy()) - .and().assertField("id").is(processItem.getId()) - .and().assertField("mimeType").is(processItem.getMimeType()); - + processItem.and().assertField("name").is(document2.getName()); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - processesApi.getProcessesItems(processModel).assertEntriesListContains("id", processItem.getId()); - + processesApi.getProcessesItems(processModel).assertEntriesListContains("name", document2.getName()); } @Bug(id= "MNT-16966") @@ -82,17 +73,9 @@ public class AddProcessItemSanityTests extends RestWorkflowTest document3 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); processModel = processesApi.getProcesses().getOneRandomEntry(); processItem = processesApi.addProcessItem(processModel, document3); - processItem.and().assertField("createdAt").is(processItem.getCreatedAt()) - .and().assertField("size").is(processItem.getSize()) - .and().assertField("createdBy").is(processItem.getCreatedBy()) - .and().assertField("modifiedAt").is(processItem.getModifiedAt()) - .and().assertField("name").is(processItem.getName()) - .and().assertField("modifiedBy").is(processItem.getModifiedBy()) - .and().assertField("id").is(processItem.getId()) - .and().assertField("mimeType").is(processItem.getMimeType()); - + processItem.and().assertField("name").is(document3.getName()); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - processesApi.getProcessesItems(processModel).assertEntriesListContains("id", processItem.getId()); + processesApi.getProcessesItems(processModel).assertEntriesListContains("name", document3.getName()); processItem = processesApi.addProcessItem(processModel, document3); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.BAD_REQUEST); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java index b382c23a7..e4c94be03 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java @@ -53,11 +53,10 @@ public class AddProcessSanityTests extends RestWorkflowTest restClient.authenticateUser(userWhoStartsProcess); addedProcess = processesApi.addProcess("activitiAdhoc", assignee, false, Priority.Normal); - addedProcess.and().assertField("id").is(addedProcess.getId()) - .and().assertField("startUserId").is(addedProcess.getStartUserId()); + addedProcess.and().assertField("startUserId").is(userWhoStartsProcess.getUsername()); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - processesApi.getProcesses().assertEntriesListContains("id", addedProcess.getId()); + processesApi.getProcesses().assertEntriesListIsNotEmpty(); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -73,10 +72,9 @@ public class AddProcessSanityTests extends RestWorkflowTest restClient.authenticateUser(tenantUserWhoStartsProcess); addedProcess = processesApi.addProcess("activitiAdhoc", tenantAssignee, false, Priority.Normal); - addedProcess.and().assertField("id").is(addedProcess.getId()) - .and().assertField("startUserId").is(addedProcess.getStartUserId()); + addedProcess.and().assertField("startUserId").is(tenantUserWhoStartsProcess.getUsername()); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - processesApi.getProcesses().assertEntriesListContains("id", addedProcess.getId()); + processesApi.getProcesses().assertEntriesListIsNotEmpty(); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java index ce3cba96e..8b73ae1a8 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java @@ -63,12 +63,12 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest processModel = processesApi.getProcesses().getOneRandomEntry(); processVariable = processesApi.addProcessVariable(processModel, variableModel); - processVariable.and().assertField("name").is(processVariable.getName()) - .and().assertField("type").is(processVariable.getType()) - .and().assertField("value").is(processVariable.getValue()); + processVariable.and().assertField("name").is(variableModel.getName()) + .and().assertField("type").is(variableModel.getType()) + .and().assertField("value").is(variableModel.getValue()); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - processesApi.getProcessesVariables(processModel).assertEntriesListContains("name", processVariable.getName()); + processesApi.getProcessesVariables(processModel).assertEntriesListContains("name", variableModel.getName()); } @TestRail(section = {TestGroup.REST_API, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, @@ -79,9 +79,9 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text"); processModel = processesApi.getProcesses().getOneRandomEntry(); processVariable = processesApi.addProcessVariable(processModel, variableModel); - processVariable.and().assertField("name").is(processVariable.getName()) - .and().assertField("type").is(processVariable.getType()) - .and().assertField("value").is(processVariable.getValue()); + processVariable.and().assertField("name").is(variableModel.getName()) + .and().assertField("type").is(variableModel.getType()) + .and().assertField("value").is(variableModel.getValue()); String newValue = RandomData.getRandomName("value"); variableModel.setValue(newValue); @@ -111,9 +111,9 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text"); processModel = processesApi.getProcesses().getOneRandomEntry(); processesApi.addProcessVariable(processModel, variableModel); - processVariable.and().assertField("name").is(processVariable.getName()) - .and().assertField("type").is(processVariable.getType()) - .and().assertField("value").is(processVariable.getValue()); + processVariable.and().assertField("name").is(variableModel.getName()) + .and().assertField("type").is(variableModel.getType()) + .and().assertField("value").is(variableModel.getValue()); processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java index 4f805cbb1..99273116f 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java @@ -55,18 +55,10 @@ public class AddTaskItemSanityTests extends RestWorkflowTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser); document2 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); - taskItem = tasksApi.addTaskItem(taskModel, document2); - - taskItem.and().assertField("createdAt").is(taskItem.getCreatedAt()) - .and().assertField("size").is(taskItem.getSize()) - .and().assertField("createdBy").is(taskItem.getCreatedBy()) - .and().assertField("modifiedAt").is(taskItem.getModifiedAt()) - .and().assertField("name").is(taskItem.getName()) - .and().assertField("modifiedBy").is(taskItem.getModifiedBy()) - .and().assertField("id").is(taskItem.getId()) - .and().assertField("mimeType").is(taskItem.getMimeType()); + taskItem = tasksApi.addTaskItem(taskModel, document2); + taskItem.and().assertField("name").is(document2.getName()); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - tasksApi.getTaskItems(taskModel).assertEntriesListContains("id", taskItem.getId()); + tasksApi.getTaskItems(taskModel).assertEntriesListContains("name", document2.getName()); } @Bug(id = "MNT-16966") @@ -78,14 +70,7 @@ public class AddTaskItemSanityTests extends RestWorkflowTest restClient.authenticateUser(adminUser); document3 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); taskItem = tasksApi.addTaskItem(taskModel, document3); - taskItem.and().assertField("createdAt").is(taskItem.getCreatedAt()) - .and().assertField("size").is(taskItem.getSize()) - .and().assertField("createdBy").is(taskItem.getCreatedBy()) - .and().assertField("modifiedAt").is(taskItem.getModifiedAt()) - .and().assertField("name").is(taskItem.getName()) - .and().assertField("modifiedBy").is(taskItem.getModifiedBy()) - .and().assertField("id").is(taskItem.getId()) - .and().assertField("mimeType").is(taskItem.getMimeType()); + taskItem.and().assertField("name").is(document3.getName()); taskItem = tasksApi.addTaskItem(taskModel, document3); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.BAD_REQUEST); } @@ -110,14 +95,7 @@ public class AddTaskItemSanityTests extends RestWorkflowTest document4 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); taskItem = tasksApi.addTaskItem(taskModel, document4); - taskItem.and().assertField("createdAt").is(taskItem.getCreatedAt()) - .and().assertField("size").is(taskItem.getSize()) - .and().assertField("createdBy").is(taskItem.getCreatedBy()) - .and().assertField("modifiedAt").is(taskItem.getModifiedAt()) - .and().assertField("name").is(taskItem.getName()) - .and().assertField("modifiedBy").is(taskItem.getModifiedBy()) - .and().assertField("id").is(taskItem.getId()) - .and().assertField("mimeType").is(taskItem.getMimeType()); + taskItem.and().assertField("name").is(document4.getName()); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsSanityTests.java index b7a422959..2bcc0fb7e 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsSanityTests.java @@ -2,7 +2,6 @@ package org.alfresco.rest.workflow.tasks; import org.alfresco.dataprep.CMISUtil.DocumentType; import org.alfresco.rest.RestWorkflowTest; -import org.alfresco.rest.model.RestItemModel; import org.alfresco.rest.requests.RestTasksApi; import org.alfresco.rest.requests.RestTenantApi; import org.alfresco.utility.model.FileModel; @@ -30,7 +29,6 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest private SiteModel siteModel; private FileModel fileModel, document1; private TaskModel taskModel; - private RestItemModel taskItem; @BeforeClass(alwaysRun=true) public void dataPreparation() throws Exception @@ -50,11 +48,10 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest { restClient.authenticateUser(userWhoStartsTask); document1 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); - taskItem = tasksApi.addTaskItem(taskModel, document1); + tasksApi.addTaskItem(taskModel, document1); tasksApi.getTaskItems(taskModel) - .assertEntriesListIsNotEmpty() - .assertEntriesListContains("id", taskItem.getId()); - + .assertEntriesListIsNotEmpty() + .assertEntriesListContains("name", document1.getName()); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -64,10 +61,10 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest { restClient.authenticateUser(assignee); document1 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); - taskItem = tasksApi.addTaskItem(taskModel, document1); + tasksApi.addTaskItem(taskModel, document1); tasksApi.getTaskItems(taskModel) - .assertEntriesListIsNotEmpty() - .assertEntriesListContains("id", taskItem.getId()); + .assertEntriesListIsNotEmpty() + .assertEntriesListContains("name", document1.getName()); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -90,10 +87,10 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest dataWorkflow.usingUser(tenantUser).usingSite(siteModel).usingResource(fileModel).createNewTaskAndAssignTo(tenantUserAssignee); document1 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); - taskItem = tasksApi.addTaskItem(taskModel, document1); + tasksApi.addTaskItem(taskModel, document1); tasksApi.getTaskItems(taskModel) - .assertEntriesListIsNotEmpty() - .assertEntriesListContains("id", taskItem.getId()); + .assertEntriesListIsNotEmpty() + .assertEntriesListContains("name", document1.getName()); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/RemoveTaskItemSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/RemoveTaskItemSanityTests.java index 2c2085edc..e6f90092f 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/tasks/RemoveTaskItemSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/RemoveTaskItemSanityTests.java @@ -56,7 +56,7 @@ public class RemoveTaskItemSanityTests extends RestWorkflowTest taskItem = tasksApi.addTaskItem(taskModel, document2); tasksApi.deleteTaskItem(taskModel, taskItem); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); - tasksApi.getTaskItems(taskModel).assertEntriesListDoesNotContain("id", taskItem.getId()); + tasksApi.getTaskItems(taskModel).assertEntriesListDoesNotContain("name", document2.getName()); } @TestRail(section = {TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.TASKS }, executionType = ExecutionType.SANITY, 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 8e6a6e80d..729846396 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java @@ -60,10 +60,10 @@ public class UpdateTaskVariableSanityTests extends RestWorkflowTest restClient.authenticateUser(adminUser); RestVariableModel variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text"); taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel); - taskVariable.and().assertField("scope").is(taskVariable.getScope()) - .and().assertField("name").is(taskVariable.getName()) - .and().assertField("type").is(taskVariable.getType()) - .and().assertField("value").is(taskVariable.getValue()); + taskVariable.and().assertField("scope").is(variableModel.getScope()) + .and().assertField("name").is(variableModel.getName()) + .and().assertField("type").is(variableModel.getType()) + .and().assertField("value").is(variableModel.getValue()); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -75,10 +75,10 @@ public class UpdateTaskVariableSanityTests extends RestWorkflowTest restClient.authenticateUser(adminUser); RestVariableModel variableModel = RestVariableModel.getRandomTaskVariableModel("local", "d:text"); taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel); - taskVariable.and().assertField("scope").is(taskVariable.getScope()) - .and().assertField("name").is(taskVariable.getName()) - .and().assertField("type").is(taskVariable.getType()) - .and().assertField("value").is(taskVariable.getValue()); + taskVariable.and().assertField("scope").is(variableModel.getScope()) + .and().assertField("name").is(variableModel.getName()) + .and().assertField("type").is(variableModel.getType()) + .and().assertField("value").is(variableModel.getValue()); variableModel.setValue("updatedValue"); taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel).and().assertField("value").is("updatedValue"); tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); @@ -106,9 +106,9 @@ public class UpdateTaskVariableSanityTests extends RestWorkflowTest taskVariable = tasksApi.updateTaskVariable(tenantTask, variableModel); taskVariable.and().assertField("scope").is(taskVariable.getScope()) - .and().assertField("name").is(taskVariable.getName()) - .and().assertField("type").is(taskVariable.getType()) - .and().assertField("value").is(taskVariable.getValue()); + .and().assertField("name").is(variableModel.getName()) + .and().assertField("type").is(variableModel.getType()) + .and().assertField("value").is(variableModel.getValue()); variableModel.setValue("updatedValue"); taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel).and().assertField("value").is("updatedValue");