From be9cafb5caeda808d999b77514621e7237154ea3 Mon Sep 17 00:00:00 2001 From: Cristina Jalba Date: Tue, 25 Oct 2016 12:40:13 +0300 Subject: [PATCH] Added assertions to sites Rest tests. --- .../rest/sites/AddSiteMemberSanityTests.java | 9 +++++++-- .../sites/GetSiteContainerSanityTests.java | 15 +++++++++----- .../sites/GetSiteContainersSanityTests.java | 10 +++++----- .../rest/sites/GetSiteMemberSanityTests.java | 15 +++++++++----- .../rest/sites/GetSiteMembersSanityTests.java | 20 ++++++++++++++----- .../rest/sites/GetSiteSanityTests.java | 17 ++++++++++------ .../rest/sites/GetSitesSanityTests.java | 10 +++++----- .../sites/RemoveSiteMemberSanityTests.java | 10 ++++++++++ .../sites/UpdateSiteMemberSanityTests.java | 12 +++++++++-- 9 files changed, 83 insertions(+), 35 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java index 251fd5ed4..1116874b7 100644 --- a/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java @@ -43,7 +43,8 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.addPerson(siteModel, testUser); + siteAPI.addPerson(siteModel, testUser).and().assertField("id").is(testUser.getUsername()) + .and().assertField("role").is(testUser.getUserRole()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -55,6 +56,7 @@ public class AddSiteMemberSanityTests extends RestTest testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); siteAPI.addPerson(siteModel, testUser); + siteAPI.usingRestWrapper().assertLastError().containsSummary("Permission was denied"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -66,6 +68,7 @@ public class AddSiteMemberSanityTests extends RestTest testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); siteAPI.addPerson(siteModel, testUser); + siteAPI.usingRestWrapper().assertLastError().containsSummary("Permission was denied"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -77,6 +80,7 @@ public class AddSiteMemberSanityTests extends RestTest testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); siteAPI.addPerson(siteModel, testUser); + siteAPI.usingRestWrapper().assertLastError().containsSummary("Permission was denied"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -87,7 +91,8 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(adminUserModel); - siteAPI.addPerson(siteModel, testUser); + siteAPI.addPerson(siteModel, testUser).and().assertField("id").is(testUser.getUsername()) + .and().assertField("role").is(testUser.getUserRole()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java index 40df95495..91a82cbba 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java @@ -47,7 +47,8 @@ public class GetSiteContainerSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry(); - siteAPI.getSiteContainer(siteModel, siteContainerModel); + siteAPI.getSiteContainer(siteModel, siteContainerModel).and().assertField("id").is(siteContainerModel.onModel().getId()) + .and().assertField("folderId").is(siteContainerModel.onModel().getFolderId()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -57,7 +58,8 @@ public class GetSiteContainerSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry(); - siteAPI.getSiteContainer(siteModel, siteContainerModel); + siteAPI.getSiteContainer(siteModel, siteContainerModel).and().assertField("id").is(siteContainerModel.onModel().getId()) + .and().assertField("folderId").is(siteContainerModel.onModel().getFolderId()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -67,7 +69,8 @@ public class GetSiteContainerSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry(); - siteAPI.getSiteContainer(siteModel, siteContainerModel); + siteAPI.getSiteContainer(siteModel, siteContainerModel).and().assertField("id").is(siteContainerModel.onModel().getId()) + .and().assertField("folderId").is(siteContainerModel.onModel().getFolderId()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -77,7 +80,8 @@ public class GetSiteContainerSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry(); - siteAPI.getSiteContainer(siteModel, siteContainerModel); + siteAPI.getSiteContainer(siteModel, siteContainerModel).and().assertField("id").is(siteContainerModel.onModel().getId()) + .and().assertField("folderId").is(siteContainerModel.onModel().getFolderId()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -87,7 +91,8 @@ public class GetSiteContainerSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry(); - siteAPI.getSiteContainer(siteModel, siteContainerModel); + siteAPI.getSiteContainer(siteModel, siteContainerModel).and().assertField("id").is(siteContainerModel.onModel().getId()) + .and().assertField("folderId").is(siteContainerModel.onModel().getFolderId()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java index a34721798..1a10643d7 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java @@ -52,7 +52,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.getSiteContainers(siteModel); + siteAPI.getSiteContainers(siteModel).assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -61,7 +61,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteAPI.getSiteContainers(siteModel); + siteAPI.getSiteContainers(siteModel).assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -70,7 +70,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteAPI.getSiteContainers(siteModel); + siteAPI.getSiteContainers(siteModel).assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -79,7 +79,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteAPI.getSiteContainers(siteModel); + siteAPI.getSiteContainers(siteModel).assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -88,7 +88,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - siteAPI.getSiteContainers(siteModel); + siteAPI.getSiteContainers(siteModel).assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java index 802b94c4e..db9fef95d 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java @@ -49,7 +49,8 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithManagerRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restSitesApi.getSiteMember(siteModel, userModel); + restSitesApi.getSiteMember(siteModel, userModel).and().assertField("id").is(userModel.getUsername()) + .and().assertField("role").is(userModel.getUserRole()); restSitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -58,7 +59,8 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithCollaboratorRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restSitesApi.getSiteMember(siteModel, userModel); + restSitesApi.getSiteMember(siteModel, userModel).and().assertField("id").is(userModel.getUsername()) + .and().assertField("role").is(userModel.getUserRole()); restSitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -67,7 +69,8 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithContributorRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restSitesApi.getSiteMember(siteModel, userModel); + restSitesApi.getSiteMember(siteModel, userModel).and().assertField("id").is(userModel.getUsername()) + .and().assertField("role").is(userModel.getUserRole()); restSitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -76,7 +79,8 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithConsumerRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restSitesApi.getSiteMember(siteModel, userModel); + restSitesApi.getSiteMember(siteModel, userModel).and().assertField("id").is(userModel.getUsername()) + .and().assertField("role").is(userModel.getUserRole()); restSitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -85,7 +89,8 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithAdminUser() throws Exception { restClient.authenticateUser(adminUser); - restSitesApi.getSiteMember(siteModel, userModel); + restSitesApi.getSiteMember(siteModel, userModel).and().assertField("id").is(userModel.getUsername()) + .and().assertField("role").is(userModel.getUserRole()); restSitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java index 69fdf1a37..e6d65cf62 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java @@ -53,7 +53,9 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.getSiteMembers(siteModel); + siteAPI.getSiteMembers(siteModel).assertEntriesListIsNotEmpty() + .assertEntriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteManager).getUsername()) + .assertEntriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteManager).getUserRole().toString()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -62,7 +64,9 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteAPI.getSiteMembers(siteModel); + siteAPI.getSiteMembers(siteModel).assertEntriesListIsNotEmpty() + .assertEntriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername()) + .assertEntriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUserRole().toString()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -71,7 +75,9 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteAPI.getSiteMembers(siteModel); + siteAPI.getSiteMembers(siteModel).assertEntriesListIsNotEmpty() + .assertEntriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteContributor).getUsername()) + .assertEntriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteContributor).getUserRole().toString()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -80,7 +86,9 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteAPI.getSiteMembers(siteModel); + siteAPI.getSiteMembers(siteModel).assertEntriesListIsNotEmpty() + .assertEntriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer).getUsername()) + .assertEntriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer).getUserRole().toString()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -89,7 +97,9 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser); - siteAPI.getSiteMembers(siteModel); + siteAPI.getSiteMembers(siteModel).assertEntriesListIsNotEmpty() + .assertEntriesListContains("id", adminUser.getUsername()) + .assertEntriesListContains("role", adminUser.getUserRole().toString()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java index e5f117f17..c41ba9a2a 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java @@ -47,7 +47,7 @@ public class GetSiteSanityTests extends RestTest restClient.authenticateUser(adminUserModel); siteAPI.useRestClient(restClient); siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); - usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel,UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); + usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); } @TestRail(section = { TestGroup.REST_API, TestGroup.SITES }, executionType = ExecutionType.SANITY, @@ -55,7 +55,8 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.getSite(siteModel); + siteAPI.getSite(siteModel).and().assertField("id").is(siteModel.getId()) + .and().assertField("title").is(siteModel.getTitle()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -64,7 +65,8 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteAPI.getSite(siteModel); + siteAPI.getSite(siteModel).and().assertField("id").is(siteModel.getId()) + .and().assertField("title").is(siteModel.getTitle()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -73,7 +75,8 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteAPI.getSite(siteModel); + siteAPI.getSite(siteModel).and().assertField("id").is(siteModel.getId()) + .and().assertField("title").is(siteModel.getTitle()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -82,7 +85,8 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteAPI.getSite(siteModel); + siteAPI.getSite(siteModel).and().assertField("id").is(siteModel.getId()) + .and().assertField("title").is(siteModel.getTitle()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -91,7 +95,8 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithAdminRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - siteAPI.getSite(siteModel); + siteAPI.getSite(siteModel).and().assertField("id").is(siteModel.getId()) + .and().assertField("title").is(siteModel.getTitle()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java index 21d5e6d22..b1284661b 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java @@ -53,7 +53,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.getAllSites(); + siteAPI.getAllSites().assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -63,7 +63,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteAPI.getAllSites(); + siteAPI.getAllSites().assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -73,7 +73,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteAPI.getAllSites(); + siteAPI.getAllSites().assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -83,7 +83,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteAPI.getAllSites(); + siteAPI.getAllSites().assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -92,7 +92,7 @@ public class GetSitesSanityTests extends RestTest public void adminUserIsAbleToRetrieveSites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - siteAPI.getAllSites(); + siteAPI.getAllSites().assertEntriesListIsNotEmpty(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java index be6cb7a3c..7832bc778 100644 --- a/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java @@ -57,6 +57,8 @@ public class RemoveSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); restSitesAPI.deleteSiteMember(siteModel, testUserModel); restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + restSitesAPI.getAllSites().assertEntriesListDoesNotContain("id", testUserModel.getUsername()); + restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @Bug(id="ACE-5444") @@ -66,6 +68,8 @@ public class RemoveSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); restSitesAPI.deleteSiteMember(siteModel, testUserModel); restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + restSitesAPI.getAllSites().assertEntriesListContains("id", testUserModel.getUsername()); + restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @Bug(id="ACE-5444") @@ -75,6 +79,8 @@ public class RemoveSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); restSitesAPI.deleteSiteMember(siteModel, testUserModel); restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + restSitesAPI.getAllSites().assertEntriesListContains("id", testUserModel.getUsername()); + restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @Bug(id="ACE-5444") @@ -84,6 +90,8 @@ public class RemoveSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); restSitesAPI.deleteSiteMember(siteModel, testUserModel); restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + restSitesAPI.getAllSites().assertEntriesListContains("id", testUserModel.getUsername()); + restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = {TestGroup.REST_API, TestGroup.SITES }, executionType = ExecutionType.SANITY, @@ -92,6 +100,8 @@ public class RemoveSiteMemberSanityTests extends RestTest restClient.authenticateUser(adminUserModel); restSitesAPI.deleteSiteMember(siteModel, testUserModel); restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + restSitesAPI.getAllSites().assertEntriesListDoesNotContain("id", testUserModel.getUsername()); + restSitesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = {TestGroup.REST_API, TestGroup.SITES }, executionType = ExecutionType.SANITY, diff --git a/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java index fe481b0d5..473364777 100644 --- a/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java @@ -44,7 +44,8 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); testUserModel.setUserRole(UserRole.SiteConsumer); - siteAPI.updateSiteMember(siteModel, testUserModel); + siteAPI.updateSiteMember(siteModel, testUserModel).and().assertField("id").is(testUserModel.getUsername()) + .and().assertField("role").is(testUserModel.getUserRole()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -56,6 +57,8 @@ public class UpdateSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); testUserModel.setUserRole(UserRole.SiteCollaborator); siteAPI.updateSiteMember(siteModel, testUserModel); + siteAPI.usingRestWrapper().assertLastError() + .containsSummary(String.format("The current user does not have permissions to modify the membership details of the site %s.", siteModel.getTitle())); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -67,6 +70,8 @@ public class UpdateSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); testUserModel.setUserRole(UserRole.SiteCollaborator); siteAPI.updateSiteMember(siteModel, testUserModel); + siteAPI.usingRestWrapper().assertLastError() + .containsSummary(String.format("The current user does not have permissions to modify the membership details of the site %s.", siteModel.getTitle())); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -78,6 +83,8 @@ public class UpdateSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); testUserModel.setUserRole(UserRole.SiteCollaborator); siteAPI.updateSiteMember(siteModel, testUserModel); + siteAPI.usingRestWrapper().assertLastError() + .containsSummary(String.format("The current user does not have permissions to modify the membership details of the site %s.", siteModel.getTitle())); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -87,7 +94,8 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); testUserModel.setUserRole(UserRole.SiteCollaborator); - siteAPI.updateSiteMember(siteModel, testUserModel); + siteAPI.updateSiteMember(siteModel, testUserModel).and().assertField("id").is(testUserModel.getUsername()) + .and().assertField("role").is(testUserModel.getUserRole()); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); }