Updates to REST API - formatting, additional assertions, fix suite

This commit is contained in:
Valentin Popa
2016-08-31 12:03:37 +03:00
parent 5cccdaf80b
commit da16d2c241
5 changed files with 56 additions and 73 deletions

View File

@@ -1,7 +1,5 @@
package org.alfresco.rest;
import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.RestSitesApi;
import org.alfresco.rest.exception.JsonToModelConversionException;
import org.alfresco.rest.model.SiteMember;
import org.alfresco.utility.data.DataSite;
@@ -12,7 +10,6 @@ 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.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -27,9 +24,6 @@ public class SampleSitesTest extends RestTest
@Autowired
DataSite dataSite;
@Autowired
ContentService content;
private UserModel userModel;
private SiteModel siteModel;
@@ -45,56 +39,65 @@ public class SampleSitesTest extends RestTest
@Test
public void getSiteResponseNotNull() throws JsonToModelConversionException
{
Assert.assertNotNull(siteAPI.getSite(siteModel.getId()), "Get site response should not be null");
siteAPI.getSite(siteModel.getId()).assertResponseIsNotEmpty();
}
@Test
public void getSiteCheckStatusCode() throws JsonToModelConversionException
{
siteAPI.getSite(siteModel.getId());
Assert.assertEquals(siteAPI.usingRestWrapper().getStatusCode(), HttpStatus.OK.toString(), "Get site response status code is not correct");
siteAPI.usingRestWrapper()
.assertStatusCodeIs(HttpStatus.OK.toString());
}
@Test
public void getSitesResponseNotNull() throws JsonToModelConversionException
public void getSitesResponseNotEmpty() throws JsonToModelConversionException
{
Assert.assertNotNull(siteAPI.getSites().getEntries(), "Get sites response should not be null");
siteAPI.getSites()
.assertThatResponseIsNotEmpty();
}
@Test
public void getSitesCheckStatusCode() throws JsonToModelConversionException
{
siteAPI.getSites();
Assert.assertEquals(siteAPI.usingRestWrapper().getStatusCode(), HttpStatus.OK.toString(), "Get sites response status code is not correct");
siteAPI.usingRestWrapper()
.assertStatusCodeIs(HttpStatus.OK.toString());
}
@Test
public void sitesCollectionHasPagination() throws JsonToModelConversionException
{
siteAPI.getSites().assertResponseHasPagination();
Assert.assertEquals(siteAPI.getSites().getPagination().getCount(), 100, "Sites collection should have pagination");
}
@Test
public void addMemberToSiteCheckStatusCode() throws JsonToModelConversionException, DataPreparationException
{
UserModel newMember = dataUser.createRandomTestUser();
SiteMember siteMember = new SiteMember(Role.SiteCollaborator.toString(), newMember.getUsername());
SiteMember siteMember = new SiteMember(Role.SiteCollaborator.toString(),
newMember.getUsername());
siteAPI.addPerson(siteModel.getId(), siteMember);
Assert.assertEquals(siteAPI.usingRestWrapper().getStatusCode(), HttpStatus.CREATED.toString(),
"Add member to site response status code is not correct");
siteAPI.usingRestWrapper()
.assertStatusCodeIs(HttpStatus.CREATED.toString());
}
@Test
public void isSiteReturned() throws JsonToModelConversionException
{
siteAPI.getAllSites().assertThatResponseHasSite(siteModel.getId());
siteAPI.getAllSites()
.assertThatResponseHasSite(siteModel.getId());
}
@Test
public void checkSiteDetails() throws JsonToModelConversionException
{
siteAPI.getSite(siteModel.getId());
siteAPI.getSite(siteModel.getId())
.assertResponseIsNotEmpty()
.assertSiteHasDescription(siteModel.getDescription())
.assertSiteHasTitle(siteModel.getTitle())
.assertSiteHasVisibility(siteModel.getVisibility());
}
}