From 0a0e586283d8a5a3be0e7eaa1572939a3b37d97f Mon Sep 17 00:00:00 2001 From: Paul Brodner Date: Thu, 29 Sep 2016 16:17:50 +0300 Subject: [PATCH] refacor based on naming conventions --- ...st.java => UpdateCommentsSanityTests.java} | 59 +++++++++---------- 1 file changed, 28 insertions(+), 31 deletions(-) rename e2e-test/java/org/alfresco/rest/comments/{UpdateCommentsSanityTest.java => UpdateCommentsSanityTests.java} (72%) diff --git a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTest.java b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java similarity index 72% rename from e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTest.java rename to e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java index 1c141f75b..3a431ae44 100644 --- a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTest.java +++ b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java @@ -1,8 +1,5 @@ package org.alfresco.rest.comments; -import java.util.Arrays; -import java.util.HashMap; - import org.alfresco.dataprep.CMISUtil.DocumentType; import org.alfresco.rest.RestTest; import org.alfresco.rest.exception.JsonToModelConversionException; @@ -10,7 +7,9 @@ import org.alfresco.rest.model.RestCommentModel; import org.alfresco.rest.requests.RestCommentsApi; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataUser; +import org.alfresco.utility.data.DataUser.ListUserWithRoles; import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FolderModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.UserModel; import org.alfresco.utility.testrail.ExecutionType; @@ -21,9 +20,8 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Test(groups = { "rest-api", "comments", "sanity" }) -public class UpdateCommentsSanityTest extends RestTest +public class UpdateCommentsSanityTests extends RestTest { - @Autowired RestCommentsApi commentsAPI; @@ -34,65 +32,64 @@ public class UpdateCommentsSanityTest extends RestTest private FileModel document; private SiteModel siteModel; private RestCommentModel commentModel; - private HashMap usersWithRoles; + private ListUserWithRoles usersWithRoles; - @BeforeClass - public void initTest() throws Exception + @BeforeClass(alwaysRun=true) + public void dataPreparation() throws Exception { adminUserModel = dataUser.getAdminUser(); restClient.authenticateUser(adminUserModel); siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); commentsAPI.useRestClient(restClient); document = dataContent.usingSite(siteModel).usingUser(adminUserModel).createContent(DocumentType.TEXT_PLAIN); - commentModel = commentsAPI.addComment(document.getNodeRef(), "This is a new comment"); + commentModel = commentsAPI.addComment(document, "This is a new comment"); - usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, - Arrays.asList(UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor)); + usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel,UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify Admin user updates comments with Rest API and status code is 200") public void adminIsAbleToUpdateComments() throws JsonToModelConversionException, Exception { - commentsAPI.updateComment(document.getNodeRef(), commentModel.getId(), commentModel.getContent()); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK.toString()); + commentsAPI.updateComment(document, commentModel, commentModel.getContent()); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify Manager user updates comments created by admin user with Rest API and status code is 200") public void managerIsAbleToUpdateComment() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.get(UserRole.SiteManager)); - commentsAPI.updateComment(document.getNodeRef(), commentModel.getId(), commentModel.getContent()); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK.toString()); + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); + commentsAPI.updateComment(document, commentModel, commentModel.getContent()); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify Contributor user updates comments created by admin user with Rest API and status code is 200") public void contributorIsAbleToUpdateComment() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.get(UserRole.SiteContributor)); - commentsAPI.updateComment(document.getNodeRef(), commentModel.getId(), "This is the updated comment with Contributor user"); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN.toString()); + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); + commentsAPI.updateComment(document, commentModel, "This is the updated comment with Contributor user"); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify Consumer user updates comments created by admin user with Rest API and status code is 200") public void consumerIsAbleToUpdateComment() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.get(UserRole.SiteConsumer)); - commentsAPI.updateComment(document.getNodeRef(), commentModel.getId(), commentModel.getContent()); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN.toString()); + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); + commentsAPI.updateComment(document, commentModel, commentModel.getContent()); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user updates comments created by admin user with Rest API and status code is 200") public void collaboratorIsAbleToUpdateComment() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.get(UserRole.SiteCollaborator)); - RestCommentModel commentEntry = commentsAPI.updateComment(document.getNodeRef(), commentModel.getId(), + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); + RestCommentModel commentEntry = commentsAPI.updateComment(document, commentModel, "This is the updated comment with Collaborator user"); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN.toString()); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); commentEntry.assertCommentContentIs("This is the updated comment with Collaborator user"); } @@ -102,24 +99,24 @@ public class UpdateCommentsSanityTest extends RestTest { UserModel incorrectUserModel = new UserModel("userName", "password"); restClient.authenticateUser(incorrectUserModel); - commentsAPI.getNodeComments(document.getNodeRef()); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED.toString()); + commentsAPI.getNodeComments(document); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify if nodeId is not set the status code is 404") public void canNotUpdateCommentIfNodeIdIsNotSet() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - commentsAPI.updateComment("unexistingId", commentModel.getId(), commentModel.getContent()); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND.toString()); + commentsAPI.updateComment(FolderModel.getRandomFolderModel(), commentModel, commentModel.getContent()); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); } @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify if commentId is not set the status code is 404") public void canNotUpdateCommentIfCommentIdIsNotSet() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - commentsAPI.updateComment(document.getNodeRef(), "unexistingId", commentModel.getContent()); - commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND.toString()); + commentsAPI.updateComment(document, new RestCommentModel(), commentModel.getContent()); + commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); } }