diff --git a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java index 7653859bc..5e5885f87 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java @@ -3,6 +3,7 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; import org.alfresco.rest.requests.RestPeopleApi; import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; @@ -50,7 +51,9 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(managerUser); - peopleApi.getFavoriteSite(managerUser, siteModel1).assertThat().field("id").isNotNull(); + peopleApi.getFavoriteSite(managerUser, siteModel1) + .assertThat().field("id").is(siteModel1.getId()) + .and().field("title").isNotNull(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -63,7 +66,9 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser); - peopleApi.getFavoriteSite(collaboratorUser, siteModel1).assertThat().field("id").isNotNull(); + peopleApi.getFavoriteSite(collaboratorUser, siteModel1) + .assertThat().field("id").is(siteModel1.getId()) + .and().field("title").isNotNull(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -76,7 +81,9 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(contributorUser); - peopleApi.getFavoriteSite(contributorUser, siteModel1).assertThat().field("id").isNotNull(); + peopleApi.getFavoriteSite(contributorUser, siteModel1) + .assertThat().field("id").is(siteModel1.getId()) + .and().field("title").isNotNull(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -89,7 +96,9 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(consumerUser); - peopleApi.getFavoriteSite(consumerUser, siteModel1).assertThat().field("id").isNotNull(); + peopleApi.getFavoriteSite(consumerUser, siteModel1) + .assertThat().field("id").is(siteModel1.getId()) + .and().field("title").isNotNull(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -102,7 +111,9 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(anyUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(adminUset); - peopleApi.getFavoriteSite(anyUser, siteModel1).assertThat().field("id").isNotNull(); + peopleApi.getFavoriteSite(anyUser, siteModel1) + .assertThat().field("id").is(siteModel1.getId()) + .and().field("title").isNotNull(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -116,7 +127,8 @@ public class GetFavoriteSiteSanityTests extends RestTest restClient.authenticateUser(managerUser); peopleApi.getFavoriteSite(userModel, siteModel1); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @Bug(id = "MNT-16904") diff --git a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java index cc03a9e67..de76461ff 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java @@ -3,6 +3,7 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; import org.alfresco.rest.requests.RestPeopleApi; import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; @@ -43,7 +44,8 @@ public class GetFavoriteSitesSanityTests extends RestTest restClient.authenticateUser(managerUser); peopleApi.getFavoriteSites(anotherUser); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify collaborator user fails to get an user favorite sites with Rest API (403)") @@ -57,7 +59,8 @@ public class GetFavoriteSitesSanityTests extends RestTest restClient.authenticateUser(collaboratorUser); peopleApi.getFavoriteSites(contributorUser); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify contributor user fails to get an user favorite sites with Rest API (403)") @@ -71,7 +74,8 @@ public class GetFavoriteSitesSanityTests extends RestTest restClient.authenticateUser(contributorUser); peopleApi.getFavoriteSites(contributorUser2); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify consumer user fails to get an user favorite sites with Rest API (403)") @@ -85,7 +89,8 @@ public class GetFavoriteSitesSanityTests extends RestTest restClient.authenticateUser(consumerUser); peopleApi.getFavoriteSites(collaboratorUser); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify admin user gets its favorite sites with Rest API and response is successful (200)") @@ -96,7 +101,10 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(anotherUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(adminUser); - peopleApi.getFavoriteSites(anotherUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getFavoriteSites(anotherUser) + .assertThat().entriesListIsNotEmpty() + .and().paginationExist() + .and().entriesListContains("id", siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -107,7 +115,10 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(anyUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(anyUser); - peopleApi.getFavoriteSites(anyUser); + peopleApi.getFavoriteSites(anyUser) + .assertThat().entriesListIsNotEmpty() + .and().entriesListContains("id", siteModel.getId()) + .and().paginationExist(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java index d1e87363b..a27b36758 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java @@ -49,7 +49,10 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(managerUser); - peopleApi.getPersonActivities(managerUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonActivities(managerUser) + .assertThat().entriesListIsNotEmpty() + .and().entriesListContains("siteId", siteModel.getId()) + .and().paginationExist(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -61,7 +64,10 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataContent.usingUser(collaboratorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(collaboratorUser); - peopleApi.getPersonActivities(collaboratorUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonActivities(collaboratorUser) + .assertThat().entriesListIsNotEmpty() + .and().entriesListContains("siteId", siteModel.getId()) + .and().paginationExist(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -73,7 +79,10 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataContent.usingUser(contributorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(contributorUser); - peopleApi.getPersonActivities(contributorUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonActivities(contributorUser) + .assertThat().entriesListIsNotEmpty() + .and().entriesListContains("siteId", siteModel.getId()) + .and().paginationExist(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -84,7 +93,10 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser); - peopleApi.getPersonActivities(consumerUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonActivities(consumerUser) + .assertThat().entriesListIsNotEmpty() + .and().entriesListContains("siteId", siteModel.getId()) + .and().paginationExist(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -92,7 +104,10 @@ public class GetPeopleActivitiesSanityTests extends RestTest public void adminUserShouldGetPeopleActivitiesList() throws Exception { restClient.authenticateUser(dataUser.getAdminUser()); - peopleApi.getPersonActivities(userModel).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonActivities(userModel) + .assertThat().entriesListIsNotEmpty() + .and().entriesListContains("siteId", siteModel.getId()) + .and().paginationExist(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java index f5814ae0b..dba3a41c3 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java @@ -29,7 +29,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest UserModel userModel; SiteModel siteModel; - + @BeforeClass(alwaysRun=true) public void dataPreparation() throws Exception { @@ -47,7 +47,9 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(managerUser); - peopleApi.getPersonPreferenceInformation(managerUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); + peopleApi.getPersonPreferenceInformation(managerUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .assertThat().field("id").is( PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .and().field("value").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -59,7 +61,9 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser); - peopleApi.getPersonPreferenceInformation(collaboratorUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); + peopleApi.getPersonPreferenceInformation(collaboratorUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .and().field("value").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -71,7 +75,9 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(contributorUser); - peopleApi.getPersonPreferenceInformation(contributorUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); + peopleApi.getPersonPreferenceInformation(contributorUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .and().field("value").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -83,7 +89,9 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(consumerUser); - peopleApi.getPersonPreferenceInformation(consumerUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); + peopleApi.getPersonPreferenceInformation(consumerUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .and().field("value").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -94,7 +102,9 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(adminUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(adminUser); - peopleApi.getPersonPreferenceInformation(adminUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); + peopleApi.getPersonPreferenceInformation(adminUser, PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .and().field("value").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java index de9e40f66..0c37b0cda 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java @@ -2,6 +2,7 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; import org.alfresco.rest.requests.RestPeopleApi; +import org.alfresco.utility.constants.PreferenceName; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; @@ -46,7 +47,9 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(managerUser); - peopleApi.getPersonPreferences(managerUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonPreferences(managerUser).assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -58,7 +61,9 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser); - peopleApi.getPersonPreferences(collaboratorUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonPreferences(collaboratorUser).assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -70,7 +75,9 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(contributorUser); - peopleApi.getPersonPreferences(contributorUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonPreferences(contributorUser).assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -82,7 +89,9 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(consumerUser); - peopleApi.getPersonPreferences(consumerUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonPreferences(consumerUser).assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -95,7 +104,9 @@ public class GetPeoplePreferencesSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser); - peopleApi.getPersonPreferences(managerUser).assertThat().entriesListIsNotEmpty(); + peopleApi.getPersonPreferences(managerUser).assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java index 55bd6f49e..820eabf4c 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java @@ -23,6 +23,8 @@ public class GetPeopleSanityTests extends RestTest UserModel userModel; SiteModel siteModel; UserModel searchedUser; + + private String domain = "@tas-automation.org"; @BeforeClass(alwaysRun=true) public void dataPreparation() throws Exception @@ -41,7 +43,11 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); restClient.authenticateUser(managerUser); - peopleApi.getPerson(searchedUser).assertThat().field("id").is(searchedUser.getUsername());; + peopleApi.getPerson(searchedUser) + .assertThat().field("id").is(searchedUser.getUsername()) + .assertThat().field("firstName").is(searchedUser.getUsername()+" FirstName") + .and().field("email").is(searchedUser.getUsername()+ domain) + .and().field("emailNotificationsEnabled").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -52,7 +58,11 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); restClient.authenticateUser(collaboratorUser); - peopleApi.getPerson(searchedUser); + peopleApi.getPerson(searchedUser) + .assertThat().field("id").is(searchedUser.getUsername()) + .assertThat().field("firstName").is(searchedUser.getUsername()+" FirstName") + .and().field("email").is(searchedUser.getUsername()+ domain) + .and().field("emailNotificationsEnabled").is("true"); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -64,7 +74,11 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); restClient.authenticateUser(contributorUser); - peopleApi.getPerson(searchedUser); + peopleApi.getPerson(searchedUser) + .assertThat().field("id").is(searchedUser.getUsername()) + .assertThat().field("firstName").is(searchedUser.getUsername()+" FirstName") + .and().field("email").is(searchedUser.getUsername()+ domain) + .and().field("emailNotificationsEnabled").is("true");; peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -75,7 +89,11 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser); - peopleApi.getPerson(searchedUser); + peopleApi.getPerson(searchedUser) + .assertThat().field("id").is(searchedUser.getUsername()) + .assertThat().field("firstName").is(searchedUser.getUsername()+" FirstName") + .and().field("email").is(searchedUser.getUsername()+ domain) + .and().field("emailNotificationsEnabled").is("true");; peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -85,7 +103,11 @@ public class GetPeopleSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser); - peopleApi.getPerson(searchedUser); + peopleApi.getPerson(searchedUser) + .assertThat().field("id").is(searchedUser.getUsername()) + .assertThat().field("firstName").is(searchedUser.getUsername()+" FirstName") + .and().field("email").is(searchedUser.getUsername()+ domain) + .and().field("emailNotificationsEnabled").is("true");; peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java index cc3f520bc..b1f3eaad6 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java @@ -53,7 +53,10 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteManagerCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - peopleApi.getSiteMembership(adminUser, siteModel); + peopleApi.getSiteMembership(adminUser, siteModel) + .assertThat().field("role").is(UserRole.SiteManager) + .and().field("id").is(siteModel.getId()) + .and().field("site").isNotEmpty(); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -63,7 +66,9 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteCollaboratorCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - peopleApi.getSiteMembership(adminUser, siteModel); + peopleApi.getSiteMembership(adminUser, siteModel).onSite() + .assertThat().field("role").is(UserRole.SiteCollaborator) + .and().field("id").is(siteModel.getId()); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -73,7 +78,10 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteContributorCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - peopleApi.getSiteMembership(adminUser, siteModel); + peopleApi.getSiteMembership(adminUser, siteModel) + .assertThat().field("role").is(UserRole.SiteManager) + .and().field("id").is(siteModel.getId()) + .and().field("site").isNotEmpty(); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -83,7 +91,10 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteConsumerCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - peopleApi.getSiteMembership(adminUser, siteModel); + peopleApi.getSiteMembership(adminUser, siteModel) + .assertThat().field("role").is(UserRole.SiteManager) + .and().field("id").is(siteModel.getId()) + .and().field("site").isNotEmpty(); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -93,7 +104,10 @@ public class GetSiteMembershipSanityTests extends RestTest public void adminCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser); - peopleApi.getSiteMembership(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel); + peopleApi.getSiteMembership(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel) + .assertThat().field("role").is(UserRole.SiteManager) + .and().field("id").is(siteModel.getId()) + .and().field("site").isNotEmpty(); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java index 408d6fe0e..8250b2162 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java @@ -43,7 +43,10 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteManagerIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - peopleApi.getSitesMembershipInformation(adminUser); + peopleApi.getSitesMembershipInformation(adminUser) + .assertThat().entriesListIsNotEmpty() + .and().paginationExist() + .and().paginationField("count").isNot("0"); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -54,7 +57,10 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteCollaboratorIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - peopleApi.getSitesMembershipInformation(adminUser); + peopleApi.getSitesMembershipInformation(adminUser) + .assertThat().entriesListIsNotEmpty() + .and().paginationExist() + .and().paginationField("count").isNot("0"); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -65,7 +71,10 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteContributorIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - peopleApi.getSitesMembershipInformation(adminUser); + peopleApi.getSitesMembershipInformation(adminUser) + .assertThat().entriesListIsNotEmpty() + .and().paginationExist() + .and().paginationField("count").isNot("0"); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -76,7 +85,10 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteConsumerIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - peopleApi.getSitesMembershipInformation(adminUser); + peopleApi.getSitesMembershipInformation(adminUser) + .assertThat().entriesListIsNotEmpty() + .and().paginationExist() + .and().paginationField("count").isNot("0"); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -87,7 +99,10 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteAdminIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser); - peopleApi.getSitesMembershipInformation(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); + peopleApi.getSitesMembershipInformation(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) + .assertThat().entriesListIsNotEmpty() + .and().paginationExist() + .and().paginationField("count").isNot("0"); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java index a76eee04b..3de639b01 100644 --- a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java @@ -9,6 +9,7 @@ import org.alfresco.utility.data.DataUser; import org.alfresco.utility.data.DataUser.ListUserWithRoles; import org.alfresco.utility.data.RandomData; import org.alfresco.utility.exception.DataPreparationException; +import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; @@ -47,10 +48,8 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel,UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); - peopleApi.useRestClient(restClient); - + peopleApi.useRestClient(restClient); updatedMessage = "Please review my request"; - } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -63,7 +62,9 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.addSiteMembershipRequest(newMember, siteModel); peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage) - .assertMembershipRequestMessageIs(updatedMessage); + .assertMembershipRequestMessageIs(updatedMessage) + .and().field("id").is(siteModel.getId()) + .and().field("modifiedAt").isNotEmpty(); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -82,7 +83,8 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage); peopleApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.FORBIDDEN); + .assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -99,7 +101,8 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage); peopleApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.FORBIDDEN); + .assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -116,7 +119,8 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage); peopleApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.FORBIDDEN); + .assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -133,7 +137,8 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage); peopleApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.FORBIDDEN); + .assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -151,7 +156,8 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage); peopleApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.FORBIDDEN); + .assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -168,6 +174,7 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest peopleApi.updateSiteMembershipRequest(newMember, siteModel, updatedMessage); peopleApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.FORBIDDEN); + .assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java b/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java index 02b4951a5..e8fa4a1dd 100644 --- a/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java @@ -58,7 +58,10 @@ public class AddRatingSanityTests extends RestTest public void managerIsAbleToLikeDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - ratingsApi.likeDocument(document); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -67,7 +70,10 @@ public class AddRatingSanityTests extends RestTest public void collaboratorIsAbleToLikeDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - ratingsApi.likeDocument(document); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -76,7 +82,10 @@ public class AddRatingSanityTests extends RestTest public void contributorIsAbleToLikeDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - ratingsApi.likeDocument(document); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -85,7 +94,10 @@ public class AddRatingSanityTests extends RestTest public void consumerIsAbleToLikeDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - ratingsApi.likeDocument(document); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -94,7 +106,10 @@ public class AddRatingSanityTests extends RestTest public void adminIsAbleToLikeDocument() throws Exception { restClient.authenticateUser(adminUser); - ratingsApi.likeDocument(document); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -113,7 +128,10 @@ public class AddRatingSanityTests extends RestTest public void managerIsAbleToAddStarsToDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -122,7 +140,10 @@ public class AddRatingSanityTests extends RestTest public void collaboratorIsAbleToAddStarsToDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty();; ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -131,7 +152,10 @@ public class AddRatingSanityTests extends RestTest public void contributorIsAbleToAddStarsToDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty();; ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -140,7 +164,10 @@ public class AddRatingSanityTests extends RestTest public void consumerIsAbleToAddStarsToDocument() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty();; ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -148,8 +175,12 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify admin user is able to post stars rating to a document") public void adminIsAbleToAddStarsToDocument() throws Exception { + int starsNo=3; restClient.authenticateUser(adminUser); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.rateStarsToDocument(document, starsNo) + .assertThat().field("myRating").is(String.valueOf(starsNo)) + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty();; ratingsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } diff --git a/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java b/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java index e2bf71b46..1f2ce7351 100644 --- a/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java @@ -57,8 +57,14 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - ratingsApi.likeDocument(document); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); ratingsApi.deleteLikeRating(document); ratingsApi.usingRestWrapper() @@ -70,7 +76,9 @@ public class DeleteRatingSanityTests extends RestTest ratingsApi.getRatings(document) .assertNodeIsNotLiked() - .assertNodeHasNoFiveStarRating(); + .assertNodeHasNoFiveStarRating() + .and().entriesListIsNotEmpty() + .and().paginationExist(); } @TestRail(section = {TestGroup.REST_API, TestGroup.RATINGS }, executionType = ExecutionType.SANITY, @@ -79,8 +87,14 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - ratingsApi.likeDocument(document); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); ratingsApi.deleteLikeRating(document); ratingsApi.usingRestWrapper() @@ -92,7 +106,9 @@ public class DeleteRatingSanityTests extends RestTest ratingsApi.getRatings(document) .assertNodeIsNotLiked() - .assertNodeHasNoFiveStarRating(); + .assertNodeHasNoFiveStarRating() + .and().entriesListIsNotEmpty() + .and().paginationExist(); } @TestRail(section = {TestGroup.REST_API, TestGroup.RATINGS }, executionType = ExecutionType.SANITY, @@ -101,8 +117,14 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - ratingsApi.likeDocument(document); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); ratingsApi.deleteLikeRating(document); ratingsApi.usingRestWrapper() @@ -114,7 +136,9 @@ public class DeleteRatingSanityTests extends RestTest ratingsApi.getRatings(document) .assertNodeIsNotLiked() - .assertNodeHasNoFiveStarRating(); + .assertNodeHasNoFiveStarRating() + .and().entriesListIsNotEmpty() + .and().paginationExist(); } @TestRail(section = {TestGroup.REST_API, TestGroup.RATINGS }, executionType = ExecutionType.SANITY, @@ -123,8 +147,14 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - ratingsApi.likeDocument(document); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); ratingsApi.deleteLikeRating(document); ratingsApi.usingRestWrapper() @@ -136,17 +166,27 @@ public class DeleteRatingSanityTests extends RestTest ratingsApi.getRatings(document) .assertNodeIsNotLiked() - .assertNodeHasNoFiveStarRating(); + .assertNodeHasNoFiveStarRating() + .and().entriesListIsNotEmpty() + .and().paginationExist(); } @TestRail(section = {TestGroup.REST_API, TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify admin user is able to remove its own rating of a document") public void adminIsAbleToDeleteItsOwnRatings() throws Exception { + document = dataContent.usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)).usingResource(folderModel).createContent(DocumentType.TEXT_PLAIN); + restClient.authenticateUser(adminUser); - ratingsApi.likeDocument(document); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); ratingsApi.deleteLikeRating(document); ratingsApi.usingRestWrapper() @@ -158,17 +198,26 @@ public class DeleteRatingSanityTests extends RestTest ratingsApi.getRatings(document) .assertNodeIsNotLiked() - .assertNodeHasNoFiveStarRating(); + .assertNodeHasNoFiveStarRating() + .and().entriesListIsNotEmpty() + .and().paginationExist(); } @TestRail(section = {TestGroup.REST_API, TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify unauthenticated user is not able to remove its own rating of a document") public void unauthenticatedUserIsNotAbleToDeleteRatings() throws Exception { + document = dataContent.usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)).usingResource(folderModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(adminUser); - ratingsApi.likeDocument(document); - ratingsApi.rateStarsToDocument(document, 5); + ratingsApi.likeDocument(document) + .assertThat().field("myRating").is("true") + .and().field("id").is("likes") + .and().field("aggregate").isNotEmpty(); + ratingsApi.rateStarsToDocument(document, 5) + .assertThat().field("myRating").is("5") + .and().field("id").is("fiveStar") + .and().field("aggregate").isNotEmpty(); restClient.authenticateUser(new UserModel("random user", "random password")); diff --git a/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java b/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java index 7486a1e78..b326d56b4 100644 --- a/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java @@ -67,8 +67,8 @@ public class GetRatingSanityTests extends RestTest .assertStatusCodeIs(HttpStatus.OK); ratingsApi.getFiveStarRating(document) - .assertThat().field("id").is("fiveStar") - .and().field("myRating").is("5"); + .assertThat().field("id").is("fiveStar") + .and().field("myRating").is("5"); ratingsApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.OK); } @@ -86,7 +86,7 @@ public class GetRatingSanityTests extends RestTest .assertThat().field("id").is("likes") .and().field("myRating").is("true"); ratingsApi.usingRestWrapper() - .assertStatusCodeIs(HttpStatus.OK); + .assertStatusCodeIs(HttpStatus.OK); ratingsApi.getFiveStarRating(document) .assertThat().field("id").is("fiveStar") diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java index 71182c06d..f2587f798 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java @@ -52,7 +52,10 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.getSiteContainers(siteModel).assertThat().entriesListIsNotEmpty(); + siteAPI.getSiteContainers(siteModel) + .assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().paginationField("count").isNot("0"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -61,7 +64,10 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteAPI.getSiteContainers(siteModel).assertThat().entriesListIsNotEmpty(); + siteAPI.getSiteContainers(siteModel) + .assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().paginationField("count").isNot("0"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -70,7 +76,10 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteAPI.getSiteContainers(siteModel).assertThat().entriesListIsNotEmpty(); + siteAPI.getSiteContainers(siteModel) + .assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().paginationField("count").isNot("0"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -79,7 +88,10 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteAPI.getSiteContainers(siteModel).assertThat().entriesListIsNotEmpty(); + siteAPI.getSiteContainers(siteModel) + .assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().paginationField("count").isNot("0"); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -88,7 +100,10 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - siteAPI.getSiteContainers(siteModel).assertThat().entriesListIsNotEmpty(); + siteAPI.getSiteContainers(siteModel) + .assertThat().entriesListIsNotEmpty() + .assertThat().paginationExist() + .and().paginationField("count").isNot("0"); 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 e5256ff0f..4261aaa91 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java @@ -53,7 +53,10 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteAPI.getAllSites().assertThat().entriesListIsNotEmpty(); + siteAPI.getAllSites() + .assertThat().entriesListIsNotEmpty() + .assertThat().entriesListContains("id", siteModel.getId()) + .and().paginationExist(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -63,7 +66,9 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteAPI.getAllSites().assertThat().entriesListIsNotEmpty(); + siteAPI.getAllSites().assertThat().entriesListIsNotEmpty() + .assertThat().entriesListContains("id", siteModel.getId()) + .and().paginationExist(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -73,7 +78,10 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteAPI.getAllSites().assertThat().entriesListIsNotEmpty(); + siteAPI.getAllSites() + .assertThat().entriesListIsNotEmpty() + .assertThat().entriesListContains("id", siteModel.getId()) + .and().paginationExist(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -83,7 +91,10 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteAPI.getAllSites().assertThat().entriesListIsNotEmpty(); + siteAPI.getAllSites() + .assertThat().entriesListIsNotEmpty() + .assertThat().entriesListContains("id", siteModel.getId()) + .and().paginationExist(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -92,7 +103,10 @@ public class GetSitesSanityTests extends RestTest public void adminUserIsAbleToRetrieveSites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - siteAPI.getAllSites().assertThat().entriesListIsNotEmpty(); + siteAPI.getAllSites() + .assertThat().entriesListIsNotEmpty() + .assertThat().entriesListContains("id", siteModel.getId()) + .and().paginationExist(); siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java index c937517f0..e59a07302 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java @@ -4,6 +4,7 @@ import org.alfresco.rest.RestWorkflowTest; import org.alfresco.rest.exception.JsonToModelConversionException; import org.alfresco.rest.model.RestDeploymentModel; import org.alfresco.rest.requests.RestDeploymentsApi; +import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; import org.alfresco.utility.testrail.ExecutionType; @@ -45,7 +46,10 @@ public class GetDeploymentSanityTests extends RestWorkflowTest public void adminGetsNonNetworkDeploymentWithSuccess() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser); - deploymentsApi.getDeployment(deployment); + deploymentsApi.getDeployment(deployment) + .assertThat().field("deployedAt").isNotEmpty() + .and().field("name").is(deployment.getName()) + .and().field("id").equals(deployment.getId()); deploymentsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -55,6 +59,7 @@ public class GetDeploymentSanityTests extends RestWorkflowTest { restClient.authenticateUser(anotherUser); deploymentsApi.getDeployment(deployment); - deploymentsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + deploymentsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } }