From 2428f83f894a0f6fe5032bbbb888bf7516e399be Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Thu, 17 Nov 2016 16:23:10 +0200 Subject: [PATCH] Refactor Test: AddSiteMembershipRequestSanityTests.java --- .../AddSiteMembershipRequestSanityTests.java | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java index 0478dd9be..637aac2b5 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java @@ -2,6 +2,7 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; import org.alfresco.rest.exception.JsonToModelConversionException; +import org.alfresco.rest.model.RestSiteMembershipRequestModel; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataSite; import org.alfresco.utility.data.DataUser; @@ -16,6 +17,7 @@ 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.BeforeMethod; import org.testng.annotations.Test; @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) @@ -32,6 +34,8 @@ public class AddSiteMembershipRequestSanityTests extends RestTest private ListUserWithRoles usersWithRoles; private UserModel adminUser; + private UserModel newMember; + private RestSiteMembershipRequestModel requestModel; @BeforeClass(alwaysRun=true) public void dataPreparation() throws DataPreparationException @@ -41,18 +45,21 @@ public class AddSiteMembershipRequestSanityTests extends RestTest usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel,UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); } + @BeforeMethod + public void setUp() throws DataPreparationException { + newMember = dataUser.createRandomTestUser(); + } + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify site manager is able to create new site membership request") @Bug(id="MNT-16557") public void siteManagerIsAbleToCreateSiteMembershipRequest() throws JsonToModelConversionException, Exception { - UserModel newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .withCoreAPI() - .usingUser(newMember).addSiteMembershipRequest(siteModel) - .assertThat().field("id").isNotEmpty() - .assertThat().field("site").isNotEmpty(); + requestModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) + .withCoreAPI().usingUser(newMember).addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); + requestModel.assertThat().field("id").isNotEmpty() + .assertThat().field("site").isNotEmpty(); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -61,13 +68,11 @@ public class AddSiteMembershipRequestSanityTests extends RestTest @Bug(id = "MNT-16557") public void siteCollaboatorIsAbleToCreateSiteMembershipRequest() throws JsonToModelConversionException, Exception { - UserModel newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .withCoreAPI() - .usingUser(newMember).addSiteMembershipRequest(siteModel) - .assertThat().field("id").isNotEmpty() - .assertThat().field("site").isNotEmpty(); + requestModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) + .withCoreAPI().usingUser(newMember).addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); + requestModel.assertThat().field("id").isNotEmpty() + .assertThat().field("site").isNotEmpty(); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -76,13 +81,11 @@ public class AddSiteMembershipRequestSanityTests extends RestTest @Bug(id = "MNT-16557") public void siteContributorIsAbleToCreateSiteMembershipRequest() throws JsonToModelConversionException, Exception { - UserModel newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .withCoreAPI() - .usingUser(newMember).addSiteMembershipRequest(siteModel) - .assertThat().field("id").isNotEmpty() + requestModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) + .withCoreAPI().usingUser(newMember).addSiteMembershipRequest(siteModel); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + requestModel.assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); - restClient.assertStatusCodeIs(HttpStatus.CREATED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -91,13 +94,11 @@ public class AddSiteMembershipRequestSanityTests extends RestTest @Bug(id = "MNT-16557") public void siteConsumerIsAbleToCreateSiteMembershipRequest() throws JsonToModelConversionException, Exception { - UserModel newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .withCoreAPI() - .usingUser(newMember).addSiteMembershipRequest(siteModel) - .assertThat().field("id").isNotEmpty() - .assertThat().field("site").isNotEmpty(); + requestModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) + .withCoreAPI().usingUser(newMember).addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); + requestModel.assertThat().field("id").isNotEmpty() + .assertThat().field("site").isNotEmpty(); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -106,13 +107,12 @@ public class AddSiteMembershipRequestSanityTests extends RestTest @Bug(id = "MNT-16557") public void adminUserIsAbleToCreateSiteMembershipRequest() throws JsonToModelConversionException, Exception { - UserModel newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(adminUser) + requestModel = restClient.authenticateUser(adminUser) .withCoreAPI() - .usingUser(newMember).addSiteMembershipRequest(siteModel) - .assertThat().field("id").isNotEmpty() - .assertThat().field("site").isNotEmpty(); + .usingUser(newMember).addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); + requestModel.assertThat().field("id").isNotEmpty() + .assertThat().field("site").isNotEmpty(); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -121,12 +121,11 @@ public class AddSiteMembershipRequestSanityTests extends RestTest @Bug(id = "MNT-16557") public void unauthenticatedUserIsNotAbleToCreateSiteMembershipRequest() throws JsonToModelConversionException, Exception { - UserModel newMember = dataUser.createRandomTestUser(); - restClient.authenticateUser(new UserModel("random user", "random password")) + requestModel = restClient.authenticateUser(new UserModel("random user", "random password")) .withCoreAPI() - .usingUser(newMember).addSiteMembershipRequest(siteModel) - .assertThat().field("id").isNotEmpty() - .assertThat().field("site").isNotEmpty(); + .usingUser(newMember).addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); + requestModel.assertThat().field("id").isNotEmpty() + .assertThat().field("site").isNotEmpty(); } } \ No newline at end of file