From 57fdf54f532c25d0fb65cc92d776b6c7bcfd86bb Mon Sep 17 00:00:00 2001 From: mionescu Date: Wed, 11 Jan 2017 15:46:56 +0200 Subject: [PATCH 1/2] test- added new test cases for Core --- .../rest/people/AddFavoriteSiteCoreTests.java | 224 ++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java diff --git a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java new file mode 100644 index 000000000..a8d690d00 --- /dev/null +++ b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java @@ -0,0 +1,224 @@ +package org.alfresco.rest.people; + +import org.alfresco.rest.RestTest; +import org.alfresco.rest.exception.JsonToModelConversionException; +import org.alfresco.rest.model.RestErrorModel; +import org.alfresco.rest.model.RestPersonFavoritesModelsCollection; +import org.alfresco.utility.constants.UserRole; +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; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +public class AddFavoriteSiteCoreTests extends RestTest +{ + UserModel userModel, adminUserModel; + SiteModel siteModel, privateSiteModel, moderatedSiteModel; + UserModel searchedUser; + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception + { + adminUserModel = dataUser.getAdminUser(); + userModel = dataUser.createRandomTestUser(); + siteModel = dataSite.usingUser(userModel).createPublicRandomSite(); + privateSiteModel = dataSite.usingUser(userModel).createPrivateRandomSite(); + moderatedSiteModel = dataSite.usingUser(userModel).createModeratedRandomSite(); + } + + @Bug(id="ACE-2413") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify empty user is not able to add a site from favorites and response is (400)") + public void emptyUserIsNotAbleToRemoveFavoriteSite() throws Exception + { + UserModel emptyUser = new UserModel("", "password"); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(emptyUser).addSiteToFavorites(siteModel); + + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) + .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "emptyUser")); + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify inexistent user is not able to add a site from favorites and response is (404)") + public void inexistentUserIsNotAbleToRemoveFavoriteSite() throws Exception + { + UserModel inexistentUser = new UserModel("inexistenUser", "password"); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(inexistentUser).addSiteToFavorites(siteModel); + + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError() + .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "inexistenUser")) + .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) + .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) + .stackTraceIs(RestErrorModel.STACKTRACE); + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify manager user is not able to add a favorite site when the site is already favorite - status code (409)") + public void managerUserAddFavoriteSiteAlreadyAFavoriteSite() throws Exception + { + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); + siteModel = dataSite.usingUser(userModel).createPublicRandomSite(); + dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); + + restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + + restClient.withCoreAPI().usingUser(managerUser).addFavoriteSite(siteModel); + restClient.assertStatusCodeIs(HttpStatus.CONFLICT); + restClient.assertLastError() + .containsSummary(String.format("%s is already a favourite site", siteModel.getId())) + .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) + .stackTraceIs(RestErrorModel.STACKTRACE) + .containsErrorKey(String.format("Site %s is already a favourite site", siteModel.getId())); + } + + @Bug(id="MNT-17337") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify user is not able to add a favorite site when the 'id' is empty - status code (400)") + public void collaboratorUserAddFavoriteSiteAFavoriteSite() throws Exception + { + siteModel.setId(""); + restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().addFavoriteSite(siteModel); + + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST); + restClient.assertLastError() + .containsSummary("siteId is null") + .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) + .stackTraceIs(RestErrorModel.STACKTRACE) + .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY); + } + + @Bug(id="MNT-17338") + @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify user doesn't have permission to delete favorites of admin user with Rest API and status code is 403") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void userIsNotAbleToAddFavoriteSiteOfAnotherUser() throws JsonToModelConversionException, Exception + { + UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); + UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); + + restClient.authenticateUser(consumerUser).withCoreAPI() + .usingUser(contributorUser).addSiteToFavorites(siteModel); + restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError() + .containsSummary(RestErrorModel.PERMISSION_WAS_DENIED); + } + + @Bug(id="MNT-17338") + @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify admin user doesn't have permission to add a favorite site of another user with Rest API and status code is 403") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void adminIsNotAbleToAddFavoriteSiteOfAnotherUser() throws JsonToModelConversionException, Exception + { + UserModel collaboratorrUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(collaboratorrUser, siteModel, UserRole.SiteCollaborator); + restClient.authenticateUser(collaboratorrUser) + .withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(siteModel); + + restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) + .assertLastError() + .containsSummary(RestErrorModel.PERMISSION_WAS_DENIED); + } + + @Bug(id="MNT-17339") + @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify non member user is not able to add a public favorite site - status code is 404") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void privateSiteAddFavoriteSiteUserNotMemberOfTheSite() throws JsonToModelConversionException, Exception + { + UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); + restClient.authenticateUser(contributorUser).withCoreAPI() + .usingAuthUser().addSiteToFavorites(privateSiteModel); + + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError() + .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, privateSiteModel.getId())) + .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) + .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) + .stackTraceIs(RestErrorModel.STACKTRACE); + } + + @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify manager user is able to add as favorite a private site.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void managerAddsPrivateSiteAsFavorite() throws JsonToModelConversionException, Exception + { + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(managerUser, privateSiteModel, UserRole.SiteManager); + + restClient.authenticateUser(managerUser).withCoreAPI().usingUser(managerUser).addSiteToFavorites(privateSiteModel); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + + RestPersonFavoritesModelsCollection favorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); + favorites.assertThat().entriesListContains("targetGuid", privateSiteModel.getGuidWithoutVersion()) + .and().paginationField("totalItems").is("1"); + favorites.getOneRandomEntry().onModel().getTarget().getSite() + .assertThat() + .field("description").is(privateSiteModel.getDescription()) + .and().field("id").is(privateSiteModel.getId()) + .and().field("visibility").is(privateSiteModel.getVisibility().toString()) + .and().field("title").is(privateSiteModel.getTitle()); + } + + @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify manager user is able to add as favorite a moderated site.") + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + public void managerAddsModeratedSiteAsFavorite() throws JsonToModelConversionException, Exception + { + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(managerUser, moderatedSiteModel, UserRole.SiteManager); + + restClient.authenticateUser(managerUser).withCoreAPI().usingUser(managerUser).addSiteToFavorites(moderatedSiteModel); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + + RestPersonFavoritesModelsCollection favorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); + favorites.assertThat().entriesListContains("targetGuid", moderatedSiteModel.getGuidWithoutVersion()) + .and().paginationField("totalItems").is("1"); + favorites.getOneRandomEntry().onModel().getTarget().getSite() + .assertThat() + .field("description").is(moderatedSiteModel.getDescription()) + .and().field("id").is(moderatedSiteModel.getId()) + .and().field("visibility").is(moderatedSiteModel.getVisibility().toString()) + .and().field("title").is(moderatedSiteModel.getTitle()); + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify user removes a site from favorites using '-me-' in place of personId with Rest API and response is successful (201)") + public void addFavoriteSiteWithSuccessUsingMeAsPersonId() throws Exception + { + restClient.authenticateUser(adminUserModel); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingMe().addSiteToFavorites(moderatedSiteModel); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, + description = "Verify manager user removes a site from its favorites and adds it again and response is successful (204)") + public void managerUserRemovesFavoriteSiteAndAddItAgain() throws Exception + { + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); + dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); + + restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().removeFavoriteSite(siteModel); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); + + restClient.withCoreAPI().usingUser(managerUser).addSiteToFavorites(siteModel); + restClient.assertStatusCodeIs(HttpStatus.CREATED); + } + + +} From 2655157ae67247f6861144cd2f625dae7407b2e9 Mon Sep 17 00:00:00 2001 From: mionescu Date: Thu, 12 Jan 2017 17:41:48 +0200 Subject: [PATCH 2/2] test - added new test cases for addFavoriteSiteTests --- .../rest/people/AddFavoriteSiteCoreTests.java | 63 +++++-------------- .../people/AddFavoriteSiteSanityTests.java | 19 ++++-- 2 files changed, 27 insertions(+), 55 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java index a8d690d00..1f79a14f7 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteCoreTests.java @@ -38,7 +38,7 @@ public class AddFavoriteSiteCoreTests extends RestTest public void emptyUserIsNotAbleToRemoveFavoriteSite() throws Exception { UserModel emptyUser = new UserModel("", "password"); - restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(emptyUser).addSiteToFavorites(siteModel); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(emptyUser).addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "emptyUser")); @@ -49,12 +49,12 @@ public class AddFavoriteSiteCoreTests extends RestTest description = "Verify inexistent user is not able to add a site from favorites and response is (404)") public void inexistentUserIsNotAbleToRemoveFavoriteSite() throws Exception { - UserModel inexistentUser = new UserModel("inexistenUser", "password"); - restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(inexistentUser).addSiteToFavorites(siteModel); + UserModel inexistentUser = new UserModel("inexistentUser", "password"); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(inexistentUser).addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError() - .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "inexistenUser")) + .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "inexistentUser")) .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) .stackTraceIs(RestErrorModel.STACKTRACE); @@ -65,11 +65,11 @@ public class AddFavoriteSiteCoreTests extends RestTest description = "Verify manager user is not able to add a favorite site when the site is already favorite - status code (409)") public void managerUserAddFavoriteSiteAlreadyAFavoriteSite() throws Exception { - UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); siteModel = dataSite.usingUser(userModel).createPublicRandomSite(); + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); - restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); + restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); restClient.withCoreAPI().usingUser(managerUser).addFavoriteSite(siteModel); @@ -85,7 +85,7 @@ public class AddFavoriteSiteCoreTests extends RestTest @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify user is not able to add a favorite site when the 'id' is empty - status code (400)") - public void collaboratorUserAddFavoriteSiteAFavoriteSite() throws Exception + public void userAddFavoriteSiteAFavoriteSite() throws Exception { siteModel.setId(""); restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().addFavoriteSite(siteModel); @@ -98,58 +98,24 @@ public class AddFavoriteSiteCoreTests extends RestTest .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY); } - @Bug(id="MNT-17338") @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify user doesn't have permission to delete favorites of admin user with Rest API and status code is 403") @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) public void userIsNotAbleToAddFavoriteSiteOfAnotherUser() throws JsonToModelConversionException, Exception { + siteModel = dataSite.usingUser(userModel).createPublicRandomSite(); UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser).withCoreAPI() - .usingUser(contributorUser).addSiteToFavorites(siteModel); + .usingUser(contributorUser).addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError() .containsSummary(RestErrorModel.PERMISSION_WAS_DENIED); - } - - @Bug(id="MNT-17338") - @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, - description = "Verify admin user doesn't have permission to add a favorite site of another user with Rest API and status code is 403") - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) - public void adminIsNotAbleToAddFavoriteSiteOfAnotherUser() throws JsonToModelConversionException, Exception - { - UserModel collaboratorrUser = dataUser.usingAdmin().createRandomTestUser(); - dataUser.usingUser(userModel).addUserToSite(collaboratorrUser, siteModel, UserRole.SiteCollaborator); - restClient.authenticateUser(collaboratorrUser) - .withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(siteModel); - - restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) - .assertLastError() - .containsSummary(RestErrorModel.PERMISSION_WAS_DENIED); - } + } - @Bug(id="MNT-17339") - @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, - description = "Verify non member user is not able to add a public favorite site - status code is 404") - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) - public void privateSiteAddFavoriteSiteUserNotMemberOfTheSite() throws JsonToModelConversionException, Exception - { - UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); - restClient.authenticateUser(contributorUser).withCoreAPI() - .usingAuthUser().addSiteToFavorites(privateSiteModel); - - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) - .assertLastError() - .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, privateSiteModel.getId())) - .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) - .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) - .stackTraceIs(RestErrorModel.STACKTRACE); - } - @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify manager user is able to add as favorite a private site.") @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @@ -158,7 +124,7 @@ public class AddFavoriteSiteCoreTests extends RestTest UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(managerUser, privateSiteModel, UserRole.SiteManager); - restClient.authenticateUser(managerUser).withCoreAPI().usingUser(managerUser).addSiteToFavorites(privateSiteModel); + restClient.authenticateUser(managerUser).withCoreAPI().usingUser(managerUser).addFavoriteSite(privateSiteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); RestPersonFavoritesModelsCollection favorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); @@ -180,7 +146,7 @@ public class AddFavoriteSiteCoreTests extends RestTest UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(managerUser, moderatedSiteModel, UserRole.SiteManager); - restClient.authenticateUser(managerUser).withCoreAPI().usingUser(managerUser).addSiteToFavorites(moderatedSiteModel); + restClient.authenticateUser(managerUser).withCoreAPI().usingUser(managerUser).addFavoriteSite(moderatedSiteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); RestPersonFavoritesModelsCollection favorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); @@ -200,7 +166,7 @@ public class AddFavoriteSiteCoreTests extends RestTest public void addFavoriteSiteWithSuccessUsingMeAsPersonId() throws Exception { restClient.authenticateUser(adminUserModel); - restClient.authenticateUser(adminUserModel).withCoreAPI().usingMe().addSiteToFavorites(moderatedSiteModel); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingMe().addFavoriteSite(moderatedSiteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); } @@ -218,7 +184,6 @@ public class AddFavoriteSiteCoreTests extends RestTest restClient.withCoreAPI().usingUser(managerUser).addSiteToFavorites(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); - } - + } } diff --git a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java index 8bb41699c..89782bd07 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java @@ -1,6 +1,7 @@ package org.alfresco.rest.people; import org.alfresco.rest.RestTest; +import org.alfresco.rest.model.RestErrorModel; import org.alfresco.rest.model.RestFavoriteSiteModel; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.model.SiteModel; @@ -56,7 +57,8 @@ public class AddFavoriteSiteSanityTests extends RestTest } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify contributor user add a favorite site with Rest API and response is successful (201)") + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, + description = "Verify contributor user add a favorite site with Rest API and response is successful (201)") public void contributorUserAddFavoriteSiteWithSuccess() throws Exception { UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); @@ -68,7 +70,8 @@ public class AddFavoriteSiteSanityTests extends RestTest } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify consumer user add a favorite site with Rest API and response is successful (201)") + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, + description = "Verify consumer user add a favorite site with Rest API and response is successful (201)") public void consumerUserAddFavoriteSiteWithSuccess() throws Exception { UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser(); @@ -80,7 +83,8 @@ public class AddFavoriteSiteSanityTests extends RestTest } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify admin user add a favorite site with Rest API and response is successful (201)") + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, + description = "Verify admin user add a favorite site with Rest API and response is successful (201)") public void adminUserAddFavoriteSiteWithSuccess() throws Exception { UserModel adminUser = dataUser.getAdminUser(); @@ -91,8 +95,8 @@ public class AddFavoriteSiteSanityTests extends RestTest } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Verify a manager user is NOT Authorized to add a favorite site with Rest API when authentication fails (401)") - @Bug(id="MNT-16904") + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, + description = "Verify a manager user is NOT Authorized to add a favorite site with Rest API when authentication fails (401)") public void managerUserNotAuthorizedFailsToAddFavoriteSite() throws Exception { UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); @@ -100,6 +104,9 @@ public class AddFavoriteSiteSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().addFavoriteSite(siteModel); - restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastExceptionContains(HttpStatus.UNAUTHORIZED.toString()); + restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); + restClient.assertLastError() + .containsSummary(RestErrorModel.AUTHENTICATION_FAILED); + } }