using only models as parameters

adding ListUserWithRoles (removing HashMaps) update sanity-rest
2025-10-01 14:41:19 +00:00 · 2016-09-29 14:56:54 +03:00
parent 2810e995d7
commit 44b810bffa
12 changed files with 195 additions and 209 deletions
--- a/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java
+++ b/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java
@@ -0,0 +1,130 @@
+package org.alfresco.rest.demo;
+
+import org.alfresco.dataprep.CMISUtil.DocumentType;
+import org.alfresco.rest.RestTest;
+import org.alfresco.rest.body.SiteMember;
+import org.alfresco.rest.exception.JsonToModelConversionException;
+import org.alfresco.rest.model.RestCommentModel;
+import org.alfresco.rest.requests.RestCommentsApi;
+import org.alfresco.rest.requests.RestSitesApi;
+import org.alfresco.utility.exception.DataPreparationException;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.social.alfresco.api.entities.Role;
+import org.springframework.social.alfresco.api.entities.Site.Visibility;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+@Test(groups = { "demo" })
+public class RestDemoTests extends RestTest
+{
+    @Autowired
+    RestSitesApi sitesApi;
+
+    @Autowired
+    RestCommentsApi commentsAPI;
+
+    private UserModel userModel;
+    private SiteModel siteModel;
+
+    @BeforeClass(alwaysRun=true)
+    public void dataPreparation() throws DataPreparationException
+    {       
+        userModel = dataUser.getAdminUser();
+        siteModel = dataSite.usingUser(userModel).createPublicRandomSite();
+        restClient.authenticateUser(userModel);
+        
+        sitesApi.useRestClient(restClient);
+        commentsAPI.useRestClient(restClient);        
+    }
+
+    /**
+     * Data preparation – create site with custom details <br/>
+     * Perform GET sites call using admin user<br/>
+     * Check that created site is included in response <br/>
+     * Perform GET site call, validate that site title, description and visibility are correct <br/>
+     * 
+     * @throws JsonToModelConversionException
+     * @throws Exception
+     */
+    @Test
+    public void adminRetrievesCorrectSiteDetails() throws JsonToModelConversionException, Exception
+    {
+        sitesApi.getAllSites()
+            .assertThatResponseHasSite(siteModel)
+        	.getSite(siteModel)
+                .assertSiteHasVisibility(Visibility.PUBLIC)
+                .assertSiteHasTitle(siteModel.getTitle())
+                .assertSiteHasDescription(siteModel.getDescription());
+    }
+
+    /**
+     * Data preparation – create site and document on server <br/>
+     * POST one comment to file using admin user <br/>
+     * Perform GET comments, check the new one is listed <br/>
+     * Update existing comment using PUT call, check that comment content is updated <br/>
+     * @throws Exception 
+     */
+    @Test  
+    public void adminCanPostAndUpdateComments() throws Exception
+    {       
+        FileModel fileModel = dataContent.usingUser(userModel)
+                                       .usingResource(FolderModel.getSharedFolderModel())        			       
+        			       .createContent(DocumentType.TEXT_PLAIN);
+        // add new comment
+        RestCommentModel commentEntry = commentsAPI.addComment(fileModel, "This is a new comment");
+        commentsAPI.getNodeComments(fileModel)
+            .assertThatResponseIsNotEmpty()
+            .assertThatCommentWithIdExists(commentEntry)
+            .assertThatCommentWithContentExists("This is a new comment");
+
+        // update comment
+        commentEntry = commentsAPI.updateComment(fileModel, 
+                                                    commentEntry, 
+                                                    "This is the updated comment");
+        commentsAPI.getNodeComments(fileModel)
+            .assertThatResponseIsNotEmpty()
+            .assertThatCommentWithIdExists(commentEntry)
+            .assertThatCommentWithContentExists("This is the updated comment");
+    }
+
+    /**
+     * Data preparation – create site and a new user <br/>
+     * As admin, add user as Consumer to site as a new site member using POST call <br/>
+     * Update site member role to Manager using PUT call <br/>
+     * Delete site member using DELETE call <br/>
+     * 
+     * @throws DataPreparationException
+     * @throws JsonToModelConversionException
+     */
+    @Test
+    public void adminCanAddAndUpdateSiteMemberDetails() throws Exception
+    {
+        UserModel newUser = dataUser.createRandomTestUser();
+        SiteMember siteMember = new SiteMember(Role.SiteConsumer.toString(), 
+                                                newUser.getUsername());
+
+        // add user as Consumer to site
+        sitesApi.addPerson(siteModel, siteMember);
+        sitesApi.getSiteMembers(siteModel)
+            .assertThatSiteHasMember(siteMember.getId())
+            .getSiteMember(siteMember.getId())
+            .assertSiteMemberHasRole(Role.SiteConsumer);
+
+        // update site member to Manager
+        siteMember.setRole(Role.SiteManager.toString());
+        sitesApi.updateSiteMember(siteModel, newUser, siteMember);
+        sitesApi.getSiteMembers(siteModel)
+            .assertThatSiteHasMember(siteMember.getId())
+            .getSiteMember(siteMember.getId())
+            .assertSiteMemberHasRole(Role.SiteManager);
+
+        sitesApi.deleteSiteMember(siteModel, newUser);
+        sitesApi.usingRestWrapper()
+            .assertStatusCodeIs(HttpStatus.NO_CONTENT);
+    }
+}