From 9e15927e8541c64da07ae855cc81eef0cb27c4bf Mon Sep 17 00:00:00 2001 From: cagache Date: Tue, 25 Oct 2016 11:08:27 +0300 Subject: [PATCH] add assertions --- ...ests.java => AddFavoritesSanityTests.java} | 212 +++++++++--------- .../favorites/DeleteFavoritesSanityTests.java | 66 +++--- .../favorites/GetFavoriteSanityTests.java | 43 ++-- .../favorites/GetFavoritesSanityTests.java | 71 +++--- 4 files changed, 208 insertions(+), 184 deletions(-) rename e2e-test/java/org/alfresco/rest/favorites/{PostFavoritesSanityTests.java => AddFavoritesSanityTests.java} (87%) diff --git a/e2e-test/java/org/alfresco/rest/favorites/PostFavoritesSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java similarity index 87% rename from e2e-test/java/org/alfresco/rest/favorites/PostFavoritesSanityTests.java rename to e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java index ce32d62de..d03130c54 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/PostFavoritesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java @@ -1,106 +1,106 @@ -package org.alfresco.rest.favorites; - -import org.alfresco.rest.RestTest; -import org.alfresco.rest.exception.JsonToModelConversionException; -import org.alfresco.rest.requests.RestFavoritesApi; -import org.alfresco.rest.requests.RestSitesApi; -import org.alfresco.utility.constants.UserRole; -import org.alfresco.utility.data.DataUser; -import org.alfresco.utility.data.DataUser.ListUserWithRoles; -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.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -@Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY }) -public class PostFavoritesSanityTests extends RestTest -{ - @Autowired - RestFavoritesApi favoritesAPI; - - @Autowired - RestSitesApi sitesApi; - - @Autowired - DataUser dataUser; - - private UserModel adminUserModel; - private SiteModel siteModel; - private ListUserWithRoles usersWithRoles; - - @BeforeClass(alwaysRun = true) - public void dataPreparation() throws Exception - { - adminUserModel = dataUser.getAdminUser(); - restClient.authenticateUser(adminUserModel); - siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); - favoritesAPI.useRestClient(restClient); - sitesApi.useRestClient(restClient); - siteModel.setGuid(sitesApi.getSite(siteModel).getGuid()); - - usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, - UserRole.SiteContributor); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user add site to favorites with Rest API and status code is 201") - public void adminIsAbleToAddToFavorites() throws Exception - { - favoritesAPI.addSiteToFavorites(adminUserModel, siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Manager user add site to favorites with Rest API and status code is 201") - public void managerIsAbleToAddToFavorites() throws Exception - { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user add site to favorites with Rest API and status code is 201") - public void collaboratorIsAbleToAddToFavorites() throws Exception - { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Contributor user add site to favorites with Rest API and status code is 201") - public void contributorIsAbleToAddToFavorites() throws JsonToModelConversionException, Exception - { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Consumer user add site to favorites with Rest API and status code is 201") - public void consumerIsAbleToAddToFavorites() throws Exception - { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); - } - - @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Manager user gets status code 401 if authentication call fails") - @Bug(id="MNT-16904") - public void managerIsNotAbleToAddCommentIfAuthenticationFails() throws Exception - { - UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); - siteManager.setPassword("wrongPassword"); - restClient.authenticateUser(siteManager); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED); - } -} +package org.alfresco.rest.favorites; + +import org.alfresco.rest.RestTest; +import org.alfresco.rest.exception.JsonToModelConversionException; +import org.alfresco.rest.requests.RestFavoritesApi; +import org.alfresco.rest.requests.RestSitesApi; +import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.data.DataUser; +import org.alfresco.utility.data.DataUser.ListUserWithRoles; +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.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +@Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY }) +public class AddFavoritesSanityTests extends RestTest +{ + @Autowired + RestFavoritesApi favoritesAPI; + + @Autowired + RestSitesApi sitesApi; + + @Autowired + DataUser dataUser; + + private UserModel adminUserModel; + private SiteModel siteModel; + private ListUserWithRoles usersWithRoles; + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception + { + adminUserModel = dataUser.getAdminUser(); + restClient.authenticateUser(adminUserModel); + siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); + favoritesAPI.useRestClient(restClient); + sitesApi.useRestClient(restClient); + siteModel.setGuid(sitesApi.getSite(siteModel).getGuid()); + + usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, + UserRole.SiteContributor); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user add site to favorites with Rest API and status code is 201") + public void adminIsAbleToAddToFavorites() throws Exception + { + favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Manager user add site to favorites with Rest API and status code is 201") + public void managerIsAbleToAddToFavorites() throws Exception + { + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user add site to favorites with Rest API and status code is 201") + public void collaboratorIsAbleToAddToFavorites() throws Exception + { + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Contributor user add site to favorites with Rest API and status code is 201") + public void contributorIsAbleToAddToFavorites() throws JsonToModelConversionException, Exception + { + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Consumer user add site to favorites with Rest API and status code is 201") + public void consumerIsAbleToAddToFavorites() throws Exception + { + restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED); + } + + @TestRail(section = { TestGroup.REST_API, + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Manager user gets status code 401 if authentication call fails") + @Bug(id="MNT-16904") + public void managerIsNotAbleToAddToFavoritesIfAuthenticationFails() throws Exception + { + UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); + siteManager.setPassword("wrongPassword"); + restClient.authenticateUser(siteManager); + favoritesAPI.addSiteToFavorites(siteManager, siteModel); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED); + } +} diff --git a/e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java index 017c03537..2908c437f 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java @@ -6,6 +6,7 @@ import org.alfresco.rest.requests.RestFavoritesApi; import org.alfresco.rest.requests.RestSitesApi; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataUser.ListUserWithRoles; +import org.alfresco.utility.model.ErrorModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; @@ -46,52 +47,61 @@ public class DeleteFavoritesSanityTests extends RestTest } @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user delets site from favorites with Rest API and status code is 204") + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user deletes site from favorites with Rest API and status code is 204") public void adminIsAbleToDeleteFavorites() throws JsonToModelConversionException, Exception { - favoritesAPI.addSiteToFavorites(adminUserModel, siteModel); + favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); favoritesAPI.deleteSiteFromFavorites(adminUserModel, siteModel); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + favoritesAPI.getFavorites(adminUserModel).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Manager user delets site from favorites with Rest API and status code is 204") + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Manager user deletes site from favorites with Rest API and status code is 204") public void managerIsAbleToDeleteFavorites() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel); - favoritesAPI.deleteSiteFromFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel); + UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); + restClient.authenticateUser(siteManager); + favoritesAPI.addSiteToFavorites(siteManager, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.deleteSiteFromFavorites(siteManager, siteModel); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + favoritesAPI.getFavorites(siteManager).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user delets site from favorites with Rest API and status code is 204") + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user deletes site from favorites with Rest API and status code is 204") public void collaboratorIsAbleToDeleteFavorites() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.deleteSiteFromFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); + UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); + restClient.authenticateUser(siteCollaborator); + favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.deleteSiteFromFavorites(siteCollaborator, siteModel); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + favoritesAPI.getFavorites(siteCollaborator).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, - TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Contributor user delets site from favorites with Rest API and status code is 204") + TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Contributor user deletes site from favorites with Rest API and status code is 204") public void contributorIsAbleToDeleteFavorites() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel); - favoritesAPI.deleteSiteFromFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel); + UserModel siteContributor = usersWithRoles.getOneUserWithRole(UserRole.SiteContributor); + restClient.authenticateUser(siteContributor); + favoritesAPI.addSiteToFavorites(siteContributor, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.deleteSiteFromFavorites(siteContributor, siteModel); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + favoritesAPI.getFavorites(siteContributor).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Consumer user delets site from favorites with Rest API and status code is 204") public void consumerIsAbleToDeleteFavorites() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); - favoritesAPI.deleteSiteFromFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); + UserModel siteConsumer = usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer); + restClient.authenticateUser(siteConsumer); + favoritesAPI.addSiteToFavorites(siteConsumer, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.deleteSiteFromFavorites(siteConsumer, siteModel); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT); + favoritesAPI.getFavorites(siteConsumer).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, @@ -99,11 +109,12 @@ public class DeleteFavoritesSanityTests extends RestTest @Bug(id="MNT-16557") public void userIsNotAbleToDeleteFavoritesOfAnotherUser() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); + UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); + restClient.authenticateUser(siteCollaborator); + favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - favoritesAPI.deleteSiteFromFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + favoritesAPI.deleteSiteFromFavorites(siteCollaborator, siteModel); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify user doesn't have permission to delete favorites of admin user with Rest API and status code is 404") @@ -111,21 +122,22 @@ public class DeleteFavoritesSanityTests extends RestTest public void userIsNotAbleToDeleteFavoritesOfAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - favoritesAPI.addSiteToFavorites(adminUserModel, siteModel); + favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); favoritesAPI.deleteSiteFromFavorites(adminUserModel, siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify admin user doesn't have permission to delete favorites of another user with Rest API and status code is 404") @Bug(id="MNT-16557") public void adminIsNotAbleToDeleteFavoritesOfAnotherUser() throws JsonToModelConversionException, Exception { - restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); + UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); + restClient.authenticateUser(siteCollaborator); + favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); restClient.authenticateUser(adminUserModel); - favoritesAPI.deleteSiteFromFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN); + favoritesAPI.deleteSiteFromFavorites(siteCollaborator, siteModel); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify user gets status code 401 if authentication call fails") diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java index 59d5febf2..937a4423f 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java @@ -7,11 +7,7 @@ import org.alfresco.rest.requests.RestFavoritesApi; import org.alfresco.rest.requests.RestSitesApi; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataUser.ListUserWithRoles; -import org.alfresco.utility.model.FileModel; -import org.alfresco.utility.model.FolderModel; -import org.alfresco.utility.model.SiteModel; -import org.alfresco.utility.model.TestGroup; -import org.alfresco.utility.model.UserModel; +import org.alfresco.utility.model.*; import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; @@ -56,8 +52,8 @@ public class GetFavoriteSanityTests extends RestTest TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorite site with Rest API and status code is 200") public void adminIsAbleToRetrieveFavoritesSite() throws JsonToModelConversionException, Exception { - favoritesAPI.addSiteToFavorites(adminUserModel, siteModel); - favoritesAPI.getSiteFavorites(adminUserModel, siteModel); + favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.getSiteFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -65,8 +61,8 @@ public class GetFavoriteSanityTests extends RestTest TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorite folder with Rest API and status code is 200") public void adminIsAbleToRetrieveFavoritesFolder() throws JsonToModelConversionException, Exception { - favoritesAPI.addFolderToFavorites(adminUserModel, folderModel); - favoritesAPI.getFolderFavorites(adminUserModel, folderModel); + favoritesAPI.addFolderToFavorites(adminUserModel, folderModel).and().assertField("targetGuid").is(folderModel.getNodeRef()); + favoritesAPI.getFolderFavorites(adminUserModel, folderModel).and().assertField("targetGuid").is(folderModel.getNodeRef()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -74,8 +70,8 @@ public class GetFavoriteSanityTests extends RestTest TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorite file with Rest API and status code is 200") public void adminIsAbleToRetrieveFavoritesFile() throws JsonToModelConversionException, Exception { - favoritesAPI.addFileToFavorites(adminUserModel, fileModel); - favoritesAPI.getFileFavorites(adminUserModel, fileModel); + favoritesAPI.addFileToFavorites(adminUserModel, fileModel).and().assertField("targetGuid").is(fileModel.getNodeRef().replace(";1.0", "")); + favoritesAPI.getFileFavorites(adminUserModel, fileModel).and().assertField("targetGuid").is(fileModel.getNodeRef().replace(";1.0", "")); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -84,8 +80,8 @@ public class GetFavoriteSanityTests extends RestTest public void managerIsAbleToRetrieveFavorite() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel); - favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -94,8 +90,8 @@ public class GetFavoriteSanityTests extends RestTest public void collaboratorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -104,8 +100,8 @@ public class GetFavoriteSanityTests extends RestTest public void contributorIsAbleToRetrieveFavorite() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel); - favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -114,8 +110,8 @@ public class GetFavoriteSanityTests extends RestTest public void consumerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); - favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); + favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().assertField("targetGuid").is(siteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -125,7 +121,8 @@ public class GetFavoriteSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); } @TestRail(section = { TestGroup.REST_API, @@ -134,7 +131,8 @@ public class GetFavoriteSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); favoritesAPI.getSiteFavorites(adminUserModel, siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername())); } @TestRail(section = { TestGroup.REST_API, @@ -143,7 +141,8 @@ public class GetFavoriteSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); } @TestRail(section = { TestGroup.REST_API, diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java index da1884097..0c1a337c1 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java @@ -7,11 +7,7 @@ import org.alfresco.rest.requests.RestFavoritesApi; import org.alfresco.rest.requests.RestSitesApi; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataUser.ListUserWithRoles; -import org.alfresco.utility.model.FileModel; -import org.alfresco.utility.model.FolderModel; -import org.alfresco.utility.model.SiteModel; -import org.alfresco.utility.model.TestGroup; -import org.alfresco.utility.model.UserModel; +import org.alfresco.utility.model.*; import org.alfresco.utility.report.Bug; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; @@ -64,9 +60,11 @@ public class GetFavoritesSanityTests extends RestTest TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorites sites with Rest API and status code is 200") public void adminIsAbleToRetrieveFavoritesSites() throws JsonToModelConversionException, Exception { - favoritesAPI.addSiteToFavorites(adminUserModel, firstSiteModel); - favoritesAPI.addSiteToFavorites(adminUserModel, secondSiteModel); - favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(adminUserModel); + favoritesAPI.addSiteToFavorites(adminUserModel, firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid()); + favoritesAPI.addSiteToFavorites(adminUserModel, secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid()); + favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(adminUserModel) + .assertEntriesListContains("targetGuid", firstSiteModel.getGuid()) + .assertEntriesListContains("targetGuid", secondSiteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -74,9 +72,11 @@ public class GetFavoritesSanityTests extends RestTest TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorites folders with Rest API and status code is 200") public void adminIsAbleToRetrieveFavoritesFolders() throws JsonToModelConversionException, Exception { - favoritesAPI.addFolderToFavorites(adminUserModel, firstFolderModel); - favoritesAPI.addFolderToFavorites(adminUserModel, secondFolderModel); - favoritesAPI.where().targetFolderExist().filterAnd().getFavorites(adminUserModel); + favoritesAPI.addFolderToFavorites(adminUserModel, firstFolderModel).and().assertField("targetGuid").is(firstFolderModel.getNodeRef()); + favoritesAPI.addFolderToFavorites(adminUserModel, secondFolderModel).and().assertField("targetGuid").is(secondFolderModel.getNodeRef()); + favoritesAPI.where().targetFolderExist().filterAnd().getFavorites(adminUserModel) + .assertEntriesListContains("targetGuid", firstFolderModel.getNodeRef()) + .assertEntriesListContains("targetGuid", secondFolderModel.getNodeRef()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -84,9 +84,11 @@ public class GetFavoritesSanityTests extends RestTest TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorites files with Rest API and status code is 200") public void adminIsAbleToRetrieveFavoritesFiles() throws JsonToModelConversionException, Exception { - favoritesAPI.addFileToFavorites(adminUserModel, firstFileModel); - favoritesAPI.addFileToFavorites(adminUserModel, secondFileModel); - favoritesAPI.where().targetFileExist().filterAnd().getFavorites(adminUserModel); + favoritesAPI.addFileToFavorites(adminUserModel, firstFileModel).and().assertField("targetGuid").is(firstFileModel.getNodeRef().replace(";1.0", "")); + favoritesAPI.addFileToFavorites(adminUserModel, secondFileModel).and().assertField("targetGuid").is(secondFileModel.getNodeRef().replace(";1.0", "")); + favoritesAPI.where().targetFileExist().filterAnd().getFavorites(adminUserModel) + .assertEntriesListContains("targetGuid", firstFileModel.getNodeRef().replace(";1.0", "")) + .assertEntriesListContains("targetGuid", secondFileModel.getNodeRef().replace(";1.0", "")); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -95,9 +97,11 @@ public class GetFavoritesSanityTests extends RestTest public void managerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), firstSiteModel); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), secondSiteModel); - favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid()); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid()); + favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) + .assertEntriesListContains("targetGuid", firstSiteModel.getGuid()) + .assertEntriesListContains("targetGuid", secondSiteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -106,9 +110,11 @@ public class GetFavoritesSanityTests extends RestTest public void collaboratorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), firstSiteModel); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), secondSiteModel); - favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid()); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid()); + favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) + .assertEntriesListContains("targetGuid", firstSiteModel.getGuid()) + .assertEntriesListContains("targetGuid", secondSiteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -117,9 +123,11 @@ public class GetFavoritesSanityTests extends RestTest public void contributorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), firstSiteModel); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), secondSiteModel); - favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid()); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid()); + favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) + .assertEntriesListContains("targetGuid", firstSiteModel.getGuid()) + .assertEntriesListContains("targetGuid", secondSiteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -128,9 +136,11 @@ public class GetFavoritesSanityTests extends RestTest public void consumerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), firstSiteModel); - favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), secondSiteModel); - favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid()); + favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid()); + favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) + .assertEntriesListContains("targetGuid", firstSiteModel.getGuid()) + .assertEntriesListContains("targetGuid", secondSiteModel.getGuid()); favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @@ -140,7 +150,8 @@ public class GetFavoritesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); } @TestRail(section = { TestGroup.REST_API, @@ -149,7 +160,8 @@ public class GetFavoritesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(adminUserModel); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername())); } @TestRail(section = { TestGroup.REST_API, @@ -158,7 +170,8 @@ public class GetFavoritesSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND); + favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); } @TestRail(section = { TestGroup.REST_API,