inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126372 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119837 jvonka: FileFolder API - fix build (BCK) & api tests
      - as agreed, for now split test client api models from server-side impl
      - rename existing Node/Document/Folder to FavouriteNode/Document/Folder (for backwards compat')


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:51:08 +00:00
parent fbc5fad704
commit e97f9132ad
19 changed files with 843 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/test-java/org/alfresco/rest/api/tests/TestFavourites.java
View File

@@ -58,11 +58,11 @@ import org.alfresco.rest.api.tests.client.PublicApiClient.SiteMembershipRequests
import org.alfresco.rest.api.tests.client.PublicApiException;
import org.alfresco.rest.api.tests.client.RequestContext;
import org.alfresco.rest.api.tests.client.data.Comment;
import org.alfresco.rest.api.tests.client.data.Document;
import org.alfresco.rest.api.tests.client.data.Favourite;
import org.alfresco.rest.api.tests.client.data.FavouriteDocument;
import org.alfresco.rest.api.tests.client.data.FavouriteFolder;
import org.alfresco.rest.api.tests.client.data.FavouritesTarget;
import org.alfresco.rest.api.tests.client.data.FileFavouriteTarget;
import org.alfresco.rest.api.tests.client.data.Folder;
import org.alfresco.rest.api.tests.client.data.FolderFavouriteTarget;
import org.alfresco.rest.api.tests.client.data.InvalidFavouriteTarget;
import org.alfresco.rest.api.tests.client.data.JSONAble;
@@ -497,7 +497,7 @@ public class TestFavourites extends EnterpriseTestApi
private Favourite makeFolderFavourite(String targetGuid) throws ParseException
{
Folder folder = new Folder(targetGuid);
FavouriteFolder folder = new FavouriteFolder(targetGuid);
FolderFavouriteTarget target = new FolderFavouriteTarget(folder);
Date creationData = new Date();
Favourite favourite = new Favourite(creationData, null, target);
@@ -506,7 +506,7 @@ public class TestFavourites extends EnterpriseTestApi
private Favourite makeFileFavourite(String targetGuid) throws ParseException
{
Document document = new Document(targetGuid);
FavouriteDocument document = new FavouriteDocument(targetGuid);
FileFavouriteTarget target = new FileFavouriteTarget(document);
Date creationData = new Date();
Favourite favourite = new Favourite(creationData, null, target);
@@ -609,7 +609,7 @@ public class TestFavourites extends EnterpriseTestApi
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
String siteGuid = person1PublicSites.get(0).getGuid();
Document document = new Document(siteGuid);
FavouriteDocument document = new FavouriteDocument(siteGuid);
Favourite favourite = makeFileFavourite(document.getGuid());
Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
favourite.expected(ret);
@@ -626,7 +626,7 @@ public class TestFavourites extends EnterpriseTestApi
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
String siteGuid = person1PublicSites.get(0).getGuid();
Folder folder = new Folder(siteGuid);
FavouriteFolder folder = new FavouriteFolder(siteGuid);
Favourite favourite = makeFolderFavourite(folder.getGuid());
Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
favourite.expected(ret);
@@ -643,7 +643,7 @@ public class TestFavourites extends EnterpriseTestApi
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
Folder folder = new Folder(person1PublicDocs.get(0).getId());
FavouriteFolder folder = new FavouriteFolder(person1PublicDocs.get(0).getId());
Favourite favourite = makeFolderFavourite(folder.getGuid());
Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
favourite.expected(ret);
@@ -660,7 +660,7 @@ public class TestFavourites extends EnterpriseTestApi
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
Document document = new Document(person1PublicFolders.get(0).getId());
FavouriteDocument document = new FavouriteDocument(person1PublicFolders.get(0).getId());
Favourite favourite = makeFileFavourite(document.getGuid());
Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
favourite.expected(ret);
@@ -680,8 +680,8 @@ public class TestFavourites extends EnterpriseTestApi
try
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
Document document = new Document(person1PublicDocs.get(0).getId());
FavouriteDocument document = new FavouriteDocument(person1PublicDocs.get(0).getId());
Favourite favourite = makeFileFavourite(document.getGuid());
favouritesProxy.createFavourite(person11Id, favourite);
@@ -776,8 +776,8 @@ public class TestFavourites extends EnterpriseTestApi
try
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
Document document = new Document(GUID.generate());
FavouriteDocument document = new FavouriteDocument(GUID.generate());
Favourite favourite = makeFileFavourite(document.getGuid());
favouritesProxy.createFavourite(person10Id, favourite);
@@ -796,8 +796,8 @@ public class TestFavourites extends EnterpriseTestApi
try
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
Folder folder = new Folder(GUID.generate());
FavouriteFolder folder = new FavouriteFolder(GUID.generate());
Favourite favourite = makeFolderFavourite(folder.getGuid());
favouritesProxy.createFavourite(person10Id, favourite);
@@ -851,7 +851,7 @@ public class TestFavourites extends EnterpriseTestApi
assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
}
Document document = new Document(person1PublicDocs.get(0).getId());
FavouriteDocument document = new FavouriteDocument(person1PublicDocs.get(0).getId());
try
{
@@ -884,9 +884,9 @@ public class TestFavourites extends EnterpriseTestApi
{
assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
}
Folder folder = new Folder(person1PublicFolders.get(0).getId());
FavouriteFolder folder = new FavouriteFolder(person1PublicFolders.get(0).getId());
try
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
@@ -954,11 +954,11 @@ public class TestFavourites extends EnterpriseTestApi
log("cloud-2467");
Favourite siteFavourite1 = makeSiteFavourite(person1PublicSites.get(0));
Document document = repoService.getDocument(network1.getId(), person1PublicDocs.get(0));
FavouriteDocument document = repoService.getDocument(network1.getId(), person1PublicDocs.get(0));
Favourite fileFavourite1 = makeFileFavourite(document.getGuid());
Folder folder = repoService.getFolder(network1.getId(), person1PublicFolders.get(0));
FavouriteFolder folder = repoService.getFolder(network1.getId(), person1PublicFolders.get(0));
Favourite folderFavourite1 = makeFolderFavourite(folder.getGuid());
Favourite siteFavourite2 = makeSiteFavourite(person1PublicSites.get(1));
@@ -1087,7 +1087,7 @@ public class TestFavourites extends EnterpriseTestApi
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21Id));
Document document1 = new Document(person1PrivateDocs.get(0).getId());
FavouriteDocument document1 = new FavouriteDocument(person1PrivateDocs.get(0).getId());
Favourite favourite = makeFileFavourite(document1.getGuid());
try
{
@@ -1119,7 +1119,7 @@ public class TestFavourites extends EnterpriseTestApi
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21Id));
Folder folder1 = new Folder(person1PrivateFolders.get(0).getId());
FavouriteFolder folder1 = new FavouriteFolder(person1PrivateFolders.get(0).getId());
Favourite favourite = makeFolderFavourite(folder1.getGuid());
try
{