From ffbc345a2eab4ac4deaac2d4ab0dfb3f3d264751 Mon Sep 17 00:00:00 2001 From: mionescu Date: Fri, 13 Jan 2017 10:34:23 +0200 Subject: [PATCH] test- formatting --- .../people/DeleteFavoriteSiteCoreTests.java | 45 +++++++++++++------ .../people/DeleteFavoriteSiteSanityTests.java | 37 ++++++++------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteCoreTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteCoreTests.java index 265a878e7..4081e1775 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteCoreTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteCoreTests.java @@ -7,7 +7,6 @@ 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; @@ -48,8 +47,12 @@ public class DeleteFavoriteSiteCoreTests extends RestTest public void inexistentUserIsNotAbleToRemoveFavoriteSite() throws Exception { UserModel inexistentUser = new UserModel("inexistenUser", "password"); - restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(inexistentUser).removeFavoriteSite(siteModel); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "inexistenUser")); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(inexistentUser) + .removeFavoriteSite(siteModel); + + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) + .assertLastError() + .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "inexistenUser")); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @@ -58,7 +61,9 @@ public class DeleteFavoriteSiteCoreTests extends RestTest public void userIsNotAbleToRemoveFavoriteSiteWithInexistentId() throws Exception { SiteModel inexistentSite = new SiteModel("inexistentSite"); - restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).removeFavoriteSite(inexistentSite); + restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel) + .removeFavoriteSite(inexistentSite); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError() .containsSummary(String.format(RestErrorModel.RELATIONSHIP_NOT_FOUND, @@ -77,7 +82,9 @@ public class DeleteFavoriteSiteCoreTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); - restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().removeFavoriteSite(siteModel); + restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser() + .removeFavoriteSite(siteModel); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); restClient.withCoreAPI().usingUser(managerUser).addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -92,9 +99,12 @@ public class DeleteFavoriteSiteCoreTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); - restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().removeFavoriteSite(siteModel); + restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser() + .removeFavoriteSite(siteModel); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.withCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("id", siteModel.getId()); + restClient.withCoreAPI().usingAuthUser().getFavorites() + .assertThat().entriesListDoesNotContain("id", siteModel.getId()); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @@ -105,9 +115,12 @@ public class DeleteFavoriteSiteCoreTests extends RestTest SiteModel publicSiteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).addFavoriteSite(publicSiteModel); - restClient.withCoreAPI().usingAuthUser().removeFavoriteSite(publicSiteModel); + restClient.withCoreAPI().usingAuthUser() + .removeFavoriteSite(publicSiteModel); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.withCoreAPI().usingAuthUser().getFavoriteSites().assertThat().entriesListDoesNotContain("id", publicSiteModel.getId()); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites() + .assertThat().entriesListDoesNotContain("id", publicSiteModel.getId()); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @@ -118,9 +131,12 @@ public class DeleteFavoriteSiteCoreTests extends RestTest SiteModel moderatedSiteModel = dataSite.usingUser(adminUserModel).createModeratedRandomSite(); restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).addFavoriteSite(moderatedSiteModel); - restClient.withCoreAPI().usingAuthUser().removeFavoriteSite(moderatedSiteModel); + restClient.withCoreAPI().usingAuthUser() + .removeFavoriteSite(moderatedSiteModel); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.withCoreAPI().usingAuthUser().getFavoriteSites().assertThat().entriesListDoesNotContain("id", moderatedSiteModel.getId()); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites() + .assertThat().entriesListDoesNotContain("id", moderatedSiteModel.getId()); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.CORE }) @@ -131,9 +147,12 @@ public class DeleteFavoriteSiteCoreTests extends RestTest SiteModel privateSiteModel = dataSite.usingUser(userModel).createPrivateRandomSite(); restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).addFavoriteSite(privateSiteModel); - restClient.withCoreAPI().usingAuthUser().removeFavoriteSite(privateSiteModel); + restClient.withCoreAPI().usingAuthUser() + .removeFavoriteSite(privateSiteModel); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.withCoreAPI().usingAuthUser().getFavoriteSites().assertThat().entriesListDoesNotContain("id", privateSiteModel.getId()); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites() + .assertThat().entriesListDoesNotContain("id", privateSiteModel.getId()); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java index 2e91ed8e2..7eb61bbc8 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java @@ -68,12 +68,12 @@ public class DeleteFavoriteSiteSanityTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); restClient.withCoreAPI().usingAuthUser().getFavorites() - .assertThat() - .entriesListDoesNotContain("targetGuid", siteModel1.getGuid()) - .and().entriesListDoesNotContain("id", siteModel1.getId()) - .and().entriesListDoesNotContain("description", siteModel1.getDescription()) - .and().entriesListDoesNotContain("visibility", siteModel1.getVisibility().toString()) - .and().entriesListDoesNotContain("title", siteModel1.getTitle()); + .assertThat() + .entriesListDoesNotContain("targetGuid", siteModel1.getGuid()) + .and().entriesListDoesNotContain("id", siteModel1.getId()) + .and().entriesListDoesNotContain("description", siteModel1.getDescription()) + .and().entriesListDoesNotContain("visibility", siteModel1.getVisibility().toString()) + .and().entriesListDoesNotContain("title", siteModel1.getTitle()); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) @@ -90,12 +90,12 @@ public class DeleteFavoriteSiteSanityTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); restClient.withCoreAPI().usingAuthUser().getFavorites() - .assertThat() - .entriesListDoesNotContain("targetGuid", siteModel1.getGuid()) - .and().entriesListDoesNotContain("id", siteModel1.getId()) - .and().entriesListDoesNotContain("description", siteModel1.getDescription()) - .and().entriesListDoesNotContain("visibility", siteModel1.getVisibility().toString()) - .and().entriesListDoesNotContain("title", siteModel1.getTitle()); + .assertThat() + .entriesListDoesNotContain("targetGuid", siteModel1.getGuid()) + .and().entriesListDoesNotContain("id", siteModel1.getId()) + .and().entriesListDoesNotContain("description", siteModel1.getDescription()) + .and().entriesListDoesNotContain("visibility", siteModel1.getVisibility().toString()) + .and().entriesListDoesNotContain("title", siteModel1.getTitle()); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) @@ -112,12 +112,12 @@ public class DeleteFavoriteSiteSanityTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); restClient.withCoreAPI().usingAuthUser().getFavorites() - .assertThat() - .entriesListDoesNotContain("targetGuid", siteModel1.getGuid()) - .and().entriesListDoesNotContain("id", siteModel1.getId()) - .and().entriesListDoesNotContain("description", siteModel1.getDescription()) - .and().entriesListDoesNotContain("visibility", siteModel1.getVisibility().toString()) - .and().entriesListDoesNotContain("title", siteModel1.getTitle()); + .assertThat() + .entriesListDoesNotContain("targetGuid", siteModel1.getGuid()) + .and().entriesListDoesNotContain("id", siteModel1.getId()) + .and().entriesListDoesNotContain("description", siteModel1.getDescription()) + .and().entriesListDoesNotContain("visibility", siteModel1.getVisibility().toString()) + .and().entriesListDoesNotContain("title", siteModel1.getTitle()); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) @@ -156,7 +156,6 @@ public class DeleteFavoriteSiteSanityTests extends RestTest @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) @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)") - @Bug(id = "MNT-16904") public void managerUserNotAuthorizedFailsToRemoveFavoriteSite() throws Exception { UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();