inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates to REST API framework - javadocs, updates to API calls

Browse Source
This commit is contained in:
Valentin Popa
2016-08-30 13:30:42 +03:00
parent 9e028dd20f
commit 477e545be6
5 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e2e-test/java/org/alfresco/rest/v1/RestDemoTest.java → e2e-test/java/org/alfresco/rest/RestDemoTest.java
View File

@@ -1,13 +1,10 @@
package org.alfresco.rest.v1; package org.alfresco.rest;
import java.io.File; import java.io.File;
import org.alfresco.dataprep.CMISUtil.DocumentType; import org.alfresco.dataprep.CMISUtil.DocumentType;
import org.alfresco.dataprep.ContentService; import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.RestCommentsApi;
import org.alfresco.rest.RestSitesApi;
import org.alfresco.rest.exception.JsonToModelConversionException; import org.alfresco.rest.exception.JsonToModelConversionException;
import org.alfresco.rest.model.Content;
import org.alfresco.rest.model.RestCommentModel; import org.alfresco.rest.model.RestCommentModel;
import org.alfresco.rest.model.SiteMember; import org.alfresco.rest.model.SiteMember;
import org.alfresco.utility.data.DataSite; import org.alfresco.utility.data.DataSite;
@@ -44,7 +41,7 @@ public class RestDemoTest extends RestTest
private SiteModel siteModel; private SiteModel siteModel;
@BeforeClass @BeforeClass
public void setUp() public void setUp() throws DataPreparationException
{ {
userModel = dataUser.getAdminUser(); userModel = dataUser.getAdminUser();
siteModel = dataSite.createPublicRandomSite(); siteModel = dataSite.createPublicRandomSite();
@@ -89,18 +86,16 @@ public class RestDemoTest extends RestTest
userModel.getPassword(), "Shared", DocumentType.TEXT_PLAIN, file, "This is a text file"); userModel.getPassword(), "Shared", DocumentType.TEXT_PLAIN, file, "This is a text file");
// add new comment // add new comment
Content content = new Content("This is a new comment"); RestCommentModel commentEntry = commentsAPI.addComment(document.getId(), "This is a new comment");
RestCommentModel commentEntry = commentsAPI.addComment(document.getId(), content);
commentsAPI.getNodeComments(document.getId()).assertThatResponseIsNotEmpty() commentsAPI.getNodeComments(document.getId()).assertThatResponseIsNotEmpty()
.assertThatCommentWithIdExists(commentEntry.getId()) .assertThatCommentWithIdExists(commentEntry.getId())
.assertThatCommentWithContentExists(content); .assertThatCommentWithContentExists("This is a new comment");
// update comment // update comment
content = new Content("This is the updated comment"); commentEntry = commentsAPI.updateComment(document.getId(), commentEntry.getId(), "This is the updated comment");
commentEntry = commentsAPI.updateComment(document.getId(), commentEntry.getId(), content);
commentsAPI.getNodeComments(document.getId()).assertThatResponseIsNotEmpty() commentsAPI.getNodeComments(document.getId()).assertThatResponseIsNotEmpty()
.assertThatCommentWithIdExists(commentEntry.getId()) .assertThatCommentWithIdExists(commentEntry.getId())
.assertThatCommentWithContentExists(content); .assertThatCommentWithContentExists("This is the updated comment");
} }
/** /**

2
e2e-test/java/org/alfresco/rest/v1/RestTest.java → e2e-test/java/org/alfresco/rest/RestTest.java
View File

@@ -1,4 +1,4 @@
package org.alfresco.rest.v1; package org.alfresco.rest;
import org.alfresco.rest.core.RestProperties; import org.alfresco.rest.core.RestProperties;
import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.core.RestWrapper;

12
e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java → e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
View File

@@ -1,4 +1,4 @@
package org.alfresco.rest.v1; package org.alfresco.rest;
import java.io.File; import java.io.File;
@@ -6,7 +6,6 @@ import org.alfresco.dataprep.CMISUtil.DocumentType;
import org.alfresco.dataprep.ContentService; import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.RestCommentsApi; import org.alfresco.rest.RestCommentsApi;
import org.alfresco.rest.exception.JsonToModelConversionException; import org.alfresco.rest.exception.JsonToModelConversionException;
import org.alfresco.rest.model.Content;
import org.alfresco.rest.model.RestCommentModel; import org.alfresco.rest.model.RestCommentModel;
import org.alfresco.utility.data.DataUser; import org.alfresco.utility.data.DataUser;
import org.alfresco.utility.exception.DataPreparationException; import org.alfresco.utility.exception.DataPreparationException;
@@ -49,8 +48,7 @@ public class SampleCommentsTest extends RestTest
@Test @Test
public void addComments() throws JsonToModelConversionException public void addComments() throws JsonToModelConversionException
{ {
Content content = new Content("This is a new comment"); commentsAPI.addComment(document.getId(), "This is a new comment");
commentsAPI.addComment(document.getId(), content);
Assert.assertEquals(commentsAPI.usingRestWrapper().getStatusCode(), HttpStatus.CREATED.toString(), "Add comments response status code is not correct"); Assert.assertEquals(commentsAPI.usingRestWrapper().getStatusCode(), HttpStatus.CREATED.toString(), "Add comments response status code is not correct");
} }
@@ -66,12 +64,10 @@ public class SampleCommentsTest extends RestTest
public void updateComment() throws JsonToModelConversionException public void updateComment() throws JsonToModelConversionException
{ {
// add initial comment // add initial comment
Content content = new Content("This is a new comment"); String commentId = commentsAPI.addComment(document.getId(), "This is a new comment").getId();
String commentId = commentsAPI.addComment(document.getId(), content).getId();
// update comment // update comment
content = new Content("This is the updated comment"); RestCommentModel commentEntry = commentsAPI.updateComment(document.getId(), commentId, "This is the updated comment");
RestCommentModel commentEntry = commentsAPI.updateComment(document.getId(), commentId, content);
Assert.assertEquals(commentEntry.getContent(), "This is the updated comment", "New comment was not updated"); Assert.assertEquals(commentEntry.getContent(), "This is the updated comment", "New comment was not updated");
} }

2
e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java → e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
View File

@@ -1,4 +1,4 @@
package org.alfresco.rest.v1; package org.alfresco.rest;
import org.alfresco.rest.RestPeopleApi; import org.alfresco.rest.RestPeopleApi;
import org.alfresco.rest.exception.JsonToModelConversionException; import org.alfresco.rest.exception.JsonToModelConversionException;

4
e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java → e2e-test/java/org/alfresco/rest/SampleSitesTest.java
View File

@@ -1,4 +1,4 @@
package org.alfresco.rest.v1; package org.alfresco.rest;
import org.alfresco.dataprep.ContentService; import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.RestSitesApi; import org.alfresco.rest.RestSitesApi;
@@ -71,7 +71,7 @@ public class SampleSitesTest extends RestTest
@Test @Test
public void sitesCollectionHasPagination() throws JsonToModelConversionException public void sitesCollectionHasPagination() throws JsonToModelConversionException
{ {
siteAPI.getSites().assertPagination(); siteAPI.getSites().assertResponseHasPagination();
Assert.assertEquals(siteAPI.getSites().getPagination().getCount(), 100, "Sites collection should have pagination"); Assert.assertEquals(siteAPI.getSites().getPagination().getCount(), 100, "Sites collection should have pagination");
} }