From e296b0d61c504df99b7558df59ed14f5cae4afee Mon Sep 17 00:00:00 2001 From: Paul Brodner Date: Wed, 16 Nov 2016 16:05:04 +0200 Subject: [PATCH] rename from onCoreAPI to withCoreAPI, the same for onWorkflowAPI --- .../rest/comments/AddCommentSanityTests.java | 12 ++-- .../rest/comments/AddCommentsSanityTests.java | 12 ++-- .../comments/DeleteCommentsSanityTests.java | 14 ++-- .../rest/comments/GetCommentsSanityTests.java | 22 +++---- .../comments/UpdateCommentsSanityTests.java | 18 ++--- .../org/alfresco/rest/demo/RestDemoTests.java | 18 ++--- .../rest/demo/SampleCommentsTests.java | 8 +-- .../alfresco/rest/demo/SamplePeopleTests.java | 2 +- .../alfresco/rest/demo/SampleSitesTests.java | 14 ++-- .../favorites/AddFavoritesSanityTests.java | 14 ++-- .../favorites/DeleteFavoritesSanityTests.java | 46 ++++++------- .../favorites/GetFavoriteSanityTests.java | 38 +++++------ .../favorites/GetFavoritesSanityTests.java | 56 ++++++++-------- .../RestGetNetworkForPersonSanityTests.java | 8 +-- .../rest/networks/RestGetNetworkTest.java | 26 ++++---- .../RestGetNetworksForPersonSanityTests.java | 8 +-- .../people/AddFavoriteSiteSanityTests.java | 14 ++-- .../AddSiteMembershipRequestSanityTests.java | 12 ++-- .../people/DeleteFavoriteSiteSanityTests.java | 14 ++-- .../people/DeleteSiteMemberSanityTests.java | 22 +++---- ...eleteSiteMembershipRequestSanityTests.java | 32 ++++----- .../people/GetFavoriteSiteSanityTests.java | 14 ++-- .../people/GetFavoriteSitesSanityTests.java | 14 ++-- .../GetPeopleActivitiesSanityTests.java | 12 ++-- .../GetPeoplePreferenceSanityTests.java | 12 ++-- .../GetPeoplePreferencesSanityTests.java | 12 ++-- .../rest/people/GetPeopleSanityTests.java | 12 ++-- .../GetSiteMembershipRequestSanityTests.java | 24 +++---- .../GetSiteMembershipRequestsSanityTests.java | 16 ++--- .../people/GetSiteMembershipSanityTests.java | 12 ++-- ...SitesMembershipInformationSanityTests.java | 12 ++-- ...pdateSiteMembershipRequestSanityTests.java | 28 ++++---- .../rest/ratings/AddRatingSanityTests.java | 24 +++---- .../rest/ratings/DeleteRatingSanityTests.java | 66 +++++++++---------- .../rest/ratings/GetRatingSanityTests.java | 48 +++++++------- .../rest/sites/AddSiteMemberSanityTests.java | 12 ++-- .../sites/GetSiteContainerSanityTests.java | 24 +++---- .../sites/GetSiteContainersSanityTests.java | 12 ++-- .../rest/sites/GetSiteMemberSanityTests.java | 12 ++-- .../rest/sites/GetSiteMembersSanityTests.java | 12 ++-- .../rest/sites/GetSiteSanityTests.java | 12 ++-- .../rest/sites/GetSitesSanityTests.java | 12 ++-- .../sites/RemoveSiteMemberSanityTests.java | 22 +++---- .../sites/UpdateSiteMemberSanityTests.java | 12 ++-- .../GetProcessDefinitionImageSanityTests.java | 6 +- .../GetProcessDefinitionSanityTests.java | 8 +-- ...ssDefinitionStartFormModelSanityTests.java | 8 +-- .../processes/AddProcessItemSanityTests.java | 14 ++-- .../processes/AddProcessSanityTests.java | 8 +-- .../AddProcessVariableSanityTests.java | 22 +++---- .../processes/DeleteProcessSanityTests.java | 16 ++--- .../processes/GetProcessItemsSanityTests.java | 14 ++-- .../processes/GetProcessTasksSanityTests.java | 6 +- .../GetProcessVariablesSanityTests.java | 8 +-- .../processes/GetProcessesSanityTests.java | 8 +-- 55 files changed, 482 insertions(+), 482 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/comments/AddCommentSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/AddCommentSanityTests.java index 9bf0330fe..a10980ce4 100644 --- a/e2e-test/java/org/alfresco/rest/comments/AddCommentSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/AddCommentSanityTests.java @@ -41,7 +41,7 @@ public class AddCommentSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); String newContent = "This is a new comment added by " + adminUserModel.getUsername(); - restClient.onCoreAPI().usingResource(document).addComment(newContent) + restClient.withCoreAPI().usingResource(document).addComment(newContent) .assertThat().field("content").isNotEmpty() .and().field("content").is(newContent); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -52,7 +52,7 @@ public class AddCommentSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); String contentSiteManger = "This is a new comment added by user with role: " + UserRole.SiteManager; - restClient.onCoreAPI().usingResource(document).addComment(contentSiteManger) + restClient.withCoreAPI().usingResource(document).addComment(contentSiteManger) .assertThat().field("content").isNotEmpty() .and().field("content").is(contentSiteManger); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -63,7 +63,7 @@ public class AddCommentSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); String contentSiteContributor = "This is a new comment added by user with role" + UserRole.SiteContributor; - restClient.onCoreAPI().usingResource(document).addComment(contentSiteContributor) + restClient.withCoreAPI().usingResource(document).addComment(contentSiteContributor) .assertThat().field("content").isNotEmpty() .and().field("content").is(contentSiteContributor); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -74,7 +74,7 @@ public class AddCommentSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); String contentSiteCollaborator = "This is a new comment added by user with role: " + UserRole.SiteCollaborator; - restClient.onCoreAPI().usingResource(document).addComment(contentSiteCollaborator) + restClient.withCoreAPI().usingResource(document).addComment(contentSiteCollaborator) .assertThat().field("content").isNotEmpty() .and().field("content").is(contentSiteCollaborator); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -85,7 +85,7 @@ public class AddCommentSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); String contentSiteConsumer = "This is a new comment added by user with role: " + UserRole.SiteConsumer; - restClient.onCoreAPI().usingResource(document).addComment(contentSiteConsumer); + restClient.withCoreAPI().usingResource(document).addComment(contentSiteConsumer); restClient .assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -96,7 +96,7 @@ public class AddCommentSanityTests extends RestTest public void unauthenticatedUserIsNotAbleToAddComment() throws JsonToModelConversionException, Exception { restClient.authenticateUser(new UserModel("random user", "random password")); - restClient.onCoreAPI().usingResource(document).addComment("This is a new comment"); + restClient.withCoreAPI().usingResource(document).addComment("This is a new comment"); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java index e42f5dac3..f5afee1ff 100644 --- a/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/AddCommentsSanityTests.java @@ -54,7 +54,7 @@ public class AddCommentsSanityTests extends RestTest public void adminIsAbleToAddComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel) - .onCoreAPI().usingResource(document).addComments(comment1, comment2) + .withCoreAPI().usingResource(document).addComments(comment1, comment2) .assertThat().entriesListIsNotEmpty() .and().entriesListContains("content", comment1) .and().entriesListContains("content", comment2); @@ -66,7 +66,7 @@ public class AddCommentsSanityTests extends RestTest public void managerIsAbleToAddComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI().usingResource(document).addComments(comment1, comment2) + .withCoreAPI().usingResource(document).addComments(comment1, comment2) .assertThat().entriesListIsNotEmpty() .and().entriesListContains("content", comment1) .and().entriesListContains("content", comment2); @@ -78,7 +78,7 @@ public class AddCommentsSanityTests extends RestTest public void contributorIsAbleToAddComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI().usingResource(document).addComments(comment1, comment2) + .withCoreAPI().usingResource(document).addComments(comment1, comment2) .assertThat().entriesListIsNotEmpty() .and().entriesListContains("content", comment1) .and().entriesListContains("content", comment2); @@ -90,7 +90,7 @@ public class AddCommentsSanityTests extends RestTest public void collaboratorIsAbleToAddComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().usingResource(document).addComments(comment1, comment2) + .withCoreAPI().usingResource(document).addComments(comment1, comment2) .assertThat().paginationExist().and().entriesListIsNotEmpty() .and().entriesListContains("content", comment1) .and().entriesListContains("content", comment2); @@ -103,7 +103,7 @@ public class AddCommentsSanityTests extends RestTest public void consumerIsAbleToAddComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().usingResource(document).addComments(comment1, comment2); + .withCoreAPI().usingResource(document).addComments(comment1, comment2); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -114,7 +114,7 @@ public class AddCommentsSanityTests extends RestTest public void unauthenticatedUserIsNotAbleToAddComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(new UserModel("random user", "random password")) - .onCoreAPI().usingResource(document).addComments(comment1, comment2); + .withCoreAPI().usingResource(document).addComments(comment1, comment2); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/comments/DeleteCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/DeleteCommentsSanityTests.java index 7773d76fe..464525fa9 100644 --- a/e2e-test/java/org/alfresco/rest/comments/DeleteCommentsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/DeleteCommentsSanityTests.java @@ -42,7 +42,7 @@ public class DeleteCommentsSanityTests extends RestTest public void addCommentToDocument() throws Exception { restClient.authenticateUser(adminUserModel); - comment = restClient.onCoreAPI().usingResource(document).addComment("This is a new comment"); + comment = restClient.withCoreAPI().usingResource(document).addComment("This is a new comment"); } @TestRail(section = { TestGroup.REST_API, @@ -50,7 +50,7 @@ public class DeleteCommentsSanityTests extends RestTest public void adminIsAbleToDeleteComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - restClient.onCoreAPI().usingResource(document).deleteComment(comment); + restClient.withCoreAPI().usingResource(document).deleteComment(comment); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -59,7 +59,7 @@ public class DeleteCommentsSanityTests extends RestTest public void managerIsAbleToDeleteComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingResource(document).deleteComment(comment); + restClient.withCoreAPI().usingResource(document).deleteComment(comment); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -68,7 +68,7 @@ public class DeleteCommentsSanityTests extends RestTest public void collaboratorIsNotAbleToDeleteComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingResource(document).deleteComment(comment); + restClient.withCoreAPI().usingResource(document).deleteComment(comment); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -78,7 +78,7 @@ public class DeleteCommentsSanityTests extends RestTest public void contributorIsNotAbleToDeleteComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingResource(document).deleteComment(comment); + restClient.withCoreAPI().usingResource(document).deleteComment(comment); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -88,7 +88,7 @@ public class DeleteCommentsSanityTests extends RestTest public void consumerIsNotAbleToDeleteComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingResource(document).deleteComment(comment); + restClient.withCoreAPI().usingResource(document).deleteComment(comment); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -99,7 +99,7 @@ public class DeleteCommentsSanityTests extends RestTest { UserModel nonexistentModel = new UserModel("nonexistentUser", "nonexistentPassword"); restClient.authenticateUser(nonexistentModel); - restClient.onCoreAPI().usingResource(document).deleteComment(comment); + restClient.withCoreAPI().usingResource(document).deleteComment(comment); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/comments/GetCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/GetCommentsSanityTests.java index 328870889..4c6d435eb 100644 --- a/e2e-test/java/org/alfresco/rest/comments/GetCommentsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/GetCommentsSanityTests.java @@ -35,7 +35,7 @@ public class GetCommentsSanityTests extends RestTest siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); document = dataContent.usingSite(siteModel).usingUser(adminUserModel).createContent(DocumentType.TEXT_PLAIN); content = "This is a new comment"; - restClient.onCoreAPI().usingResource(document).addComment(content); + restClient.withCoreAPI().usingResource(document).addComment(content); usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); } @@ -45,7 +45,7 @@ public class GetCommentsSanityTests extends RestTest public void adminIsAbleToRetrieveComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - restClient.onCoreAPI().usingResource(document).getNodeComments(); + restClient.withCoreAPI().usingResource(document).getNodeComments(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -54,7 +54,7 @@ public class GetCommentsSanityTests extends RestTest public void managerIsAbleToRetrieveComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingResource(document).getNodeComments() + restClient.withCoreAPI().usingResource(document).getNodeComments() .assertThat().entriesListContains("content", content); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -65,7 +65,7 @@ public class GetCommentsSanityTests extends RestTest public void contributorIsAbleToRetrieveComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingResource(document).getNodeComments() + restClient.withCoreAPI().usingResource(document).getNodeComments() .assertThat().entriesListContains("content", content); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -76,7 +76,7 @@ public class GetCommentsSanityTests extends RestTest public void collaboratorIsAbleToRetrieveComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingResource(document).getNodeComments() + restClient.withCoreAPI().usingResource(document).getNodeComments() .assertThat().entriesListContains("content", content); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -86,7 +86,7 @@ public class GetCommentsSanityTests extends RestTest public void consumerIsAbleToRetrieveComments() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingResource(document).getNodeComments() + restClient.withCoreAPI().usingResource(document).getNodeComments() .assertThat().entriesListContains("content", content); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -98,7 +98,7 @@ public class GetCommentsSanityTests extends RestTest { UserModel nonexistentModel = new UserModel("nonexistentUser", "nonexistentPassword"); restClient.authenticateUser(nonexistentModel); - restClient.onCoreAPI().usingResource(document).getNodeComments(); + restClient.withCoreAPI().usingResource(document).getNodeComments(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -109,10 +109,10 @@ public class GetCommentsSanityTests extends RestTest userModel = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); restClient.authenticateUser(userModel); String contentManager = "This is a new comment added by " + userModel.getUsername(); - restClient.onCoreAPI().usingResource(document).addComment(contentManager); + restClient.withCoreAPI().usingResource(document).addComment(contentManager); restClient.assertStatusCodeIs(HttpStatus.CREATED); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingResource(document).getNodeComments() + restClient.withCoreAPI().usingResource(document).getNodeComments() .assertThat().entriesListContains("content", contentManager); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -125,10 +125,10 @@ public class GetCommentsSanityTests extends RestTest userModel = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); restClient.authenticateUser(userModel); String contentCollaborator = "This is a new comment added by " + userModel.getUsername(); - restClient.onCoreAPI().usingResource(document).addComment(contentCollaborator); + restClient.withCoreAPI().usingResource(document).addComment(contentCollaborator); restClient.assertStatusCodeIs(HttpStatus.CREATED); restClient.authenticateUser(adminUserModel); - restClient.onCoreAPI().usingResource(document).getNodeComments() + restClient.withCoreAPI().usingResource(document).getNodeComments() .assertThat().entriesListContains("content", contentCollaborator); restClient.assertStatusCodeIs(HttpStatus.OK); diff --git a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java index da53f841f..85f70a03e 100644 --- a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java @@ -36,7 +36,7 @@ public class UpdateCommentsSanityTests extends RestTest siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); document = dataContent.usingSite(siteModel).usingUser(adminUserModel).createContent(DocumentType.TEXT_PLAIN); - commentModel = restClient.onCoreAPI().usingResource(document).addComment("This is a new comment"); + commentModel = restClient.withCoreAPI().usingResource(document).addComment("This is a new comment"); usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel,UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); } @@ -47,7 +47,7 @@ public class UpdateCommentsSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); String updatedContent = "This is the updated comment with admin user"; - restClient.onCoreAPI().usingResource(document).updateComment(commentModel, updatedContent) + restClient.withCoreAPI().usingResource(document).updateComment(commentModel, updatedContent) .assertThat().field("content").isNotEmpty() .and().field("content").is(updatedContent); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -58,7 +58,7 @@ public class UpdateCommentsSanityTests extends RestTest public void managerIsAbleToUpdateComment() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Manager user") + restClient.withCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Manager user") .and().field("content").is("This is the updated comment with Manager user") .and().field("canEdit").is(true) .and().field("canDelete").is(true); @@ -71,7 +71,7 @@ public class UpdateCommentsSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); String updatedContent = "This is the updated comment with Contributor user"; - restClient.onCoreAPI().usingResource(document).updateComment(commentModel, updatedContent); + restClient.withCoreAPI().usingResource(document).updateComment(commentModel, updatedContent); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -81,7 +81,7 @@ public class UpdateCommentsSanityTests extends RestTest public void consumerIsNotAbleToUpdateComment() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Consumer user"); + restClient.withCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Consumer user"); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -92,7 +92,7 @@ public class UpdateCommentsSanityTests extends RestTest public void collaboratorIsNotAbleToUpdateComment() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Collaborator user"); + restClient.withCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Collaborator user"); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -103,7 +103,7 @@ public class UpdateCommentsSanityTests extends RestTest { UserModel incorrectUserModel = new UserModel("userName", "password"); restClient.authenticateUser(incorrectUserModel) - .onCoreAPI().usingResource(document).getNodeComments(); + .withCoreAPI().usingResource(document).getNodeComments(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -114,7 +114,7 @@ public class UpdateCommentsSanityTests extends RestTest FolderModel content = FolderModel.getRandomFolderModel(); content.setNodeRef("node ref that does not exist"); - restClient.onCoreAPI().usingResource(content).updateComment(commentModel, "This is the updated comment."); + restClient.withCoreAPI().usingResource(content).updateComment(commentModel, "This is the updated comment."); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary("node ref that does not exist was not found"); } @@ -127,7 +127,7 @@ public class UpdateCommentsSanityTests extends RestTest RestCommentModel comment = new RestCommentModel(); String id = "comment id that does not exist"; comment.setId(id); - restClient.onCoreAPI().usingResource(document).updateComment(comment, "This is the updated comment."); + restClient.withCoreAPI().usingResource(document).updateComment(comment, "This is the updated comment."); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, id)); } diff --git a/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java b/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java index fe280d644..e8b59de3d 100644 --- a/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java +++ b/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java @@ -41,10 +41,10 @@ public class RestDemoTests extends RestTest @Test public void adminRetrievesCorrectSiteDetails() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().getSites().assertThat() + restClient.withCoreAPI().getSites().assertThat() .entriesListContains("id", siteModel.getId()); - restClient.onCoreAPI().usingSite(siteModel).getSite() + restClient.withCoreAPI().usingSite(siteModel).getSite() .assertThat().field("id").isNotNull() .assertThat().field("description").is(siteModel.getDescription()) .assertThat().field("title").is(siteModel.getTitle()) @@ -65,8 +65,8 @@ public class RestDemoTests extends RestTest .usingResource(FolderModel.getSharedFolderModel()) .createContent(DocumentType.TEXT_PLAIN); // add new comment - restClient.onCoreAPI().usingResource(fileModel).addComment("This is a new comment"); - restClient.onCoreAPI().usingResource(fileModel).getNodeComments() + restClient.withCoreAPI().usingResource(fileModel).addComment("This is a new comment"); + restClient.withCoreAPI().usingResource(fileModel).getNodeComments() .assertThat().entriesListIsNotEmpty().and() .entriesListContains("content", "This is a new comment"); } @@ -87,20 +87,20 @@ public class RestDemoTests extends RestTest testUser.setUserRole(UserRole.SiteConsumer); // add user as Consumer to site - restClient.onCoreAPI().usingSite(siteModel).addPerson(testUser); - restClient.onCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListContains("id", testUser.getUsername()) + restClient.withCoreAPI().usingSite(siteModel).addPerson(testUser); + restClient.withCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListContains("id", testUser.getUsername()) .when().getSiteMember(testUser.getUsername()) .assertSiteMemberHasRole(Role.SiteConsumer); // update site member to Manager testUser.setUserRole(UserRole.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUser); - restClient.onCoreAPI().usingSite(siteModel).getSiteMembers().and() + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUser); + restClient.withCoreAPI().usingSite(siteModel).getSiteMembers().and() .entriesListContains("id", testUser.getUsername()) .when().getSiteMember(testUser.getUsername()) .assertSiteMemberHasRole(Role.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).deleteSiteMember(testUser); + restClient.withCoreAPI().usingSite(siteModel).deleteSiteMember(testUser); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java b/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java index 5277aa2a3..71b6b73de 100644 --- a/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java +++ b/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java @@ -36,7 +36,7 @@ public class SampleCommentsTests extends RestTest description= "Verify admin user adds comments with Rest API and status code is 200") public void admiShouldAddComment() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().usingResource(document).addComment("This is a new comment"); + restClient.withCoreAPI().usingResource(document).addComment("This is a new comment"); restClient.assertStatusCodeIs(HttpStatus.CREATED); } @@ -44,7 +44,7 @@ public class SampleCommentsTests extends RestTest description= "Verify admin user gets comments with Rest API and status code is 200") public void admiShouldRetrieveComments() throws Exception { - restClient.onCoreAPI().usingResource(document).getNodeComments(); + restClient.withCoreAPI().usingResource(document).getNodeComments(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -52,9 +52,9 @@ public class SampleCommentsTests extends RestTest description= "Verify admin user updates comments with Rest API") public void adminShouldUpdateComment() throws JsonToModelConversionException, Exception { - RestCommentModel commentModel = restClient.onCoreAPI().usingResource(document).addComment("This is a new comment"); + RestCommentModel commentModel = restClient.withCoreAPI().usingResource(document).addComment("This is a new comment"); - restClient.onCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Collaborator user") + restClient.withCoreAPI().usingResource(document).updateComment(commentModel, "This is the updated comment with Collaborator user") .assertThat().field("content").is("This is the updated comment with Collaborator user"); } diff --git a/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java b/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java index d61773e8b..62cb2f8bb 100644 --- a/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java +++ b/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java @@ -28,7 +28,7 @@ public class SamplePeopleTests extends RestTest description = "Verify admin user gets person with Rest API and response is not empty") public void adminShouldRetrievePerson() throws Exception { - restClient.onCoreAPI().usingUser(userModel).getPerson().assertThat().field("id").isNotEmpty(); + restClient.withCoreAPI().usingUser(userModel).getPerson().assertThat().field("id").isNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/demo/SampleSitesTests.java b/e2e-test/java/org/alfresco/rest/demo/SampleSitesTests.java index b363c0046..e5dd071e6 100644 --- a/e2e-test/java/org/alfresco/rest/demo/SampleSitesTests.java +++ b/e2e-test/java/org/alfresco/rest/demo/SampleSitesTests.java @@ -30,7 +30,7 @@ public class SampleSitesTests extends RestTest description = "Verify admin user gets site details with Rest API and response is not empty") public void adminShouldGetSiteDetails() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().usingSite(siteModel).getSite() + restClient.withCoreAPI().usingSite(siteModel).getSite() .assertThat().field("id").isNotNull(); } @@ -38,7 +38,7 @@ public class SampleSitesTests extends RestTest description = "Verify admin user gets site information and gets status code OK (200)") public void adminShouldGetSites() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().usingSite(siteModel).getSite(); + restClient.withCoreAPI().usingSite(siteModel).getSite(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -46,7 +46,7 @@ public class SampleSitesTests extends RestTest description = "Verify admin user gets sites with Rest API and the response is not empty") public void adminShouldAccessSites() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().getSites().assertThat().entriesListIsNotEmpty(); + restClient.withCoreAPI().getSites().assertThat().entriesListIsNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -54,7 +54,7 @@ public class SampleSitesTests extends RestTest description = "Verify admin user gets sites with Rest API and status code is 200") public void adminShouldAccessResponsePagination() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().getSites().assertThat().paginationExist(); + restClient.withCoreAPI().getSites().assertThat().paginationExist(); } @TestRail(section={"demo", "sample-section"}, executionType= ExecutionType.SANITY, @@ -63,7 +63,7 @@ public class SampleSitesTests extends RestTest { UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); - restClient.onCoreAPI().usingSite(siteModel).addPerson(testUser); + restClient.withCoreAPI().usingSite(siteModel).addPerson(testUser); restClient.assertStatusCodeIs(HttpStatus.CREATED); } @@ -71,14 +71,14 @@ public class SampleSitesTests extends RestTest description = "Verify that site exists from get all sites request") public void adminShouldGetSiteFromSitesList() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().getSites().assertThat().entriesListContains("id", siteModel.getId()); + restClient.withCoreAPI().getSites().assertThat().entriesListContains("id", siteModel.getId()); } @TestRail(section={"demo", "sample-section"}, executionType= ExecutionType.SANITY, description = "Verify site details: response not empty, description, title, visibility") public void adminShouldAccessSiteDetails() throws JsonToModelConversionException, Exception { - restClient.onCoreAPI().usingSite(siteModel).getSite() + restClient.withCoreAPI().usingSite(siteModel).getSite() .assertThat().field("id").isNotNull() .and().field("description").is(siteModel.getDescription()) .and().field("title").is(siteModel.getTitle()) diff --git a/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java index d1c84348b..3ef0648b8 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java @@ -31,7 +31,7 @@ public class AddFavoritesSanityTests extends RestTest { adminUserModel = dataUser.getAdminUser(); siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); - siteModel.setGuid(restClient.authenticateUser(adminUserModel).onCoreAPI().usingSite(siteModel).getSite().getGuid()); + siteModel.setGuid(restClient.authenticateUser(adminUserModel).withCoreAPI().usingSite(siteModel).getSite().getGuid()); usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); @@ -42,7 +42,7 @@ public class AddFavoritesSanityTests extends RestTest description = "Verify Admin user add site to favorites with Rest API and status code is 201") public void adminIsAbleToAddToFavorites() throws Exception { - restClient.onCoreAPI().usingAuthUser() + restClient.withCoreAPI().usingAuthUser() .addSiteToFavorites(siteModel) .assertThat().field("targetGuid").is(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -54,7 +54,7 @@ public class AddFavoritesSanityTests extends RestTest public void managerIsAbleToAddToFavorites() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI().usingAuthUser() + .withCoreAPI().usingAuthUser() .addSiteToFavorites(siteModel) .assertThat().field("targetGuid").is(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -66,7 +66,7 @@ public class AddFavoritesSanityTests extends RestTest public void collaboratorIsAbleToAddToFavorites() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().usingAuthUser() + .withCoreAPI().usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.CREATED); } @@ -77,7 +77,7 @@ public class AddFavoritesSanityTests extends RestTest public void contributorIsAbleToAddToFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI().usingAuthUser() + .withCoreAPI().usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.CREATED); } @@ -88,7 +88,7 @@ public class AddFavoritesSanityTests extends RestTest public void consumerIsAbleToAddToFavorites() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().usingAuthUser() + .withCoreAPI().usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.CREATED); } @@ -102,7 +102,7 @@ public class AddFavoritesSanityTests extends RestTest UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); siteManager.setPassword("wrongPassword"); restClient.authenticateUser(siteManager) - .onCoreAPI().usingAuthUser() + .withCoreAPI().usingAuthUser() .addSiteToFavorites(siteModel); restClient.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 b551c5e31..d1efa1042 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java @@ -28,7 +28,7 @@ public class DeleteFavoritesSanityTests extends RestTest adminUserModel = dataUser.getAdminUser(); siteModel = dataSite.usingUser(adminUserModel).createPublicRandomSite(); - siteModel.setGuid(restClient.authenticateUser(adminUserModel).onCoreAPI().usingSite(siteModel).getSite().getGuid()); + siteModel.setGuid(restClient.authenticateUser(adminUserModel).withCoreAPI().usingSite(siteModel).getSite().getGuid()); usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); @@ -38,12 +38,12 @@ public class DeleteFavoritesSanityTests extends RestTest 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 { - restClient.onCoreAPI().usingUser(adminUserModel) + restClient.withCoreAPI().usingUser(adminUserModel) .addSiteToFavorites(siteModel).assertThat().field("targetGuid").is(siteModel.getGuid()); - restClient.onCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel) + restClient.withCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, @@ -52,14 +52,14 @@ public class DeleteFavoritesSanityTests extends RestTest { UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); restClient.authenticateUser(siteManager) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); - restClient.onCoreAPI().usingAuthUser() + restClient.withCoreAPI().usingAuthUser() .deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, @@ -68,13 +68,13 @@ public class DeleteFavoritesSanityTests extends RestTest { UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); restClient.authenticateUser(siteCollaborator) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); - restClient.onCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel) + restClient.withCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, @@ -83,13 +83,13 @@ public class DeleteFavoritesSanityTests extends RestTest { UserModel siteContributor = usersWithRoles.getOneUserWithRole(UserRole.SiteContributor); restClient.authenticateUser(siteContributor) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); - restClient.onCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel) + restClient.withCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, @@ -98,12 +98,12 @@ public class DeleteFavoritesSanityTests extends RestTest { UserModel siteConsumer = usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer); restClient.authenticateUser(siteConsumer) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); - restClient.onCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel).assertStatusCodeIs(HttpStatus.NO_CONTENT); + restClient.withCoreAPI().usingAuthUser().deleteSiteFromFavorites(siteModel).assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().getFavorites().assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid()); } @TestRail(section = { TestGroup.REST_API, @@ -113,11 +113,11 @@ public class DeleteFavoritesSanityTests extends RestTest { UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator); restClient.authenticateUser(siteCollaborator) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -128,13 +128,13 @@ public class DeleteFavoritesSanityTests extends RestTest public void userIsNotAbleToDeleteFavoritesOfAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel) .and().field("targetGuid").is(siteModel.getGuid()); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -145,12 +145,12 @@ public class DeleteFavoritesSanityTests extends RestTest public void adminIsNotAbleToDeleteFavoritesOfAnotherUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); restClient.authenticateUser(adminUserModel) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -163,7 +163,7 @@ public class DeleteFavoritesSanityTests extends RestTest UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); siteManager.setPassword("wrongPassword"); restClient.authenticateUser(siteManager) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .deleteSiteFromFavorites(siteModel) .assertStatusCodeIs(HttpStatus.UNAUTHORIZED); diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java index 04c6cfe9b..1612c41cd 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java @@ -37,7 +37,7 @@ public class GetFavoriteSanityTests extends RestTest folderModel = dataContent.usingUser(adminUserModel).usingSite(siteModel).createFolder(); fileModel = dataContent.usingUser(adminUserModel).usingResource(folderModel).createContent(DocumentType.TEXT_PLAIN); - siteModel.setGuid(restClient.authenticateUser(adminUserModel).onCoreAPI().usingSite(siteModel).getSite().getGuid()); + siteModel.setGuid(restClient.authenticateUser(adminUserModel).withCoreAPI().usingSite(siteModel).getSite().getGuid()); usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); @@ -47,8 +47,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 { - restClient.onCoreAPI().usingUser(adminUserModel).addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); - restClient.onCoreAPI().usingUser(adminUserModel).getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); + restClient.withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(siteModel).and().field("targetGuid").is(siteModel.getGuid()); + restClient.withCoreAPI().usingUser(adminUserModel).getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -56,8 +56,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 { - restClient.onCoreAPI().usingUser(adminUserModel).addFolderToFavorites(folderModel).and().field("targetGuid").is(folderModel.getNodeRef()); - restClient.onCoreAPI().usingUser(adminUserModel).getFavorites().and().entriesListContains("targetGuid", folderModel.getNodeRef()); + restClient.withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(folderModel).and().field("targetGuid").is(folderModel.getNodeRef()); + restClient.withCoreAPI().usingUser(adminUserModel).getFavorites().and().entriesListContains("targetGuid", folderModel.getNodeRef()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -65,8 +65,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 { - restClient.onCoreAPI().usingUser(adminUserModel).addFileToFavorites(fileModel); - restClient.onCoreAPI().usingUser(adminUserModel).getFavorites().and().entriesListContains("targetGuid", fileModel.getNodeRef()); + restClient.withCoreAPI().usingUser(adminUserModel).addFileToFavorites(fileModel); + restClient.withCoreAPI().usingUser(adminUserModel).getFavorites().and().entriesListContains("targetGuid", fileModel.getNodeRef()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -75,8 +75,8 @@ public class GetFavoriteSanityTests extends RestTest public void managerIsAbleToRetrieveFavorite() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); - restClient.onCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -85,9 +85,9 @@ public class GetFavoriteSanityTests extends RestTest public void collaboratorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteToFavorites(siteModel); - restClient.onCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -96,8 +96,8 @@ public class GetFavoriteSanityTests extends RestTest public void contributorIsAbleToRetrieveFavorite() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); - restClient.onCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -106,8 +106,8 @@ public class GetFavoriteSanityTests extends RestTest public void consumerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); - restClient.onCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(siteModel); + restClient.withCoreAPI().usingAuthUser().getFavoriteSites().and().entriesListContains("guid",siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -116,7 +116,7 @@ public class GetFavoriteSanityTests extends RestTest public void userIsNotAbleToRetrieveFavoriteSiteOfAnotherUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) + restClient.withCoreAPI().usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) .getFavorite(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) @@ -128,7 +128,7 @@ public class GetFavoriteSanityTests extends RestTest public void userIsNotAbleToRetrieveFavoritesOfAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUserModel) .getFavorite(siteModel.getGuid()); @@ -141,7 +141,7 @@ public class GetFavoriteSanityTests extends RestTest public void adminIsNotAbleToRetrieveFavoritesOfAnotherUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel) - .onCoreAPI() + .withCoreAPI() .usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) .getFavorite(siteModel.getGuid()); @@ -157,7 +157,7 @@ public class GetFavoriteSanityTests extends RestTest UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); siteManager.setPassword("wrongPassword"); restClient.authenticateUser(siteManager) - .onCoreAPI() + .withCoreAPI() .usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) .getFavorite(siteModel.getGuid()); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java index 40b710cf5..cf64d0956 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java @@ -43,8 +43,8 @@ public class GetFavoritesSanityTests extends RestTest secondFileModel = dataContent.usingUser(adminUserModel).usingResource(firstFolderModel).createContent(DocumentType.TEXT_PLAIN); - firstSiteModel.setGuid(restClient.authenticateUser(adminUserModel).onCoreAPI().usingSite(firstSiteModel).getSite().getGuidWithoutVersion()); - secondSiteModel.setGuid(restClient.authenticateUser(adminUserModel).onCoreAPI().usingSite(secondSiteModel).getSite().getGuidWithoutVersion()); + firstSiteModel.setGuid(restClient.authenticateUser(adminUserModel).withCoreAPI().usingSite(firstSiteModel).getSite().getGuidWithoutVersion()); + secondSiteModel.setGuid(restClient.authenticateUser(adminUserModel).withCoreAPI().usingSite(secondSiteModel).getSite().getGuidWithoutVersion()); usersWithRoles = dataUser.addUsersWithRolesToSite(firstSiteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); @@ -54,9 +54,9 @@ 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 { - restClient.onCoreAPI().usingUser(adminUserModel).addSiteToFavorites(firstSiteModel); - restClient.onCoreAPI().usingUser(adminUserModel).addSiteToFavorites(secondSiteModel); - restClient.onCoreAPI() + restClient.withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(firstSiteModel); + restClient.withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(secondSiteModel); + restClient.withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) .and().entriesListContains("targetGuid", secondSiteModel.getGuid()); @@ -67,9 +67,9 @@ 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 { - restClient.onCoreAPI().usingUser(adminUserModel).addFolderToFavorites(firstFolderModel); - restClient.onCoreAPI().usingUser(adminUserModel).addFolderToFavorites(secondFolderModel); - restClient.onCoreAPI() + restClient.withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(firstFolderModel); + restClient.withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(secondFolderModel); + restClient.withCoreAPI() .usingAuthUser().where().targetFolderExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstFolderModel.getNodeRef()) .and().entriesListContains("targetGuid", secondFolderModel.getNodeRef()); @@ -80,9 +80,9 @@ 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 { - restClient.onCoreAPI().usingUser(adminUserModel).addFileToFavorites(firstFileModel); - restClient.onCoreAPI().usingUser(adminUserModel).addFileToFavorites(secondFileModel); - restClient.onCoreAPI() + restClient.withCoreAPI().usingUser(adminUserModel).addFileToFavorites(firstFileModel); + restClient.withCoreAPI().usingUser(adminUserModel).addFileToFavorites(secondFileModel); + restClient.withCoreAPI() .usingAuthUser().where().targetFileExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstFileModel.getNodeRefWithoutVersion()) .and().entriesListContains("targetGuid", secondFileModel.getNodeRefWithoutVersion()); @@ -94,10 +94,10 @@ public class GetFavoritesSanityTests extends RestTest public void managerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI() + restClient.withCoreAPI() .usingAuthUser().addSiteToFavorites(firstSiteModel); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); - restClient.onCoreAPI() + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); + restClient.withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid()); @@ -109,11 +109,11 @@ public class GetFavoritesSanityTests extends RestTest public void collaboratorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteToFavorites(firstSiteModel); - restClient.onCoreAPI() + restClient.withCoreAPI() .usingAuthUser().addSiteToFavorites(secondSiteModel); - restClient.onCoreAPI() + restClient.withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) .and().entriesListContains("targetGuid", secondSiteModel.getGuid()); @@ -125,10 +125,10 @@ public class GetFavoritesSanityTests extends RestTest public void contributorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteToFavorites(firstSiteModel); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); - restClient.onCoreAPI() + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); + restClient.withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()).and() .entriesListContains("targetGuid", secondSiteModel.getGuid()); @@ -140,10 +140,10 @@ public class GetFavoritesSanityTests extends RestTest public void consumerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteToFavorites(firstSiteModel); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); - restClient.onCoreAPI() + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); + restClient.withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites() .assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid()); @@ -155,7 +155,7 @@ public class GetFavoritesSanityTests extends RestTest public void userIsNotAbleToRetrieveFavoritesOfAnotherUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); @@ -166,7 +166,7 @@ public class GetFavoritesSanityTests extends RestTest public void userIsNotAbleToRetrieveFavoritesOfAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername())); @@ -177,7 +177,7 @@ public class GetFavoritesSanityTests extends RestTest public void adminIsNotAbleToRetrieveFavoritesOfAnotherUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary(String.format(ErrorModel.ENTITY_NOT_FOUND, usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); @@ -191,9 +191,9 @@ public class GetFavoritesSanityTests extends RestTest UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager); siteManager.setPassword("wrongPassword"); restClient.authenticateUser(siteManager) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteToFavorites(firstSiteModel); - restClient.onCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); + restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonSanityTests.java b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonSanityTests.java index 9d2abf403..9d8d40ebd 100644 --- a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonSanityTests.java @@ -36,7 +36,7 @@ public class RestGetNetworkForPersonSanityTests extends RestTest UserModel tenantUser = new UserModel("nonexisting", "password"); tenantUser.setDomain(adminTenantUser.getDomain()); restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingUser(tenantUser).getNetwork(adminTenantUser); + restClient.withCoreAPI().usingUser(tenantUser).getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -47,7 +47,7 @@ public class RestGetNetworkForPersonSanityTests extends RestTest public void adminTenantChecksIfNetworkIsPresent() throws Exception { restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingUser(adminTenantUser).getNetwork(); + restClient.withCoreAPI().usingUser(adminTenantUser).getNetwork(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -58,7 +58,7 @@ public class RestGetNetworkForPersonSanityTests extends RestTest public void tenantUserIsNotAuthorizedToCheckNetworkOfAdminUser() throws Exception { restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingUser(tenantUser).getNetwork(adminTenantUser); + restClient.withCoreAPI().usingUser(tenantUser).getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); } @@ -72,7 +72,7 @@ public class RestGetNetworkForPersonSanityTests extends RestTest restClient.usingTenant().createTenant(secondAdminTenantUser); UserModel secondTenantUser = dataUser.usingUser(adminTenantUser).createUserWithTenant("anotherTenant"); restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingUser(adminTenantUser).getNetwork(secondTenantUser); + restClient.withCoreAPI().usingUser(adminTenantUser).getNetwork(secondTenantUser); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); } } diff --git a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkTest.java b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkTest.java index 23ef6c5b9..bc658edc0 100644 --- a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkTest.java +++ b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkTest.java @@ -46,7 +46,7 @@ public class RestGetNetworkTest extends RestTest UserModel tenantUser = new UserModel("nonexisting", "password"); tenantUser.setDomain(adminTenantUser.getDomain()); restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -56,7 +56,7 @@ public class RestGetNetworkTest extends RestTest public void adminTenantChecksIfNetworkIsPresent() throws Exception { restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(); + restClient.withCoreAPI().usingNetworks().getNetwork(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -65,7 +65,7 @@ public class RestGetNetworkTest extends RestTest public void adminTenantChecksNetworkParamsAreCorrect() throws Exception { restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork().assertNetworkHasName(adminTenantUser).assertNetworkIsEnabled(); + restClient.withCoreAPI().usingNetworks().getNetwork().assertNetworkHasName(adminTenantUser).assertNetworkIsEnabled(); } @TestRail(section = { TestGroup.REST_API, @@ -73,7 +73,7 @@ public class RestGetNetworkTest extends RestTest public void adminTenantChecksIfNonExistingNetworkIsNotFound() throws Exception { restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(UserModel.getRandomTenantUser()); + restClient.withCoreAPI().usingNetworks().getNetwork(UserModel.getRandomTenantUser()); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); } @@ -82,7 +82,7 @@ public class RestGetNetworkTest extends RestTest public void adminTenantChecksIfAnotherExistingNetworkIsForbidden() throws Exception { restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminAnotherTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminAnotherTenantUser); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -90,7 +90,7 @@ public class RestGetNetworkTest extends RestTest public void userTenantChecksIfNetworkIsPresent() throws Exception { restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -99,7 +99,7 @@ public class RestGetNetworkTest extends RestTest public void userTenantChecksNetworkParamsAreCorrect() throws Exception { restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser).assertNetworkHasName(adminTenantUser).assertNetworkIsEnabled(); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser).assertNetworkHasName(adminTenantUser).assertNetworkIsEnabled(); } @TestRail(section = { TestGroup.REST_API, @@ -107,7 +107,7 @@ public class RestGetNetworkTest extends RestTest public void userTenantChecksIfNonExistingNetworkIsNotFound() throws Exception { restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(UserModel.getRandomTenantUser()); + restClient.withCoreAPI().usingNetworks().getNetwork(UserModel.getRandomTenantUser()); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); } @@ -117,7 +117,7 @@ public class RestGetNetworkTest extends RestTest public void userTenantChecksIfAnotherExistingNetworkIsForbidden() throws Exception { restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminAnotherTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminAnotherTenantUser); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -130,7 +130,7 @@ public class RestGetNetworkTest extends RestTest dataUser.usingUser(adminTenantUser).addUserToSite(managerTenantUser, site, UserRole.SiteManager); restClient.authenticateUser(managerTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -143,7 +143,7 @@ public class RestGetNetworkTest extends RestTest dataUser.usingUser(adminTenantUser).addUserToSite(collaboratorTenantUser, site, UserRole.SiteCollaborator); restClient.authenticateUser(collaboratorTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -156,7 +156,7 @@ public class RestGetNetworkTest extends RestTest dataUser.usingUser(adminTenantUser).addUserToSite(consumerTenantUser, site, UserRole.SiteConsumer); restClient.authenticateUser(consumerTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -169,7 +169,7 @@ public class RestGetNetworkTest extends RestTest dataUser.usingUser(adminTenantUser).addUserToSite(contributorTenantUser, site, UserRole.SiteContributor); restClient.authenticateUser(contributorTenantUser); - restClient.onCoreAPI().usingNetworks().getNetwork(adminTenantUser); + restClient.withCoreAPI().usingNetworks().getNetwork(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.OK); } } diff --git a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworksForPersonSanityTests.java b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworksForPersonSanityTests.java index 539d5d13b..267c5fa11 100644 --- a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworksForPersonSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworksForPersonSanityTests.java @@ -37,7 +37,7 @@ public class RestGetNetworksForPersonSanityTests extends RestTest UserModel tenantUser = new UserModel("nonexisting", "password"); tenantUser.setDomain(adminTenantUser.getDomain()); restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingUser(tenantUser).getNetworks(adminTenantUser); + restClient.withCoreAPI().usingUser(tenantUser).getNetworks(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -48,7 +48,7 @@ public class RestGetNetworksForPersonSanityTests extends RestTest public void adminTenantChecksIfNetworkIsPresent() throws Exception { restClient.authenticateUser(adminTenantUser); - restClient.onCoreAPI().usingUser(adminTenantUser).getNetworks(); + restClient.withCoreAPI().usingUser(adminTenantUser).getNetworks(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -59,7 +59,7 @@ public class RestGetNetworksForPersonSanityTests extends RestTest public void tenantUserIsNotAuthorizedToCheckNetworkOfAdminUser() throws Exception { restClient.authenticateUser(tenantUser); - restClient.onCoreAPI().usingUser(tenantUser).getNetworks(adminTenantUser); + restClient.withCoreAPI().usingUser(tenantUser).getNetworks(adminTenantUser); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); } @@ -73,7 +73,7 @@ public class RestGetNetworksForPersonSanityTests extends RestTest restClient.usingTenant().createTenant(secondAdminTenantUser); UserModel secondTenantUser = dataUser.usingUser(adminTenantUser).createUserWithTenant("anotherTenant"); restClient.authenticateUser(secondAdminTenantUser); - restClient.onCoreAPI().usingUser(secondAdminTenantUser).getNetworks(secondTenantUser); + restClient.withCoreAPI().usingUser(secondAdminTenantUser).getNetworks(secondTenantUser); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); } } diff --git a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java index 6ec92508a..407eddb34 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddFavoriteSiteSanityTests.java @@ -33,13 +33,13 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(managerUser) .addFavoriteSite(siteModel) .assertThat().field("id").is(siteModel.getId()); restClient.assertStatusCodeIs(HttpStatus.CREATED); - restClient.onCoreAPI().usingUser(managerUser).addFavoriteSite(siteModel); + restClient.withCoreAPI().usingUser(managerUser).addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.CONFLICT); restClient.assertLastError().containsSummary(String.format("%s is already a favourite site", siteModel.getId())); } @@ -51,7 +51,7 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addFavoriteSite(siteModel) .assertThat().field("id").is(siteModel.getId()); @@ -65,7 +65,7 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addFavoriteSite(siteModel) .assertThat().field("id").is(siteModel.getId()); @@ -79,7 +79,7 @@ public class AddFavoriteSiteSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addFavoriteSite(siteModel) .assertThat().field("id").is(siteModel.getId()); @@ -92,7 +92,7 @@ public class AddFavoriteSiteSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addFavoriteSite(siteModel) .assertThat().field("id").is(siteModel.getId()); @@ -108,7 +108,7 @@ public class AddFavoriteSiteSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addFavoriteSite(siteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); diff --git a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java index 98c29394f..0478dd9be 100644 --- a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java @@ -48,7 +48,7 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).addSiteMembershipRequest(siteModel) .assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); @@ -63,7 +63,7 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).addSiteMembershipRequest(siteModel) .assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); @@ -78,7 +78,7 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).addSiteMembershipRequest(siteModel) .assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); @@ -93,7 +93,7 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).addSiteMembershipRequest(siteModel) .assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); @@ -108,7 +108,7 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).addSiteMembershipRequest(siteModel) .assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); @@ -123,7 +123,7 @@ public class AddSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(new UserModel("random user", "random password")) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).addSiteMembershipRequest(siteModel) .assertThat().field("id").isNotEmpty() .assertThat().field("site").isNotEmpty(); diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java index 263cbc7b2..611ab31eb 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteFavoriteSiteSanityTests.java @@ -42,7 +42,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); @@ -59,7 +59,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -75,7 +75,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -91,7 +91,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -107,7 +107,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest dataSite.usingUser(anyUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -123,7 +123,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest dataSite.usingUser(anotherUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(userAuth) - .onCoreAPI() + .withCoreAPI() .usingUser(anotherUser).removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -141,7 +141,7 @@ public class DeleteFavoriteSiteSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().removeFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java index 53a575224..5ad27944f 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java @@ -44,10 +44,10 @@ public class DeleteSiteMemberSanityTests extends RestTest UserModel newUser = dataUser.createRandomTestUser("testUser"); newUser.setUserRole(UserRole.SiteCollaborator); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingSite(siteModel).addPerson(newUser); - restClient.onCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); + restClient.withCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -59,10 +59,10 @@ public class DeleteSiteMemberSanityTests extends RestTest UserModel newUser = dataUser.createRandomTestUser("testUser"); newUser.setUserRole(UserRole.SiteCollaborator); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingSite(siteModel).addPerson(newUser); - restClient.onCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); + restClient.withCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -75,11 +75,11 @@ public class DeleteSiteMemberSanityTests extends RestTest UserModel newUser = dataUser.createRandomTestUser("testUser"); newUser.setUserRole(UserRole.SiteCollaborator); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingSite(siteModel).addPerson(newUser); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); + restClient.withCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -93,11 +93,11 @@ public class DeleteSiteMemberSanityTests extends RestTest UserModel newUser = dataUser.createRandomTestUser("testUser"); newUser.setUserRole(UserRole.SiteCollaborator); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingSite(siteModel).addPerson(newUser); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); + restClient.withCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -111,11 +111,11 @@ public class DeleteSiteMemberSanityTests extends RestTest UserModel newUser = dataUser.createRandomTestUser("testUser"); newUser.setUserRole(UserRole.SiteCollaborator); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingSite(siteModel).addPerson(newUser); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); + restClient.withCoreAPI().usingUser(newUser).deleteSiteMember(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -127,7 +127,7 @@ public class DeleteSiteMemberSanityTests extends RestTest { restClient.authenticateUser(new UserModel("random user", "random password")); - restClient.onCoreAPI().usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).deleteSiteMember(siteModel); + restClient.withCoreAPI().usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).deleteSiteMember(siteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java index 1aad5da63..ee0142301 100644 --- a/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/DeleteSiteMembershipRequestSanityTests.java @@ -47,11 +47,11 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest { siteMember = dataUser.createRandomTestUser(); restClient.authenticateUser(siteMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingUser(siteMember).deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -64,10 +64,10 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest { siteMember = dataUser.createRandomTestUser(); restClient.authenticateUser(siteMember) - .onCoreAPI() + .withCoreAPI() .usingUser(siteMember).addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -80,12 +80,12 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest { siteMember = dataUser.createRandomTestUser(); restClient.authenticateUser(siteMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); restClient.authenticateUser(dataUser.getAdminUser()) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); } @@ -98,10 +98,10 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest { siteMember = dataUser.createRandomTestUser(); restClient.authenticateUser(siteMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -114,11 +114,11 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest { siteMember = dataUser.createRandomTestUser(); restClient.authenticateUser(siteMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -132,10 +132,10 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest { siteMember = dataUser.createRandomTestUser(); restClient.authenticateUser(siteMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -148,11 +148,11 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest public void randomUserCanDeleteSiteMembershipRequest() throws JsonToModelConversionException, DataPreparationException, Exception { restClient.authenticateUser(dataUser.createRandomTestUser()) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.authenticateUser(dataUser.createRandomTestUser()) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) .assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); @@ -164,11 +164,11 @@ public class DeleteSiteMembershipRequestSanityTests extends RestTest public void unauthenticatedUserIsNotAuthorizedToDeleteSiteMmebershipRequest() throws JsonToModelConversionException, Exception { restClient.authenticateUser(dataUser.createRandomTestUser()) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); UserModel inexistentUser = new UserModel("inexistent user", "inexistent password"); restClient.authenticateUser(inexistentUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().deleteSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java index 0bcdb34b6..c3506f6d8 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSiteSanityTests.java @@ -46,7 +46,7 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSite(siteModel1) .assertThat().field("id").is(siteModel1.getId()) .and().field("title").isNotNull(); @@ -64,7 +64,7 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSite(siteModel1) .assertThat().field("id").is(siteModel1.getId()) .and().field("title").isNotNull(); @@ -82,7 +82,7 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSite(siteModel1) .assertThat().field("id").is(siteModel1.getId()) .and().field("title").isNotNull(); @@ -100,7 +100,7 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSite(siteModel1) .assertThat().field("id").is(siteModel1.getId()) .and().field("title").isNotNull(); @@ -118,7 +118,7 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(anyUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(adminUset) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSite(siteModel1) .assertThat().field("id").is(siteModel1.getId()) .and().field("title").isNotNull(); @@ -136,7 +136,7 @@ public class GetFavoriteSiteSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel2).addSiteToFavorites(); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(userModel).getFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -154,7 +154,7 @@ public class GetFavoriteSiteSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSite(siteModel1); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java index 1e1bbafc2..7a7affa26 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java @@ -38,7 +38,7 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(anotherUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(anotherUser).getFavoriteSites(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -55,7 +55,7 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingUser(contributorUser).getFavoriteSites(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -72,7 +72,7 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(contributorUser2).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingUser(contributorUser2).getFavoriteSites(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -89,7 +89,7 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(collaboratorUser).getFavoriteSites(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED); } @@ -104,7 +104,7 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(anotherUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(anotherUser).getFavoriteSites() .assertThat().entriesListIsNotEmpty() .and().paginationExist() @@ -121,7 +121,7 @@ public class GetFavoriteSitesSanityTests extends RestTest dataSite.usingUser(anyUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(anyUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSites() .assertThat().entriesListIsNotEmpty() .and().entriesListContains("id", siteModel.getId()) @@ -140,7 +140,7 @@ public class GetFavoriteSitesSanityTests extends RestTest anyUser.setPassword("newpassword"); restClient.authenticateUser(anyUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getFavoriteSites(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java index 444c90486..08ec9333d 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java @@ -44,7 +44,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonActivities() .assertThat().entriesListIsNotEmpty() .and().entriesListContains("siteId", siteModel.getId()) @@ -62,7 +62,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataContent.usingUser(collaboratorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonActivities() .assertThat().entriesListIsNotEmpty() .and().entriesListContains("siteId", siteModel.getId()) @@ -80,7 +80,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataContent.usingUser(contributorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonActivities() .assertThat().entriesListIsNotEmpty() .and().entriesListContains("siteId", siteModel.getId()) @@ -97,7 +97,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonActivities() .assertThat().entriesListIsNotEmpty() .and().entriesListContains("siteId", siteModel.getId()) @@ -111,7 +111,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest public void adminUserShouldGetPeopleActivitiesList() throws Exception { restClient.authenticateUser(dataUser.getAdminUser()) - .onCoreAPI() + .withCoreAPI() .usingUser(userModel).getPersonActivities() .assertThat().entriesListIsNotEmpty() .and().entriesListContains("siteId", siteModel.getId()) @@ -130,7 +130,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(userModel).getPersonActivities(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java index 3384c610f..62fbb93f8 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferenceSanityTests.java @@ -40,7 +40,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(managerUser) - .onCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .withCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .assertThat().field("id").is( PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .and().field("value").is("true"); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -54,7 +54,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser) - .onCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .withCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .and().field("value").is("true"); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -68,7 +68,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(contributorUser) - .onCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .withCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .and().field("value").is("true"); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -82,7 +82,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(consumerUser) - .onCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .withCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .and().field("value").is("true"); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -95,7 +95,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest dataSite.usingUser(adminUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(adminUser) - .onCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) + .withCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .assertThat().field("id").is(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()) .and().field("value").is("true"); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -111,7 +111,7 @@ public class GetPeoplePreferenceSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); + .withCoreAPI().usingAuthUser().getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java index 4f18d0f51..5e3377a15 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeoplePreferencesSanityTests.java @@ -42,7 +42,7 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(managerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .getPersonPreferences().assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() @@ -60,7 +60,7 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(collaboratorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonPreferences().assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); @@ -77,7 +77,7 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(contributorUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonPreferences().assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); @@ -94,7 +94,7 @@ public class GetPeoplePreferencesSanityTests extends RestTest dataSite.usingUser(consumerUser).usingSite(siteModel).addSiteToFavorites(); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().getPersonPreferences().assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); @@ -112,7 +112,7 @@ public class GetPeoplePreferencesSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(managerUser).getPersonPreferences().assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().entriesListContains("id", PreferenceName.SITES_FAVORITES_PREFIX + siteModel.getId()); @@ -131,7 +131,7 @@ public class GetPeoplePreferencesSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .getPersonPreferences(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java index c8e9c4603..f2e22ccfb 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleSanityTests.java @@ -38,7 +38,7 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(searchedUser) .getPerson() .assertThat().field("id").is(searchedUser.getUsername()) @@ -57,7 +57,7 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingUser(searchedUser) .getPerson() .assertThat().field("id").is(searchedUser.getUsername()) @@ -77,7 +77,7 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingUser(searchedUser) .getPerson() .assertThat().field("id").is(searchedUser.getUsername()) @@ -96,7 +96,7 @@ public class GetPeopleSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(searchedUser) .getPerson() .assertThat().field("id").is(searchedUser.getUsername()) @@ -114,7 +114,7 @@ public class GetPeopleSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(searchedUser) .getPerson() .assertThat().field("id").is(searchedUser.getUsername()) @@ -134,7 +134,7 @@ public class GetPeopleSanityTests extends RestTest UserModel searchedNonUser = new UserModel("nonexistinguser", DataUser.PASSWORD); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(searchedNonUser) .getPerson(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestSanityTests.java index 7a35afa96..de1a9f953 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestSanityTests.java @@ -48,11 +48,11 @@ public class GetSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); + restClient.withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -63,11 +63,11 @@ public class GetSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); + restClient.withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -78,11 +78,11 @@ public class GetSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); + restClient.withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -93,11 +93,11 @@ public class GetSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); + restClient.withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -108,11 +108,11 @@ public class GetSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); + restClient.withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -123,11 +123,11 @@ public class GetSiteMembershipRequestSanityTests extends RestTest { UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(new UserModel("random user", "random password")) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); + restClient.withCoreAPI().usingUser(newMember).getSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java index cebf576d4..0ba7a0fdc 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java @@ -35,7 +35,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -52,7 +52,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -67,7 +67,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); restClient.authenticateUser(collaboratorUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -82,7 +82,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); restClient.authenticateUser(contributorUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -97,7 +97,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); restClient.authenticateUser(consumerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -111,7 +111,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest UserModel adminUser = dataUser.getAdminUser(); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -127,7 +127,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest managerUser.setPassword("newpassword"); restClient.authenticateUser(managerUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -138,7 +138,7 @@ public class GetSiteMembershipRequestsSanityTests extends RestTest public void oneUserGetsItsOwnSiteMembershipRequestsWithSuccess() throws Exception { restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).getSiteMembershipRequests().assertThat().entriesListIsNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java index bbf110d06..48624edfb 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java @@ -38,7 +38,7 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteManagerCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSiteMembership(siteModel) .assertThat().field("role").is(UserRole.SiteManager) @@ -53,7 +53,7 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteCollaboratorCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSiteMembership(siteModel) .onSite() @@ -68,7 +68,7 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteContributorCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSiteMembership(siteModel) .assertThat().field("role").is(UserRole.SiteManager) @@ -81,7 +81,7 @@ public class GetSiteMembershipSanityTests extends RestTest public void siteConsumerCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSiteMembership(siteModel) .assertThat().field("role").is(UserRole.SiteManager) @@ -96,7 +96,7 @@ public class GetSiteMembershipSanityTests extends RestTest public void adminCanRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) .getSiteMembership(siteModel) .assertThat().field("role").is(UserRole.SiteManager) @@ -112,7 +112,7 @@ public class GetSiteMembershipSanityTests extends RestTest public void unauthenticatedUserCannotRetrieveSiteMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(new UserModel("random user", "random password")) - .onCoreAPI() + .withCoreAPI() .usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) .getSiteMembership(siteModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); diff --git a/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java index 99c6e09e8..a401110eb 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java @@ -36,7 +36,7 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteManagerIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSitesMembershipInformation() .assertThat().entriesListIsNotEmpty() @@ -51,7 +51,7 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteCollaboratorIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSitesMembershipInformation() .assertThat().entriesListIsNotEmpty() @@ -66,7 +66,7 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteContributorIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSitesMembershipInformation() .assertThat().entriesListIsNotEmpty() @@ -81,7 +81,7 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteConsumerIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingUser(adminUser) .getSitesMembershipInformation() .assertThat().entriesListIsNotEmpty() @@ -96,7 +96,7 @@ public class GetSitesMembershipInformationSanityTests extends RestTest public void siteAdminIsAbleToRetrieveSitesMembershipInformation() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) .getSitesMembershipInformation() .assertThat().entriesListIsNotEmpty() @@ -113,7 +113,7 @@ public class GetSitesMembershipInformationSanityTests extends RestTest { UserModel inexistentUser = new UserModel("inexistent user", "wrong password"); restClient.authenticateUser(inexistentUser) - .onCoreAPI() + .withCoreAPI() .usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) .getSitesMembershipInformation(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); diff --git a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java index 8591c4167..84133c073 100644 --- a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java @@ -53,10 +53,10 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteMembershipRequest(siteModel); - restClient.onCoreAPI().usingUser(newMember).updateSiteMembershipRequest(siteModel, updatedMessage) + restClient.withCoreAPI().usingUser(newMember).updateSiteMembershipRequest(siteModel, updatedMessage) .assertMembershipRequestMessageIs(updatedMessage) .and().field("id").is(siteModel.getId()) .and().field("modifiedAt").isNotEmpty(); @@ -71,12 +71,12 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).updateSiteMembershipRequest(siteModel, updatedMessage); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) @@ -91,12 +91,12 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .updateSiteMembershipRequest(siteModel, updatedMessage); @@ -112,11 +112,11 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser().addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember).updateSiteMembershipRequest(siteModel, updatedMessage); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN) @@ -131,12 +131,12 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteMembershipRequest(siteModel); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .updateSiteMembershipRequest(siteModel, updatedMessage); @@ -153,12 +153,12 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel otherMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteMembershipRequest(siteModel); restClient.authenticateUser(otherMember) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .updateSiteMembershipRequest(siteModel, updatedMessage); @@ -174,12 +174,12 @@ public class UpdateSiteMembershipRequestSanityTests extends RestTest UserModel newMember = dataUser.createRandomTestUser(); restClient.authenticateUser(newMember) - .onCoreAPI() + .withCoreAPI() .usingAuthUser() .addSiteMembershipRequest(siteModel); restClient.authenticateUser(adminUser) - .onCoreAPI() + .withCoreAPI() .usingUser(newMember) .updateSiteMembershipRequest(siteModel, updatedMessage); diff --git a/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java b/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java index aad8bed11..777dd778c 100644 --- a/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/ratings/AddRatingSanityTests.java @@ -54,7 +54,7 @@ public class AddRatingSanityTests extends RestTest public void managerIsAbleToLikeDocument() throws Exception { returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI().usingResource(document).likeDocument(); + .withCoreAPI().usingResource(document).likeDocument(); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("true") @@ -67,7 +67,7 @@ public class AddRatingSanityTests extends RestTest public void collaboratorIsAbleToLikeDocument() throws Exception { returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().usingResource(document).likeDocument(); + .withCoreAPI().usingResource(document).likeDocument(); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("true") @@ -79,7 +79,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify user with Contributor role is able to post like rating to a document") public void contributorIsAbleToLikeDocument() throws Exception { - returnedRatingModel =restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)).onCoreAPI().usingResource(document).likeDocument(); + returnedRatingModel =restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)).withCoreAPI().usingResource(document).likeDocument(); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("true") @@ -91,7 +91,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify user with Consumer role is able to post like rating to a document") public void consumerIsAbleToLikeDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).onCoreAPI().usingResource(document).likeDocument(); + returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).withCoreAPI().usingResource(document).likeDocument(); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("true") @@ -103,7 +103,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify admin user is able to post like rating to a document") public void adminIsAbleToLikeDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(adminUser).onCoreAPI().usingResource(document).likeDocument(); + returnedRatingModel = restClient.authenticateUser(adminUser).withCoreAPI().usingResource(document).likeDocument(); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("true") @@ -116,7 +116,7 @@ public class AddRatingSanityTests extends RestTest @Bug(id = "MNT-16904") public void unauthenticatedUserIsNotAbleToLikeDocument() throws Exception { - restClient.authenticateUser(new UserModel("random user", "random password")).onCoreAPI().usingResource(document).likeDocument(); + restClient.authenticateUser(new UserModel("random user", "random password")).withCoreAPI().usingResource(document).likeDocument(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -124,7 +124,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify user with Manager role is able to post stars rating to a document") public void managerIsAbleToAddStarsToDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)).onCoreAPI().usingResource(document).rateStarsToDocument(5); + returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)).withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("5") .and().field("id").is("fiveStar") @@ -135,7 +135,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify user with Collaborator role is able to post stars rating to a document") public void collaboratorIsAbleToAddStarsToDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).onCoreAPI().usingResource(document).rateStarsToDocument(5); + returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("5") .and().field("id").is("fiveStar") @@ -147,7 +147,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify user with Contributor role is able to post stars rating to a document") public void contributorIsAbleToAddStarsToDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)).onCoreAPI().usingResource(document).rateStarsToDocument(5); + returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)).withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("5") .and().field("id").is("fiveStar") @@ -158,7 +158,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify user with Consumer role is able to post stars rating to a document") public void consumerIsAbleToAddStarsToDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).onCoreAPI().usingResource(document).rateStarsToDocument(5); + returnedRatingModel = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is("5") .and().field("id").is("fiveStar") @@ -169,7 +169,7 @@ public class AddRatingSanityTests extends RestTest TestGroup.RATINGS }, executionType = ExecutionType.SANITY, description = "Verify admin user is able to post stars rating to a document") public void adminIsAbleToAddStarsToDocument() throws Exception { - returnedRatingModel = restClient.authenticateUser(adminUser).onCoreAPI().usingResource(document).rateStarsToDocument(3); + returnedRatingModel = restClient.authenticateUser(adminUser).withCoreAPI().usingResource(document).rateStarsToDocument(3); restClient.assertStatusCodeIs(HttpStatus.CREATED); returnedRatingModel.assertThat().field("myRating").is(String.valueOf(3)) .and().field("id").is("fiveStar") @@ -181,7 +181,7 @@ public class AddRatingSanityTests extends RestTest @Bug(id = "MNT-16904") public void unauthenticatedUserIsNotAbleToRateStarsToDocument() throws Exception { - restClient.authenticateUser(new UserModel("random user", "random password")).onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.authenticateUser(new UserModel("random user", "random password")).withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java b/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java index ae89140d8..5b21b39fb 100644 --- a/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingSanityTests.java @@ -51,16 +51,16 @@ public class DeleteRatingSanityTests extends RestTest public void managerIsAbleToDeleteItsOwnRatings() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restClient.onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - returnedRatingModelCollection = restClient.onCoreAPI().usingResource(document).getRatings(); + returnedRatingModelCollection = restClient.withCoreAPI().usingResource(document).getRatings(); restClient.assertStatusCodeIs(HttpStatus.OK); returnedRatingModelCollection.assertNodeIsNotLiked() .assertNodeHasNoFiveStarRating() @@ -74,16 +74,16 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restClient.onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - returnedRatingModelCollection = restClient.onCoreAPI().usingResource(document).getRatings(); + returnedRatingModelCollection = restClient.withCoreAPI().usingResource(document).getRatings(); restClient.assertStatusCodeIs(HttpStatus.OK); returnedRatingModelCollection.assertNodeIsNotLiked() .assertNodeHasNoFiveStarRating() @@ -97,16 +97,16 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restClient.onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - returnedRatingModelCollection = restClient.onCoreAPI().usingResource(document).getRatings(); + returnedRatingModelCollection = restClient.withCoreAPI().usingResource(document).getRatings(); restClient.assertStatusCodeIs(HttpStatus.OK); returnedRatingModelCollection.assertNodeIsNotLiked() .assertNodeHasNoFiveStarRating() @@ -120,16 +120,16 @@ public class DeleteRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restClient.onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - returnedRatingModelCollection = restClient.onCoreAPI().usingResource(document).getRatings(); + returnedRatingModelCollection = restClient.withCoreAPI().usingResource(document).getRatings(); restClient.assertStatusCodeIs(HttpStatus.OK); returnedRatingModelCollection.assertNodeIsNotLiked() .assertNodeHasNoFiveStarRating() @@ -145,16 +145,16 @@ public class DeleteRatingSanityTests extends RestTest restClient.authenticateUser(adminUser); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restClient.onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - returnedRatingModelCollection = restClient.onCoreAPI().usingResource(document).getRatings(); + returnedRatingModelCollection = restClient.withCoreAPI().usingResource(document).getRatings(); restClient.assertStatusCodeIs(HttpStatus.OK); returnedRatingModelCollection.assertNodeIsNotLiked() .assertNodeHasNoFiveStarRating() @@ -169,15 +169,15 @@ public class DeleteRatingSanityTests extends RestTest document = dataContent.usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)).usingResource(folderModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(adminUser); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.authenticateUser(new UserModel("random user", "random password")); - restClient.onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } @@ -191,15 +191,15 @@ public class DeleteRatingSanityTests extends RestTest restClient.authenticateUser(userA); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.authenticateUser(userB); - restClient.authenticateUser(userB).onCoreAPI().usingResource(document).deleteLikeRating(); + restClient.authenticateUser(userB).withCoreAPI().usingResource(document).deleteLikeRating(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); - restClient.onCoreAPI().usingResource(document).deleteFiveStarRating(); + restClient.withCoreAPI().usingResource(document).deleteFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java b/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java index ee1ee5026..1529d25f5 100644 --- a/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/ratings/GetRatingSanityTests.java @@ -53,14 +53,14 @@ public class GetRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restRatingModel = restClient.onCoreAPI().usingResource(document).getLikeRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getLikeRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("likes").and().field("myRating").is("true"); - restRatingModel = restClient.onCoreAPI().usingResource(document).getFiveStarRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("fiveStar").and().field("myRating").is("5"); } @@ -71,14 +71,14 @@ public class GetRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restRatingModel = restClient.onCoreAPI().usingResource(document).getLikeRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getLikeRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("likes").and().field("myRating").is("true"); - restRatingModel = restClient.onCoreAPI().usingResource(document).getFiveStarRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("fiveStar").and().field("myRating").is("5"); } @@ -89,14 +89,14 @@ public class GetRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restRatingModel = restClient.onCoreAPI().usingResource(document).getLikeRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getLikeRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("likes").and().field("myRating").is("true"); - restRatingModel = restClient.onCoreAPI().usingResource(document).getFiveStarRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("fiveStar").and().field("myRating").is("5"); } @@ -107,14 +107,14 @@ public class GetRatingSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restRatingModel = restClient.onCoreAPI().usingResource(document).getLikeRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getLikeRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("likes").and().field("myRating").is("true"); - restRatingModel = restClient.onCoreAPI().usingResource(document).getFiveStarRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("fiveStar").and().field("myRating").is("5"); } @@ -126,14 +126,14 @@ public class GetRatingSanityTests extends RestTest document = dataContent.usingUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)).usingResource(folderModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(adminUser); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); - restRatingModel = restClient.onCoreAPI().usingResource(document).getLikeRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getLikeRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("likes").and().field("myRating").is("true"); - restRatingModel = restClient.onCoreAPI().usingResource(document).getFiveStarRating(); + restRatingModel = restClient.withCoreAPI().usingResource(document).getFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.OK); restRatingModel.assertThat().field("id").is("fiveStar").and().field("myRating").is("5"); } @@ -144,15 +144,15 @@ public class GetRatingSanityTests extends RestTest public void unauthenticatedUserIsNotAbleToRetrieveRating() throws Exception { restClient.authenticateUser(adminUser); - restClient.onCoreAPI().usingResource(document).likeDocument(); - restClient.onCoreAPI().usingResource(document).rateStarsToDocument(5); + restClient.withCoreAPI().usingResource(document).likeDocument(); + restClient.withCoreAPI().usingResource(document).rateStarsToDocument(5); restClient.authenticateUser(new UserModel("random user", "random password")); - restClient.onCoreAPI().usingResource(document).getLikeRating(); + restClient.withCoreAPI().usingResource(document).getLikeRating(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastError().containsSummary(ErrorModel.AUTHENTICATION_FAILED); - restClient.onCoreAPI().usingResource(document).getFiveStarRating(); + restClient.withCoreAPI().usingResource(document).getFiveStarRating(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastError().containsSummary(ErrorModel.AUTHENTICATION_FAILED); } } \ No newline at end of file diff --git a/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java index 0d399f2a9..62c24caff 100644 --- a/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/AddSiteMemberSanityTests.java @@ -40,7 +40,7 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingSite(siteModel).addPerson(testUser) + restClient.withCoreAPI().usingSite(siteModel).addPerson(testUser) .assertThat().field("id").is(testUser.getUsername()) .and().field("role").is(testUser.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -53,7 +53,7 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().usingSite(siteModel).addPerson(testUser); + .withCoreAPI().usingSite(siteModel).addPerson(testUser); restClient.assertLastError().containsSummary("Permission was denied"); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); @@ -66,7 +66,7 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI().usingSite(siteModel).addPerson(testUser); + .withCoreAPI().usingSite(siteModel).addPerson(testUser); restClient.assertLastError().containsSummary("Permission was denied"); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -78,7 +78,7 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().usingSite(siteModel).addPerson(testUser); + .withCoreAPI().usingSite(siteModel).addPerson(testUser); restClient.assertLastError().containsSummary("Permission was denied"); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); } @@ -90,7 +90,7 @@ public class AddSiteMemberSanityTests extends RestTest UserModel testUser = dataUser.createRandomTestUser("testUser"); testUser.setUserRole(UserRole.SiteConsumer); restClient.authenticateUser(adminUserModel) - .onCoreAPI().usingSite(siteModel).addPerson(testUser) + .withCoreAPI().usingSite(siteModel).addPerson(testUser) .and().field("id").is(testUser.getUsername()) .and().field("role").is(testUser.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.CREATED); @@ -104,7 +104,7 @@ public class AddSiteMemberSanityTests extends RestTest testUser.setUserRole(UserRole.SiteConsumer); UserModel inexistentUser = new UserModel("inexistent user", "inexistent password"); restClient.authenticateUser(inexistentUser) - .onCoreAPI().usingSite(siteModel).addPerson(testUser); + .withCoreAPI().usingSite(siteModel).addPerson(testUser); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java index da6df431b..45478751d 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java @@ -40,8 +40,8 @@ public class GetSiteContainerSanityTests extends RestTest public void getSiteContainerWithManagerRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteContainerModel = restClient.onCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) + siteContainerModel = restClient.withCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); + restClient.withCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) .assertThat().field("id").is(siteContainerModel.onModel().getId()) .and().field("folderId").is(siteContainerModel.onModel().getFolderId()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -52,8 +52,8 @@ public class GetSiteContainerSanityTests extends RestTest public void getSiteContainerWithCollaboratorRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - siteContainerModel = restClient.onCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) + siteContainerModel = restClient.withCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); + restClient.withCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) .and().field("id").is(siteContainerModel.onModel().getId()) .and().field("folderId").is(siteContainerModel.onModel().getFolderId()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -64,8 +64,8 @@ public class GetSiteContainerSanityTests extends RestTest public void getSiteContainerWithContributorRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - siteContainerModel = restClient.onCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) + siteContainerModel = restClient.withCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); + restClient.withCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) .assertThat().field("id").is(siteContainerModel.onModel().getId()) .and().field("folderId").is(siteContainerModel.onModel().getFolderId()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -76,8 +76,8 @@ public class GetSiteContainerSanityTests extends RestTest public void getSiteContainerWithConsumerRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - siteContainerModel = restClient.onCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) + siteContainerModel = restClient.withCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); + restClient.withCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) .assertThat().field("id").is(siteContainerModel.onModel().getId()) .and().field("folderId").is(siteContainerModel.onModel().getFolderId()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -88,8 +88,8 @@ public class GetSiteContainerSanityTests extends RestTest public void getSiteContainerWithAdminUser() throws Exception { restClient.authenticateUser(adminUserModel); - siteContainerModel = restClient.onCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) + siteContainerModel = restClient.withCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); + restClient.withCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()) .assertThat().field("id").is(siteContainerModel.onModel().getId()) .and().field("folderId").is(siteContainerModel.onModel().getFolderId()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -102,12 +102,12 @@ public class GetSiteContainerSanityTests extends RestTest public void unauthenticatedUserIsNotAuthorizedToRetrieveSiteContainer() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - siteContainerModel = restClient.onCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); + siteContainerModel = restClient.withCoreAPI().usingSite(siteModel).getSiteContainers().getOneRandomEntry(); userModel = dataUser.createRandomTestUser(); userModel.setPassword("user wrong password"); dataUser.addUserToSite(userModel, siteModel, UserRole.SiteManager); restClient.authenticateUser(userModel) - .onCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()); + .withCoreAPI().usingSite(siteModel).getSiteContainer(siteContainerModel.onModel()); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java index 9640b97a2..a4b7cddb1 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteContainersSanityTests.java @@ -47,7 +47,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainers() + restClient.withCoreAPI().usingSite(siteModel).getSiteContainers() .assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().paginationField("count").isNot("0"); @@ -59,7 +59,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainers() + restClient.withCoreAPI().usingSite(siteModel).getSiteContainers() .assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().paginationField("count").isNot("0"); @@ -71,7 +71,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainers() + restClient.withCoreAPI().usingSite(siteModel).getSiteContainers() .assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().paginationField("count").isNot("0"); @@ -83,7 +83,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainers() + restClient.withCoreAPI().usingSite(siteModel).getSiteContainers() .assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().paginationField("count").isNot("0"); @@ -95,7 +95,7 @@ public class GetSiteContainersSanityTests extends RestTest public void getSiteContainersWithAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel); - restClient.onCoreAPI().usingSite(siteModel).getSiteContainers() + restClient.withCoreAPI().usingSite(siteModel).getSiteContainers() .assertThat().entriesListIsNotEmpty() .assertThat().paginationExist() .and().paginationField("count").isNot("0"); @@ -111,7 +111,7 @@ public class GetSiteContainersSanityTests extends RestTest userModel.setPassword("user wrong password"); dataUser.addUserToSite(userModel, siteModel, UserRole.SiteManager); restClient.authenticateUser(userModel) - .onCoreAPI().usingSite(siteModel).getSiteContainers(); + .withCoreAPI().usingSite(siteModel).getSiteContainers(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java index c9fdb171c..719950e32 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteMemberSanityTests.java @@ -42,7 +42,7 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithManagerRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingSite(siteModel).getSiteMember(userModel) + restClient.withCoreAPI().usingSite(siteModel).getSiteMember(userModel) .assertThat().field("id").is(userModel.getUsername()) .and().field("role").is(userModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -53,7 +53,7 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithCollaboratorRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingSite(siteModel).getSiteMember(userModel) + restClient.withCoreAPI().usingSite(siteModel).getSiteMember(userModel) .and().field("id").is(userModel.getUsername()) .and().field("role").is(userModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -64,7 +64,7 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithContributorRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingSite(siteModel).getSiteMember(userModel) + restClient.withCoreAPI().usingSite(siteModel).getSiteMember(userModel) .and().field("id").is(userModel.getUsername()) .and().field("role").is(userModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -75,7 +75,7 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithConsumerRole() throws Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); - restClient.onCoreAPI().usingSite(siteModel).getSiteMember(userModel) + restClient.withCoreAPI().usingSite(siteModel).getSiteMember(userModel) .and().field("id").is(userModel.getUsername()) .and().field("role").is(userModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -86,7 +86,7 @@ public class GetSiteMemberSanityTests extends RestTest public void getSiteMemberWithAdminUser() throws Exception { restClient.authenticateUser(adminUser); - restClient.onCoreAPI().usingSite(siteModel).getSiteMember(userModel) + restClient.withCoreAPI().usingSite(siteModel).getSiteMember(userModel) .and().field("id").is(userModel.getUsername()) .and().field("role").is(userModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -99,7 +99,7 @@ public class GetSiteMemberSanityTests extends RestTest { UserModel inexistentUser = new UserModel("inexistent user", "inexistent password"); restClient.authenticateUser(inexistentUser); - restClient.onCoreAPI().usingSite(siteModel).getSiteMember(userModel); + restClient.withCoreAPI().usingSite(siteModel).getSiteMember(userModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java index 6d8290986..acf806253 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteMembersSanityTests.java @@ -48,7 +48,7 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() + .withCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() .and().entriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteManager).getUsername()) .and().entriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteManager).getUserRole().toString()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -59,7 +59,7 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty().assertThat() + .withCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty().assertThat() .entriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUsername()).and() .entriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator).getUserRole().toString()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -70,7 +70,7 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() + .withCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() .and().entriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteContributor).getUsername()) .and().entriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteContributor).getUserRole().toString()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -81,7 +81,7 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() + .withCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() .and().entriesListContains("id", usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer).getUsername()) .and().entriesListContains("role", usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer).getUserRole().toString()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -92,7 +92,7 @@ public class GetSiteMembersSanityTests extends RestTest public void getSiteMembersWithAdminUser() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUser) - .onCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() + .withCoreAPI().usingSite(siteModel).getSiteMembers().assertThat().entriesListIsNotEmpty() .and().entriesListContains("id", adminUser.getUsername()) .when().assertThat().entriesListContains("role", "SiteManager"); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -107,7 +107,7 @@ public class GetSiteMembersSanityTests extends RestTest userModel.setPassword("user wrong password"); dataUser.addUserToSite(userModel, siteModel, UserRole.SiteManager); restClient.authenticateUser(userModel) - .onCoreAPI().usingSite(siteModel).getSiteMembers(); + .withCoreAPI().usingSite(siteModel).getSiteMembers(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java index 0db1549e9..e3afe1129 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSiteSanityTests.java @@ -50,7 +50,7 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithManagerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI().usingSite(siteModel) + .withCoreAPI().usingSite(siteModel) .getSite() .and().field("id").is(siteModel.getId()) .and().field("title").is(siteModel.getTitle()); @@ -63,7 +63,7 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithCollaboratorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().usingSite(siteModel) + .withCoreAPI().usingSite(siteModel) .getSite() .and().field("id").is(siteModel.getId()) .and().field("title").is(siteModel.getTitle()); @@ -75,7 +75,7 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithContributorRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI().usingSite(siteModel) + .withCoreAPI().usingSite(siteModel) .getSite() .and().field("id").is(siteModel.getId()) .and().field("title").is(siteModel.getTitle()); @@ -87,7 +87,7 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithConsumerRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().usingSite(siteModel) + .withCoreAPI().usingSite(siteModel) .getSite() .and().field("id").is(siteModel.getId()) .and().field("title").is(siteModel.getTitle()); @@ -99,7 +99,7 @@ public class GetSiteSanityTests extends RestTest public void getSiteWithAdminRole() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel) - .onCoreAPI().usingSite(siteModel) + .withCoreAPI().usingSite(siteModel) .getSite() .and().field("id").is(siteModel.getId()) .and().field("title").is(siteModel.getTitle()); @@ -115,7 +115,7 @@ public class GetSiteSanityTests extends RestTest userModel.setPassword("user wrong password"); dataUser.addUserToSite(userModel, siteModel, UserRole.SiteManager); restClient.authenticateUser(userModel).withParams("maxItems=10000") - .onCoreAPI() + .withCoreAPI() .getSites(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java index 6b89c4515..3414c662c 100644 --- a/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/GetSitesSanityTests.java @@ -48,7 +48,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)) - .onCoreAPI().getSites() + .withCoreAPI().getSites() .assertThat().entriesListIsNotEmpty() .assertThat().entriesListContains("id", siteModel.getId()) .and().paginationExist(); @@ -60,7 +60,7 @@ public class GetSitesSanityTests extends RestTest public void collaboratorIsAbleToRetrieveSites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .onCoreAPI().getSites().assertThat().entriesListIsNotEmpty() + .withCoreAPI().getSites().assertThat().entriesListIsNotEmpty() .assertThat().entriesListContains("id", siteModel.getId()) .and().paginationExist(); @@ -73,7 +73,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .onCoreAPI().getSites() + .withCoreAPI().getSites() .assertThat().entriesListIsNotEmpty() .assertThat().entriesListContains("id", siteModel.getId()) .and().paginationExist(); @@ -86,7 +86,7 @@ public class GetSitesSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().getSites() + .withCoreAPI().getSites() .assertThat().entriesListIsNotEmpty() .assertThat().entriesListContains("id", siteModel.getId()) .and().paginationExist(); @@ -98,7 +98,7 @@ public class GetSitesSanityTests extends RestTest public void adminUserIsAbleToRetrieveSites() throws JsonToModelConversionException, Exception { restClient.authenticateUser(adminUserModel) - .onCoreAPI().getSites() + .withCoreAPI().getSites() .assertThat().entriesListIsNotEmpty() .assertThat().entriesListContains("id", siteModel.getId()) .and().paginationExist(); @@ -115,7 +115,7 @@ public class GetSitesSanityTests extends RestTest userModel.setPassword("user wrong password"); dataUser.addUserToSite(userModel, siteModel, UserRole.SiteManager); restClient.authenticateUser(userModel) - .onCoreAPI().getSites(); + .withCoreAPI().getSites(); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java index 27942c321..f0f5df579 100644 --- a/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/RemoveSiteMemberSanityTests.java @@ -49,9 +49,9 @@ public class RemoveSiteMemberSanityTests extends RestTest description = "Verify that site manager can delete site member and gets status code 204, 'No Content'") public void siteManagerIsAbleToDeleteSiteMember() throws Exception{ restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); - restClient.onCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().getSites().assertThat().entriesListDoesNotContain("id", testUserModel.getUsername()); + restClient.withCoreAPI().getSites().assertThat().entriesListDoesNotContain("id", testUserModel.getUsername()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -60,10 +60,10 @@ public class RemoveSiteMemberSanityTests extends RestTest description = "Verify that site collaborator cannot delete site member and gets status code 403, 'Forbidden'") public void siteCollaboratorIsNotAbleToDeleteSiteMember() throws Exception{ restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); - restClient.onCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); - restClient.onCoreAPI().getSites().assertThat().entriesListContains("id", testUserModel.getUsername()); + restClient.withCoreAPI().getSites().assertThat().entriesListContains("id", testUserModel.getUsername()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -72,10 +72,10 @@ public class RemoveSiteMemberSanityTests extends RestTest description = "Verify that site contributor cannot delete site member and gets status code 403, 'Forbidden'") public void siteContributorIsNotAbleToDeleteSiteMember() throws Exception{ restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); - restClient.onCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); - restClient.onCoreAPI().getSites().assertThat().entriesListContains("id", testUserModel.getUsername()); + restClient.withCoreAPI().getSites().assertThat().entriesListContains("id", testUserModel.getUsername()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -84,10 +84,10 @@ public class RemoveSiteMemberSanityTests extends RestTest description = "Verify that site consumer cannot delete site member and gets status code 403, 'Forbidden'") public void siteConsumerIsNotAbleToDeleteSiteMember() throws Exception{ restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .onCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); + .withCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); - restClient.onCoreAPI().getSites().assertThat().entriesListContains("id", testUserModel.getUsername()); + restClient.withCoreAPI().getSites().assertThat().entriesListContains("id", testUserModel.getUsername()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -95,10 +95,10 @@ public class RemoveSiteMemberSanityTests extends RestTest description = "Verify that admin user can delete site member and gets status code 204, 'No Content'") public void adminUserIsAbleToDeleteSiteMember() throws Exception{ restClient.authenticateUser(adminUserModel) - .onCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); + .withCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onCoreAPI().getSites().assertThat().entriesListDoesNotContain("id", testUserModel.getUsername()); + restClient.withCoreAPI().getSites().assertThat().entriesListDoesNotContain("id", testUserModel.getUsername()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -107,7 +107,7 @@ public class RemoveSiteMemberSanityTests extends RestTest public void unauthenticatedUserIsNotAuthorizedToDeleteSiteMember() throws Exception{ UserModel inexistentUser = new UserModel("inexistent user", "inexistent password"); restClient.authenticateUser(inexistentUser) - .onCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); + .withCoreAPI().usingSite(siteModel).deleteSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } diff --git a/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java b/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java index 297155c7e..e1dbdb1a8 100644 --- a/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/sites/UpdateSiteMemberSanityTests.java @@ -38,7 +38,7 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager)); testUserModel.setUserRole(UserRole.SiteConsumer); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel) + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel) .assertThat().field("id").is(testUserModel.getUsername()) .and().field("role").is(testUserModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -51,7 +51,7 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)); testUserModel.setUserRole(UserRole.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); restClient.assertLastError() .containsSummary(String.format("The current user does not have permissions to modify the membership details of the site %s.", siteModel.getTitle())); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); @@ -64,7 +64,7 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)); testUserModel.setUserRole(UserRole.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); restClient.assertLastError() .containsSummary(String.format("The current user does not have permissions to modify the membership details of the site %s.", siteModel.getTitle())); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); @@ -77,7 +77,7 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)); testUserModel.setUserRole(UserRole.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); restClient.assertLastError() .containsSummary(String.format("The current user does not have permissions to modify the membership details of the site %s.", siteModel.getTitle())); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); @@ -89,7 +89,7 @@ public class UpdateSiteMemberSanityTests extends RestTest { restClient.authenticateUser(adminUserModel); testUserModel.setUserRole(UserRole.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel) + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel) .assertThat().field("id").is(testUserModel.getUsername()) .and().field("role").is(testUserModel.getUserRole()); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -102,7 +102,7 @@ public class UpdateSiteMemberSanityTests extends RestTest UserModel inexistentUser = new UserModel("inexistent user", "inexistent password"); restClient.authenticateUser(inexistentUser); testUserModel.setUserRole(UserRole.SiteCollaborator); - restClient.onCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); + restClient.withCoreAPI().usingSite(siteModel).updateSiteMember(testUserModel); restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java index c5acd11dd..88ef91bc9 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java @@ -29,14 +29,14 @@ public class GetProcessDefinitionImageSanityTests extends RestWorkflowTest { testUser = dataUser.createRandomTestUser(); restClient.authenticateUser(dataUser.getAdminUser()); - randomProcessDefinition = restClient.onWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); + randomProcessDefinition = restClient.withWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); } @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESS_DEFINITION }, executionType = ExecutionType.SANITY, description = "Verify Any user gets a specific process definition image for non-network deployments using REST API and status code is OK (200)") public void anyUserGetsProcessDefinitionImage() throws Exception { restClient.authenticateUser(testUser); - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage() + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage() .assertResponseContainsImage(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -44,7 +44,7 @@ public class GetProcessDefinitionImageSanityTests extends RestWorkflowTest @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESS_DEFINITION }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets a specific process definition image for non-network deployments using REST API and status code is OK (200)") public void adminGetsProcessDefinitionImage() throws Exception { - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage() + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage() .assertResponseContainsImage(); restClient.assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java index 31ec535c9..308a2d92b 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java @@ -28,7 +28,7 @@ public class GetProcessDefinitionSanityTests extends RestWorkflowTest { testUser = dataUser.createRandomTestUser(); restClient.authenticateUser(dataUser.getAdminUser()); - randomProcessDefinition = restClient.onWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); + randomProcessDefinition = restClient.withWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); } @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESS_DEFINITION }, @@ -36,9 +36,9 @@ public class GetProcessDefinitionSanityTests extends RestWorkflowTest description = "Verify Admin user gets a specific process definition for non-network deployments using REST API and status code is OK (200)") public void adminGetsProcessDefinition() throws Exception { - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinition(). + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinition(). assertThat().field("name").is(randomProcessDefinition.onModel().getName()); - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinition().assertThat().field("name") + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinition().assertThat().field("name") .is(randomProcessDefinition.onModel().getName()); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -49,7 +49,7 @@ public class GetProcessDefinitionSanityTests extends RestWorkflowTest public void anyUserGetsProcessDefinition() throws Exception { restClient.authenticateUser(testUser); - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinition().assertThat().field("name") + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinition().assertThat().field("name") .is(randomProcessDefinition.onModel().getName()); restClient.assertStatusCodeIs(HttpStatus.OK); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java index 8365ce963..1fa8ff3b9 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java @@ -37,8 +37,8 @@ public class GetProcessDefinitionStartFormModelSanityTests extends RestWorkflowT description = "Verify Admin gets a model of the start form type definition for non-network deployments using REST API and status code is OK (200)") public void nonNetworkAdminGetsStartFormModel() throws Exception { - randomProcessDefinition = restClient.onWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionStartFormModel().assertThat().entriesListIsNotEmpty(); + randomProcessDefinition = restClient.withWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionStartFormModel().assertThat().entriesListIsNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } @@ -50,8 +50,8 @@ public class GetProcessDefinitionStartFormModelSanityTests extends RestWorkflowT { restClient.usingTenant().createTenant(adminTenantUser); restClient.authenticateUser(adminTenantUser); - randomProcessDefinition = restClient.onWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); - restClient.onWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionStartFormModel().assertThat().entriesListIsNotEmpty(); + randomProcessDefinition = restClient.withWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry(); + restClient.withWorkflowAPI().usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionStartFormModel().assertThat().entriesListIsNotEmpty(); restClient.assertStatusCodeIs(HttpStatus.OK); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java index 1c049439c..0bd9995ce 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java @@ -47,8 +47,8 @@ public class AddProcessItemSanityTests extends RestWorkflowTest document2 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN, "file content"); dataContent.usingSite(siteModel).createContent(document2); - processModel = restClient.authenticateUser(adminUser).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - processItem = restClient.onWorkflowAPI().usingProcess(processModel).addProcessItem(document2); + processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2); restClient.assertStatusCodeIs(HttpStatus.CREATED); processItem.assertThat().field("createdAt").isNotEmpty() .and().field("size").is(document2.getContent().length()) @@ -59,7 +59,7 @@ public class AddProcessItemSanityTests extends RestWorkflowTest .and().field("id").isNotEmpty() .and().field("mimeType").is(document2.getFileType().mimeType); - restClient.onWorkflowAPI().usingProcess(processModel).getProcessItems() + restClient.withWorkflowAPI().usingProcess(processModel).getProcessItems() .assertThat().entriesListContains("id", processItem.getId()); } @@ -70,8 +70,8 @@ public class AddProcessItemSanityTests extends RestWorkflowTest { document2 = dataContent.usingSite(siteModel).createContent(DocumentType.XML); - processModel = restClient.authenticateUser(adminUser).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - processItem = restClient.onWorkflowAPI().usingProcess(processModel).addProcessItem(document2); + processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + processItem = restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2); restClient.assertStatusCodeIs(HttpStatus.CREATED); processItem.assertThat().field("createdAt").isNotEmpty() .and().field("size").is("19") @@ -82,10 +82,10 @@ public class AddProcessItemSanityTests extends RestWorkflowTest .and().field("id").isNotEmpty() .and().field("mimeType").is(document2.getFileType().mimeType); - restClient.onWorkflowAPI().usingProcess(processModel).getProcessItems() + restClient.withWorkflowAPI().usingProcess(processModel).getProcessItems() .assertThat().entriesListContains("id", processItem.getId()) .and().entriesListContains("name", document2.getName()); - restClient.onWorkflowAPI().usingProcess(processModel).addProcessItem(document2); + restClient.withWorkflowAPI().usingProcess(processModel).addProcessItem(document2); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java index 8538292a7..f2d2a8d03 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java @@ -30,12 +30,12 @@ public class AddProcessSanityTests extends RestWorkflowTest userWhoStartsProcess = dataUser.createRandomTestUser(); assignee = dataUser.createRandomTestUser(); - addedProcess = restClient.authenticateUser(userWhoStartsProcess).onWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); + addedProcess = restClient.authenticateUser(userWhoStartsProcess).withWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); restClient.assertStatusCodeIs(HttpStatus.CREATED); addedProcess.assertThat().field("id").is(addedProcess.getId()) .and().field("startUserId").is(addedProcess.getStartUserId()); - processes = restClient.onWorkflowAPI().getProcesses(); + processes = restClient.withWorkflowAPI().getProcesses(); restClient.assertStatusCodeIs(HttpStatus.OK); processes.assertThat().entriesListContains("id", addedProcess.getId()); } @@ -51,12 +51,12 @@ public class AddProcessSanityTests extends RestWorkflowTest tenantUserWhoStartsProcess = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenant"); tenantAssignee = dataUser.usingUser(adminTenantUser).createUserWithTenant("u2Tenant"); - addedProcess = restClient.authenticateUser(tenantUserWhoStartsProcess).onWorkflowAPI().addProcess("activitiAdhoc", tenantAssignee, false, Priority.Normal); + addedProcess = restClient.authenticateUser(tenantUserWhoStartsProcess).withWorkflowAPI().addProcess("activitiAdhoc", tenantAssignee, false, Priority.Normal); restClient.assertStatusCodeIs(HttpStatus.CREATED); addedProcess.assertThat().field("id").is(addedProcess.getId()) .and().field("startUserId").is(addedProcess.getStartUserId()); - processes = restClient.onWorkflowAPI().getProcesses(); + processes = restClient.withWorkflowAPI().getProcesses(); restClient.assertStatusCodeIs(HttpStatus.OK); processes.assertThat().entriesListContains("id", addedProcess.getId()); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java index 007e4871e..3fee0854c 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java @@ -44,15 +44,15 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest public void addProcessVariable() throws Exception { variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text"); - processModel = restClient.authenticateUser(userWhoStartsTask).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + processModel = restClient.authenticateUser(userWhoStartsTask).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - processVariable = restClient.onWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); + processVariable = restClient.withWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); processVariable.assertThat().field("name").is(variableModel.getName()) .and().field("type").is(variableModel.getType()) .and().field("value").is(variableModel.getValue()); - restClient.onWorkflowAPI().usingProcess(processModel).getProcessVariables() + restClient.withWorkflowAPI().usingProcess(processModel).getProcessVariables() .assertThat().entriesListContains("name", processVariable.getName()); } @@ -61,8 +61,8 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest public void updateExistingProcessVariable() throws Exception { variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text"); - processModel = restClient.authenticateUser(userWhoStartsTask).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - processVariable = restClient.onWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); + processModel = restClient.authenticateUser(userWhoStartsTask).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + processVariable = restClient.withWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); processVariable.assertThat().field("name").is(variableModel.getName()) .and().field("type").is(variableModel.getType()) @@ -70,7 +70,7 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest String newValue = RandomData.getRandomName("value"); variableModel.setValue(newValue); - processVariable = restClient.onWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); + processVariable = restClient.withWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); processVariable.assertThat().field("value").is(newValue); } @@ -85,10 +85,10 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest tenantUser = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenant"); tenantUserAssignee = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenantAssignee"); - restClient.authenticateUser(tenantUser).onWorkflowAPI().addProcess("activitiAdhoc", tenantUserAssignee, false, Priority.Normal); + restClient.authenticateUser(tenantUser).withWorkflowAPI().addProcess("activitiAdhoc", tenantUserAssignee, false, Priority.Normal); variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text"); - processModel = restClient.authenticateUser(adminTenantUser).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - processVariable = restClient.onWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); + processModel = restClient.authenticateUser(adminTenantUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + processVariable = restClient.withWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); restClient.assertStatusCodeIs(HttpStatus.CREATED); processVariable.assertThat().field("name").is(variableModel.getName()) .and().field("type").is(variableModel.getType()) @@ -100,8 +100,8 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest public void failedAddingProcessVariableIfInvalidBodyIsProvided() throws Exception { variableModel = RestProcessVariableModel.getRandomProcessVariableModel("incorrect type"); - processModel = restClient.authenticateUser(adminUser).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - restClient.onWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); + processModel = restClient.authenticateUser(adminUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + restClient.withWorkflowAPI().usingProcess(processModel).addProcessVariable(variableModel); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) .assertLastError().containsSummary("Unsupported type of variable: 'incorrect type'."); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java index 392a58f27..f75fda99b 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java @@ -32,35 +32,35 @@ public class DeleteProcessSanityTests extends RestWorkflowTest TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify User is able to delete process started by him using REST API and status code is OK (204)") public void deleteProcessByUserWhoStartedProcess() throws Exception { - process = restClient.authenticateUser(userWhoAddsProcess).onWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); + process = restClient.authenticateUser(userWhoAddsProcess).withWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); restClient.assertStatusCodeIs(HttpStatus.CREATED); - restClient.onWorkflowAPI().usingProcess(process).deleteProcess(); + restClient.withWorkflowAPI().usingProcess(process).deleteProcess(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onWorkflowAPI().getProcesses().assertThat().entriesListDoesNotContain("id", process.getId()); + restClient.withWorkflowAPI().getProcesses().assertThat().entriesListDoesNotContain("id", process.getId()); } @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify User is able to delete process assigned to him using REST API and status code is OK (204)") public void deleteProcessByAssignedUser() throws Exception { - process = restClient.authenticateUser(userWhoAddsProcess).onWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); + process = restClient.authenticateUser(userWhoAddsProcess).withWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); restClient.assertStatusCodeIs(HttpStatus.CREATED); - restClient.authenticateUser(assignee).onWorkflowAPI().usingProcess(process).deleteProcess(); + restClient.authenticateUser(assignee).withWorkflowAPI().usingProcess(process).deleteProcess(); restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - restClient.onWorkflowAPI().getProcesses().assertThat().entriesListDoesNotContain("id", process.getId()); + restClient.withWorkflowAPI().getProcesses().assertThat().entriesListDoesNotContain("id", process.getId()); } @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify User that is not involved in a process is not authorized to delete it using REST API and status code is 403") public void deleteProcessByAnotherUser() throws Exception { - process = restClient.authenticateUser(userWhoAddsProcess).onWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); + process = restClient.authenticateUser(userWhoAddsProcess).withWorkflowAPI().addProcess("activitiAdhoc", assignee, false, Priority.Normal); restClient.assertStatusCodeIs(HttpStatus.CREATED); - restClient.authenticateUser(anotherUser).onWorkflowAPI().usingProcess(process).deleteProcess(); + restClient.authenticateUser(anotherUser).withWorkflowAPI().usingProcess(process).deleteProcess(); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary("user is not allowed to access information about process"); } } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessItemsSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessItemsSanityTests.java index 2915a47a9..3040af703 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessItemsSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessItemsSanityTests.java @@ -42,8 +42,8 @@ public class GetProcessItemsSanityTests extends RestWorkflowTest description = "Verify that user that started the process gets all process items") public void getProcessItemsUsingTheUserWhoStartedProcess() throws Exception { - processModel = restClient.authenticateUser(userWhoStartsTask).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - items = restClient.onWorkflowAPI().usingProcess(processModel).getProcessItems(); + processModel = restClient.authenticateUser(userWhoStartsTask).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + items = restClient.withWorkflowAPI().usingProcess(processModel).getProcessItems(); restClient.assertStatusCodeIs(HttpStatus.OK); items.assertThat().entriesListIsNotEmpty(); } @@ -52,8 +52,8 @@ public class GetProcessItemsSanityTests extends RestWorkflowTest description = "Verify that user that is involved in the process gets all process items") public void getProcessItemsUsingUserInvolvedInProcess() throws Exception { - processModel = restClient.authenticateUser(assignee).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - items = restClient.onWorkflowAPI().usingProcess(processModel).getProcessItems(); + processModel = restClient.authenticateUser(assignee).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + items = restClient.withWorkflowAPI().usingProcess(processModel).getProcessItems(); restClient.assertStatusCodeIs(HttpStatus.OK); items.assertThat().entriesListIsNotEmpty(); } @@ -67,10 +67,10 @@ public class GetProcessItemsSanityTests extends RestWorkflowTest restClient.authenticateUser(dataUser.getAdminUser()).usingTenant().createTenant(adminTenantUser); tenantUser = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenant"); tenantUserAssignee = dataUser.usingUser(adminTenantUser).createUserWithTenant("uTenantAssignee"); - restClient.authenticateUser(tenantUser).onWorkflowAPI().addProcess("activitiAdhoc", tenantUserAssignee, false, Priority.Normal); + restClient.authenticateUser(tenantUser).withWorkflowAPI().addProcess("activitiAdhoc", tenantUserAssignee, false, Priority.Normal); - processModel = restClient.authenticateUser(adminTenantUser).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - items = restClient.onWorkflowAPI().usingProcess(processModel).getProcessItems(); + processModel = restClient.authenticateUser(adminTenantUser).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + items = restClient.withWorkflowAPI().usingProcess(processModel).getProcessItems(); restClient.assertStatusCodeIs(HttpStatus.OK); items.assertThat().entriesListIsNotEmpty(); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java index 62fdb5e6f..a96f0837e 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java @@ -41,7 +41,7 @@ public class GetProcessTasksSanityTests extends RestWorkflowTest @TestRail(section = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify user who started the process gets all tasks of started process with Rest API and response is successfull (200)") public void userWhoStartedProcessCanGetProcessTasks() throws JsonToModelConversionException, Exception { - processTasks = restClient.authenticateUser(userModel).onWorkflowAPI().usingProcess(process).getProcessTasks(); + processTasks = restClient.authenticateUser(userModel).withWorkflowAPI().usingProcess(process).getProcessTasks(); restClient.assertStatusCodeIs(HttpStatus.OK); processTasks.assertThat() .entriesListIsNotEmpty().and() @@ -53,7 +53,7 @@ public class GetProcessTasksSanityTests extends RestWorkflowTest @TestRail(section = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify any assignee user of the process gets all tasks of the process with Rest API and response is successfull (200)") public void assigneeUserCanGetAllProcessTasks() throws JsonToModelConversionException, Exception { - processTasks = restClient.authenticateUser(assignee1).onWorkflowAPI().usingProcess(process).getProcessTasks(); + processTasks = restClient.authenticateUser(assignee1).withWorkflowAPI().usingProcess(process).getProcessTasks(); restClient.assertStatusCodeIs(HttpStatus.OK); processTasks.assertThat() .entriesListContains("assignee", assignee1.getUsername()).and() @@ -68,7 +68,7 @@ public class GetProcessTasksSanityTests extends RestWorkflowTest .createMoreReviewersWorkflowAndAssignTo(assignee1, assignee2, assignee3); dataWorkflow.usingUser(assignee1).approveTask(process); - processTasks = restClient.authenticateUser(assignee2).onWorkflowAPI().usingProcess(process).getProcessTasks(); + processTasks = restClient.authenticateUser(assignee2).withWorkflowAPI().usingProcess(process).getProcessTasks(); restClient.assertStatusCodeIs(HttpStatus.OK); processTasks.assertThat() .entriesListIsNotEmpty().assertThat() diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessVariablesSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessVariablesSanityTests.java index 3ebb2cc8e..a23b2875b 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessVariablesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessVariablesSanityTests.java @@ -41,8 +41,8 @@ public class GetProcessVariablesSanityTests extends RestWorkflowTest description = "Verify that user that started the process gets all process variables") public void getProcessVariablesUsingTheUserWhoStartedProcess() throws JsonToModelConversionException, Exception { - processModel = restClient.authenticateUser(userWhoStartsTask).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - variables = restClient.onWorkflowAPI().usingProcess(processModel).getProcessVariables(); + processModel = restClient.authenticateUser(userWhoStartsTask).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + variables = restClient.withWorkflowAPI().usingProcess(processModel).getProcessVariables(); restClient.assertStatusCodeIs(HttpStatus.OK); variables.assertThat().entriesListIsNotEmpty(); } @@ -51,8 +51,8 @@ public class GetProcessVariablesSanityTests extends RestWorkflowTest description = "Verify get all process variables call using a user that is involved in the process") public void getProcessVariablesUsingUserInvolvedInProcess() throws JsonToModelConversionException, Exception { - processModel = restClient.authenticateUser(assignee).onWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); - variables = restClient.onWorkflowAPI().usingProcess(processModel).getProcessVariables(); + processModel = restClient.authenticateUser(assignee).withWorkflowAPI().getProcesses().getOneRandomEntry().onModel(); + variables = restClient.withWorkflowAPI().usingProcess(processModel).getProcessVariables(); restClient.assertStatusCodeIs(HttpStatus.OK); variables.assertThat().entriesListIsNotEmpty(); } diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java index 60c1eac9b..07bb8e5cd 100644 --- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java +++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java @@ -37,7 +37,7 @@ public class GetProcessesSanityTests extends RestWorkflowTest TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify User gets all processes started by him using REST API and status code is OK (200)") public void getProcessesByUserWhoStartedProcess() throws Exception { - allProcesses = restClient.authenticateUser(userWhoStartsTask).onWorkflowAPI().getProcesses(); + allProcesses = restClient.authenticateUser(userWhoStartsTask).withWorkflowAPI().getProcesses(); restClient.assertStatusCodeIs(HttpStatus.OK); allProcesses.assertThat().entriesListContains("id", task.getNodeRef()); } @@ -46,7 +46,7 @@ public class GetProcessesSanityTests extends RestWorkflowTest TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify User gets all processes assigned to him using REST API and status code is OK (200)") public void getProcessesByAssignedUser() throws Exception { - allProcesses = restClient.authenticateUser(assignee).onWorkflowAPI().getProcesses(); + allProcesses = restClient.authenticateUser(assignee).withWorkflowAPI().getProcesses(); restClient.assertStatusCodeIs(HttpStatus.OK); allProcesses.assertThat().entriesListContains("id", task.getNodeRef()); } @@ -55,7 +55,7 @@ public class GetProcessesSanityTests extends RestWorkflowTest TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify User that is not involved in a process can not get that process using REST API and status code is OK (200)") public void getProcessesByAnotherUser() throws Exception { - allProcesses = restClient.authenticateUser(anotherUser).onWorkflowAPI().getProcesses(); + allProcesses = restClient.authenticateUser(anotherUser).withWorkflowAPI().getProcesses(); restClient.assertStatusCodeIs(HttpStatus.OK); allProcesses.assertThat().entriesListDoesNotContain("id", task.getNodeRef()); } @@ -64,7 +64,7 @@ public class GetProcessesSanityTests extends RestWorkflowTest TestGroup.PROCESSES }, executionType = ExecutionType.SANITY, description = "Verify Admin gets all processes, even if he isn't involved in a process, using REST API and status code is OK (200)") public void getProcessesByAdmin() throws Exception { - allProcesses = restClient.authenticateUser(dataUser.getAdminUser()).onWorkflowAPI().getProcesses(); + allProcesses = restClient.authenticateUser(dataUser.getAdminUser()).withWorkflowAPI().getProcesses(); restClient.assertStatusCodeIs(HttpStatus.OK); allProcesses.assertThat().entriesListContains("id", task.getNodeRef()); }