diff --git a/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java index e1ea52724..12ade18c3 100644 --- a/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java @@ -112,7 +112,7 @@ public class AddCommentsSanityTests extends RestTest commentsAPI.addComments(document, comment1, comment2); commentsAPI.usingRestWrapper() .assertStatusCodeIs(HttpStatus.FORBIDDEN) - .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED);; + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, diff --git a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java index a1e5b8ccf..4b8a64cd4 100644 --- a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java @@ -137,11 +137,12 @@ public class UpdateCommentsSanityTests extends RestTest restClient.authenticateUser(adminUserModel); RestCommentModel comment = new RestCommentModel(); - comment.setId("comment id that does not exist"); + String id = "comment id that does not exist"; + comment.setId(id); commentsAPI.updateComment(document, comment, "This is the updated comment."); commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) - .assertLastError().containsSummary("node ref that does not exist was not found"); + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, id)); } } diff --git a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java index 4393d918f..66c393a1a 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java @@ -40,12 +40,13 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); restClient.authenticateUser(managerUser); - peopleApi.addFavoriteSite(managerUser, siteModel); + peopleApi.addFavoriteSite(managerUser, siteModel) + .assertThat().field("id").is(siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); peopleApi.addFavoriteSite(managerUser, siteModel); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CONFLICT); - peopleApi.usingRestWrapper().assertLastError().containsSummary("is already a favourite site"); + peopleApi.usingRestWrapper().assertLastError().containsSummary(String.format("%s is already a favourite site", siteModel.getId())); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify collaborator user add a favorite site with Rest API and response is successful (201)") @@ -55,7 +56,8 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); restClient.authenticateUser(collaboratorUser); - peopleApi.addFavoriteSite(collaboratorUser, siteModel); + peopleApi.addFavoriteSite(collaboratorUser, siteModel) + .assertThat().field("id").is(siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -66,7 +68,8 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); restClient.authenticateUser(contributorUser); - peopleApi.addFavoriteSite(contributorUser, siteModel); + peopleApi.addFavoriteSite(contributorUser, siteModel) + .assertThat().field("id").is(siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -77,7 +80,8 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser); - peopleApi.addFavoriteSite(consumerUser, siteModel); + peopleApi.addFavoriteSite(consumerUser, siteModel) + .assertThat().field("id").is(siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -87,7 +91,8 @@ public class AddFavoriteSiteSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser); - peopleApi.addFavoriteSite(adminUser, siteModel); + peopleApi.addFavoriteSite(adminUser, siteModel) + .assertThat().field("id").is(siteModel.getId()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } diff --git a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java index fedfa10d7..47188c0fc 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java @@ -54,7 +54,9 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - peopleApi.addSiteMembershipRequest(newMember, siteModel); + peopleApi.addSiteMembershipRequest(newMember, siteModel) + .assertThat().field("id").isNotEmpty() + .assertThat().field("title").is(siteModel.getTitle()); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.CREATED); } @@ -66,7 +68,9 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - peopleApi.addSiteMembershipRequest(newMember, siteModel); + peopleApi.addSiteMembershipRequest(newMember, siteModel) + .assertThat().field("id").isNotEmpty() + .assertThat().field("title").is(siteModel.getTitle()); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.CREATED); } @@ -78,7 +82,9 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - peopleApi.addSiteMembershipRequest(newMember, siteModel); + peopleApi.addSiteMembershipRequest(newMember, siteModel) + .assertThat().field("id").isNotEmpty() + .assertThat().field("title").is(siteModel.getTitle()); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.CREATED); } @@ -90,7 +96,9 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - peopleApi.addSiteMembershipRequest(newMember, siteModel); + peopleApi.addSiteMembershipRequest(newMember, siteModel) + .assertThat().field("id").isNotEmpty() + .assertThat().field("title").is(siteModel.getTitle()); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.CREATED); } @@ -102,7 +110,9 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(adminUser); - peopleApi.addSiteMembershipRequest(newMember, siteModel); + peopleApi.addSiteMembershipRequest(newMember, siteModel) + .assertThat().field("id").isNotEmpty() + .assertThat().field("title").is(siteModel.getTitle()); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); } @@ -113,7 +123,9 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(new UserModel("random user", "random password")); - peopleApi.addSiteMembershipRequest(newMember, siteModel); + peopleApi.addSiteMembershipRequest(newMember, siteModel) + .assertThat().field("id").isNotEmpty() + .assertThat().field("title").is(siteModel.getTitle()); peopleApi.usingRestWrapper() .assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java index 413e695e5..97727c320 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.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; @@ -112,7 +113,8 @@ public class DeleteFavoriteSiteSanityTests extends RestTest restClient.authenticateUser(userAuth); peopleApi.removeFavoriteSite(anotherUser, siteModel1); - 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 manager user is NOT Authorized to remove a site from its favorite sites list with Rest API when authentication fails (401)") diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java index fc9ee1176..db4f020cd 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java @@ -9,6 +9,7 @@ import org.alfresco.utility.data.DataSite; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.data.DataUser.ListUserWithRoles; 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; @@ -95,7 +96,8 @@ public class DeleteSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); peopleApi.deleteSiteMember(newUser, siteModel); - sitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + sitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -111,7 +113,8 @@ public class DeleteSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); peopleApi.deleteSiteMember(newUser, siteModel); - sitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + sitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, @@ -127,7 +130,8 @@ public class DeleteSiteMemberSanityTests extends RestTest restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); peopleApi.deleteSiteMember(newUser, siteModel); - sitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + sitesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java index ebe6dcb31..3a4c5da9b 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java @@ -7,6 +7,7 @@ import org.alfresco.utility.constants.UserRole; 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; @@ -94,7 +95,8 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest peopleApi.addSiteMembershipRequest(siteMember, siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); peopleApi.deleteSiteMembershipRequest(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @Bug(id="MNT-16916") @@ -107,7 +109,8 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest peopleApi.addSiteMembershipRequest(siteMember, siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); peopleApi.deleteSiteMembershipRequest(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @Bug(id="MNT-16916") @@ -120,7 +123,8 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest peopleApi.addSiteMembershipRequest(siteMember, siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); peopleApi.deleteSiteMembershipRequest(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @Bug(id="MNT-16916") @@ -134,7 +138,8 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest UserModel randomUser = dataUser.createRandomTestUser(); restClient.authenticateUser(randomUser); peopleApi.deleteSiteMembershipRequest(randomUser, siteModel); - peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.SITES }, executionType = ExecutionType.SANITY,