From 6d7cd09f66a5075ad9505ecb5443e4a59c0a7dfe Mon Sep 17 00:00:00 2001 From: cagache Date: Wed, 7 Dec 2016 15:01:01 +0200 Subject: [PATCH] test: renamed variables --- .../sites/GetSiteContainersCoreTests.java | 117 ++++++++---------- 1 file changed, 53 insertions(+), 64 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersCoreTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersCoreTests.java index 65d39c2fd..00ceb0d2d 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersCoreTests.java @@ -17,47 +17,46 @@ import org.testng.annotations.Test; @Test(groups = { TestGroup.REST_API, TestGroup.SITES, TestGroup.CORE }) public class GetSiteContainersCoreTests extends RestTest { - private UserModel adminUserModel; - private SiteModel siteModel, siteModel1; + private SiteModel publicSiteModel, publicSiteWithContainers; private SiteModel moderatedSiteModel, privateSiteModel; - private ListUserWithRoles usersWithRoles; - private ListUserWithRoles usersWithRoles1; - + private ListUserWithRoles publicSiteUsers; + private ListUserWithRoles publicSiteWithContainersUsers; @BeforeClass(alwaysRun=true) public void dataPreparation() throws Exception { adminUserModel = dataUser.getAdminUser(); - - siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); - siteModel1 = dataSite.usingUser(adminUserModel).createPublicRandomSite(); - moderatedSiteModel = dataSite.usingUser(adminUserModel).createModeratedRandomSite(); - privateSiteModel = dataSite.usingUser(adminUserModel).createPrivateRandomSite(); - - usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, - UserRole.SiteContributor); - - usersWithRoles1 = dataUser.addUsersWithRolesToSite(siteModel1, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, - UserRole.SiteContributor); - - dataLink.usingAdmin().usingSite(siteModel1).createRandomLink(); - dataDiscussion.usingAdmin().usingSite(siteModel1).createRandomDiscussion(); - + + publicSiteModel = dataSite.usingAdmin().createPublicRandomSite(); + publicSiteWithContainers = dataSite.usingAdmin().createPublicRandomSite(); + moderatedSiteModel = dataSite.usingAdmin().createModeratedRandomSite(); + privateSiteModel = dataSite.usingAdmin().createPrivateRandomSite(); + + publicSiteUsers = dataUser + .addUsersWithRolesToSite(publicSiteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); + + publicSiteWithContainersUsers = dataUser + .addUsersWithRolesToSite(publicSiteWithContainers, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, + UserRole.SiteContributor); + + dataLink.usingAdmin().usingSite(publicSiteWithContainers).createRandomLink(); + dataDiscussion.usingAdmin().usingSite(publicSiteWithContainers).createRandomDiscussion(); + dataLink.usingAdmin().usingSite(moderatedSiteModel).createRandomLink(); dataDiscussion.usingAdmin().usingSite(moderatedSiteModel).createRandomDiscussion(); - + dataLink.usingAdmin().usingSite(privateSiteModel).createRandomLink(); dataDiscussion.usingAdmin().usingSite(privateSiteModel).createRandomDiscussion(); } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, description= "Verify if get site container request returns status code 200 with valid maxItems parameter") - public void getContainersWithMaxItems() throws Exception + public void getContainersWithValidMaxItems() throws Exception { - restClient.authenticateUser(usersWithRoles1.getOneUserWithRole(UserRole.SiteManager)) + restClient.authenticateUser(publicSiteWithContainersUsers.getOneUserWithRole(UserRole.SiteManager)) .withParams("maxItems=5") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(3) .and().entriesListContains("folderId" ,ContainerName.documentLibrary.toString()) .and().entriesListContains("folderId", ContainerName.links.toString()) @@ -65,24 +64,23 @@ public class GetSiteContainersCoreTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.OK); restClient.withParams("maxItems=1") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(1); restClient.withParams("maxItems=3") - .withCoreAPI().usingSite(siteModel).getSiteContainers() + .withCoreAPI().usingSite(publicSiteModel).getSiteContainers() .assertThat().entriesListCountIs(1) .and().entriesListContains("folderId", ContainerName.documentLibrary.toString()); restClient.assertStatusCodeIs(HttpStatus.OK); - } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, description= "Verify if get site container request returns status code 400 when invalid maxItems parameter is used") public void getContainersWithMaxItemsZero () throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) + restClient.authenticateUser(publicSiteUsers.getOneUserWithRole(UserRole.SiteManager)) .withParams("maxItems=0") - .withCoreAPI().usingSite(siteModel).getSiteContainers(); + .withCoreAPI().usingSite(publicSiteModel).getSiteContainers(); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) .assertLastError().containsSummary("Only positive values supported for maxItems"); } @@ -91,20 +89,20 @@ public class GetSiteContainersCoreTests extends RestTest description= "Verify if get site container request returns status code 400 when invalid maxItems parameter is used") public void getContainersWithMaxItemsCharacter () throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) + restClient.authenticateUser(publicSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)) .withParams("maxItems=test") - .withCoreAPI().usingSite(siteModel).getSiteContainers(); + .withCoreAPI().usingSite(publicSiteModel).getSiteContainers(); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_MAXITEMS, "test")); } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify if get site container request returns status code 400 when invalid maxItems parameter is used") + description= "Verify if get site container request returns status code 200 when maxItems parameter starts with multiple zero") public void getContainersWithMaxItemsMultipleZero () throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) + restClient.authenticateUser(publicSiteWithContainersUsers.getOneUserWithRole(UserRole.SiteCollaborator)) .withParams("maxItems=000007") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(3); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -113,52 +111,43 @@ public class GetSiteContainersCoreTests extends RestTest description= "Verify if get site container request returns status code 200 when valid skipCount parameter is used") public void getSitesWithValidSkipCount() throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)).withParams("skipCount=1") - .withCoreAPI().usingSite(siteModel).getSiteContainers() + restClient.authenticateUser(publicSiteUsers.getOneUserWithRole(UserRole.SiteManager)).withParams("skipCount=1") + .withCoreAPI().usingSite(publicSiteModel).getSiteContainers() .assertThat().entriesListCountIs(0); restClient.assertStatusCodeIs(HttpStatus.OK); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=1") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + restClient.authenticateUser(publicSiteWithContainersUsers.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=1") + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(2); restClient.assertStatusCodeIs(HttpStatus.OK); - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).withParams("skipCount=2") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + restClient.authenticateUser(publicSiteWithContainersUsers.getOneUserWithRole(UserRole.SiteConsumer)).withParams("skipCount=2") + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(1); restClient.assertStatusCodeIs(HttpStatus.OK); - - - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=0") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + + restClient.authenticateUser(publicSiteWithContainersUsers.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=0") + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(3); restClient.assertStatusCodeIs(HttpStatus.OK); } - @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, description= "Verify if get site container request returns status code 400 when invalid skipCount parameter is used") public void getSitesWithSkipCountCharacter() throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=abc") - .withCoreAPI().usingSite(siteModel).getSiteContainers(); + restClient.authenticateUser(publicSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=abc") + .withCoreAPI().usingSite(publicSiteModel).getSiteContainers(); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_SKIPCOUNT, "abc")); } - @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify if get site container request returns status code 400 when invalid skipCount parameter is used") - public void getSitesWithSkipCountZero() throws Exception - { - } - - @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify if get site container request returns status code 400 when invalid skipCount parameter is used") + description= "Verify if get site container request returns status code 200 when skipCount parameter starts with multiple zero") public void getSitesWithSkipCountMultipleZero() throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=00002") - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + restClient.authenticateUser(publicSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).withParams("skipCount=00002") + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(1); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -168,14 +157,14 @@ public class GetSiteContainersCoreTests extends RestTest description= "Verify if get site container request returns status code 400 when invalid skipCount parameter is used") public void getSiteContainerWithNonExistentSite() throws Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) + restClient.authenticateUser(publicSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)) .withCoreAPI().usingSite("NonExistentSiteId").getSiteContainers(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "NonExistentSiteId")); } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify get site container request resturns status 200 for private site") + description= "Verify get site container request returns status 200 for private site") public void getSiteContainerForPrivateSite() throws Exception { restClient.authenticateUser(adminUserModel) @@ -185,7 +174,7 @@ public class GetSiteContainersCoreTests extends RestTest } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify get site container request resturns status 200 for moderated site") + description= "Verify get site container request returns status 200 for moderated site") public void getSiteContainerForModeratedSite() throws Exception { restClient.authenticateUser(adminUserModel) @@ -195,11 +184,11 @@ public class GetSiteContainersCoreTests extends RestTest } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify get site container request resturns status 200 for several container") + description= "Verify get site container request returns status 200 for several containers") public void getSiteContainerForSeveralItems() throws Exception { restClient.authenticateUser(adminUserModel) - .withCoreAPI().usingSite(siteModel1).getSiteContainers() + .withCoreAPI().usingSite(publicSiteWithContainers).getSiteContainers() .assertThat().entriesListCountIs(3) .and().entriesListContains("folderId" ,ContainerName.documentLibrary.toString()) .and().entriesListContains("folderId", ContainerName.links.toString()) @@ -208,11 +197,11 @@ public class GetSiteContainersCoreTests extends RestTest } @TestRail(section={TestGroup.REST_API, TestGroup.CORE, TestGroup.SITES}, executionType= ExecutionType.REGRESSION, - description= "Verify get site container request resturns status 200 for one container") + description= "Verify get site container request returns status 200 for one container") public void getSiteContainerWithOneItem() throws Exception { restClient.authenticateUser(adminUserModel) - .withCoreAPI().usingSite(siteModel).getSiteContainers() + .withCoreAPI().usingSite(publicSiteModel).getSiteContainers() .assertThat().entriesListCountIs(1) .and().entriesListContains("folderId" ,ContainerName.documentLibrary.toString()); restClient.assertStatusCodeIs(HttpStatus.OK);