From 8adebbae1b0132e43b8dab87aa41b5bea97f348a Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 20 Jan 2017 17:34:09 +0200 Subject: [PATCH] fixed tests not related to MNT-16904 --- .../rest/comments/GetCommentsCoreTests.java | 19 +++++++++++++------ .../rest/comments/UpdateCommentCoreTests.java | 12 +++++++----- .../rest/people/AddFavoriteSiteFullTests.java | 2 -- .../people/DeleteSiteMemberSanityTests.java | 6 +++--- .../GetPeopleActivitiesSanityTests.java | 7 ++++--- .../GetSiteMembershipRequestCoreTests.java | 5 +++-- .../UpdateSiteMembershipRequestCoreTests.java | 6 +++--- 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/comments/GetCommentsCoreTests.java b/e2e-test/java/org/alfresco/rest/comments/GetCommentsCoreTests.java index 0836c3045..1fd7a1f5c 100644 --- a/e2e-test/java/org/alfresco/rest/comments/GetCommentsCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/GetCommentsCoreTests.java @@ -4,8 +4,12 @@ import org.alfresco.dataprep.CMISUtil; import org.alfresco.rest.RestTest; import org.alfresco.rest.model.RestCommentModelsCollection; import org.alfresco.rest.model.RestErrorModel; -import org.alfresco.utility.model.*; -import org.alfresco.utility.report.Bug; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.alfresco.utility.model.LinkModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestGroup; +import org.alfresco.utility.model.UserModel; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; import org.springframework.http.HttpStatus; @@ -69,16 +73,19 @@ public class GetCommentsCoreTests extends RestTest @TestRail(section={TestGroup.REST_API, TestGroup.COMMENTS}, executionType= ExecutionType.REGRESSION, description= "Verify User can't get comments for node that exists but is not a document or a folder and status code is 400") @Test(groups = { TestGroup.REST_API, TestGroup.COMMENTS, TestGroup.CORE }) - @Bug(id = "MNT-16904") public void userCanNotGetCommentsOnLink() throws Exception { LinkModel link = dataLink.usingAdmin().usingSite(siteModel).createRandomLink(); FileModel fileWithNodeRefFromLink = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - fileWithNodeRefFromLink.setNodeRef(link.getNodeRef()); + fileWithNodeRefFromLink.setNodeRef(link.getNodeRef().replace("workspace://SpacesStore/", "workspace%3A%2F%2FSpacesStore%2F")); restClient.authenticateUser(adminUserModel).withCoreAPI() .usingResource(fileWithNodeRefFromLink).getNodeComments(); - restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) - .assertLastError().containsSummary(RestErrorModel.UNABLE_TO_LOCATE); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError() + .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, fileWithNodeRefFromLink.getNodeRef())) + .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) + .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) + .stackTraceIs(RestErrorModel.STACKTRACE); } @TestRail(section={TestGroup.REST_API, TestGroup.COMMENTS}, executionType= ExecutionType.REGRESSION, diff --git a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentCoreTests.java b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentCoreTests.java index b84e77039..32caa9b5e 100644 --- a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentCoreTests.java @@ -14,7 +14,6 @@ import org.alfresco.utility.model.LinkModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; import org.springframework.http.HttpStatus; @@ -42,7 +41,6 @@ public class UpdateCommentCoreTests extends RestTest } @TestRail(section = { TestGroup.REST_API, TestGroup.COMMENTS }, executionType = ExecutionType.REGRESSION, description = "Verify can not update comment if NodeId is neither document or folder and returns status code 405") - @Bug(id="MNT-16904") @Test(groups = { TestGroup.REST_API, TestGroup.COMMENTS, TestGroup.CORE }) public void canNotUpdateCommentIfNodeIdIsNeitherDocumentOrFolder() throws JsonToModelConversionException, Exception { @@ -53,11 +51,15 @@ public class UpdateCommentCoreTests extends RestTest commentModel = restClient.withCoreAPI().usingResource(content).addComment("This is a new comment"); LinkModel link = dataLink.usingAdmin().usingSite(siteModel).createRandomLink(); - content.setNodeRef(link.getNodeRef()); + content.setNodeRef(link.getNodeRef().replace("workspace://SpacesStore/", "workspace%3A%2F%2FSpacesStore%2F")); restClient.withCoreAPI().usingResource(content).updateComment(commentModel, "This is the updated comment."); - restClient.assertStatusCodeIs(HttpStatus.METHOD_NOT_ALLOWED) - .assertLastError().containsSummary("node ref that does not exist was not found"); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError() + .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, content.getNodeRef())) + .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) + .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) + .stackTraceIs(RestErrorModel.STACKTRACE); } @TestRail(section = { TestGroup.REST_API, TestGroup.COMMENTS }, executionType = ExecutionType.REGRESSION, description = "Verify Admin user is not able to update with empty comment body and status code is 400") diff --git a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteFullTests.java b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteFullTests.java index c8df80f33..19510d56a 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteFullTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteFullTests.java @@ -2,9 +2,7 @@ package org.alfresco.rest.people; import org.alfresco.dataprep.CMISUtil.DocumentType; import org.alfresco.rest.RestTest; -import org.alfresco.rest.core.JsonBodyGenerator; import org.alfresco.rest.core.RestRequest; -import org.alfresco.rest.exception.EmptyJsonResponseException; import org.alfresco.rest.exception.JsonToModelConversionException; import org.alfresco.rest.model.RestCommentModel; import org.alfresco.rest.model.RestErrorModel; diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java index ec9e8d6b7..3c15d11d0 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java @@ -9,7 +9,6 @@ import org.alfresco.utility.exception.DataPreparationException; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; import org.springframework.http.HttpStatus; @@ -100,12 +99,13 @@ public class DeleteSiteMemberSanityTests extends RestTest @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify unauthenticated user is not able to delete another member of the site") - @Bug(id = "MNT-16904") public void unauthenticatedUserIsNotAbleToDeleteSiteMember() throws JsonToModelConversionException, DataPreparationException, Exception { restClient.authenticateUser(new UserModel("random user", "random password")); restClient.withCoreAPI().usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).deleteSiteMember(siteModel); - restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastExceptionContains(HttpStatus.UNAUTHORIZED.toString()); + restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED) + .assertLastError().containsErrorKey(RestErrorModel.API_DEFAULT_ERRORKEY) + .containsSummary(RestErrorModel.AUTHENTICATION_FAILED);; } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java index f0b91dce5..618d7457c 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java @@ -3,12 +3,12 @@ package org.alfresco.rest.people; import org.alfresco.dataprep.CMISUtil.DocumentType; import org.alfresco.rest.RestTest; import org.alfresco.rest.model.RestActivityModelsCollection; +import org.alfresco.rest.model.RestErrorModel; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; import org.springframework.http.HttpStatus; @@ -101,10 +101,11 @@ public class GetPeopleActivitiesSanityTests extends RestTest @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.ACTIVITIES, TestGroup.SANITY }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.ACTIVITIES }, executionType = ExecutionType.SANITY, description = "Verify unauthenticated user is NOT Authorized to gets another user activities with Rest API") - @Bug(id = "MNT-16904") public void unauthenticatedUserShouldNotGetPeopleActivitiesList() throws Exception { restClient.authenticateUser(unauthenticatedUser).withCoreAPI().usingUser(userModel).getPersonActivities(); - restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastExceptionContains(HttpStatus.UNAUTHORIZED.toString()); + restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED) + .assertLastError().containsErrorKey(RestErrorModel.API_DEFAULT_ERRORKEY) + .containsSummary(RestErrorModel.AUTHENTICATION_FAILED); } } diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestCoreTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestCoreTests.java index 1698d7bab..d7873b296 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestCoreTests.java @@ -38,14 +38,15 @@ public class GetSiteMembershipRequestCoreTests extends RestTest @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify contributor user fails to get all site membership requests of a specific person with Rest API when the authentication fails (401)") - @Bug(id = "MNT-16904") public void unauthorizedContributorUserFailsToGetSiteMembershipRequests() throws Exception { UserModel contributor = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(contributor, siteModel, UserRole.SiteContributor); contributor.setPassword("newpassword"); restClient.authenticateUser(contributor).withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); - restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastExceptionContains(HttpStatus.UNAUTHORIZED.toString()); + restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED) + .assertLastError().containsErrorKey(RestErrorModel.API_DEFAULT_ERRORKEY) + .containsSummary(RestErrorModel.AUTHENTICATION_FAILED); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) diff --git a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestCoreTests.java b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestCoreTests.java index 2efde507d..71c40c86c 100644 --- a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestCoreTests.java @@ -7,7 +7,6 @@ import org.alfresco.utility.exception.DataPreparationException; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; import org.springframework.http.HttpStatus; @@ -32,14 +31,15 @@ public class UpdateSiteMembershipRequestCoreTests extends RestTest @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify unauthorized user is not able to update user site membership request") - @Bug(id="MNT-16904") public void unauthorizedUserIsNotAbleToUpdateSiteMembershipRequest() throws Exception { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember).withCoreAPI().usingAuthUser().addSiteMembershipRequest(siteModel); newMember.setPassword("fakePass"); restClient.withCoreAPI().usingUser(newMember).updateSiteMembershipRequest(siteModel, updatedMessage); - restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastExceptionContains(HttpStatus.UNAUTHORIZED.toString()); + restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED) + .assertLastError().containsErrorKey(RestErrorModel.API_DEFAULT_ERRORKEY) + .containsSummary(RestErrorModel.AUTHENTICATION_FAILED); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE })