inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
127620 jkaabimofrad: Missed changes during resolving conflicts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:19:45 +00:00
parent 4a18a13f7b
commit 241ed23c04
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -49,8 +49,10 @@ import org.alfresco.rest.api.tests.client.data.Document;
import org.alfresco.rest.api.tests.client.data.Folder; import org.alfresco.rest.api.tests.client.data.Folder;
import org.alfresco.rest.api.tests.client.data.Node; import org.alfresco.rest.api.tests.client.data.Node;
import org.alfresco.rest.api.tests.client.data.Rendition; import org.alfresco.rest.api.tests.client.data.Rendition;
import org.alfresco.rest.api.tests.client.data.SiteRole;
import org.alfresco.rest.api.tests.util.MultiPartBuilder; import org.alfresco.rest.api.tests.util.MultiPartBuilder;
import org.alfresco.rest.api.tests.util.RestApiUtil; import org.alfresco.rest.api.tests.util.RestApiUtil;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.TempFileProvider; import org.alfresco.util.TempFileProvider;
import org.springframework.util.ResourceUtils; import org.springframework.util.ResourceUtils;
@@ -442,6 +444,31 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return node.getId(); return node.getId();
} }
protected void inviteToSite(final TestSite testSite, final TestPerson invitee, final SiteRole siteRole)
{
TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
testSite.inviteToSite(invitee.getId(), siteRole);
return null;
}
}, testSite.getNetworkId());
}
protected NodeRef getSiteDocLib(final TestSite testSite)
{
return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return testSite.getContainerNodeRef(("documentLibrary"));
}
}, testSite.getNetworkId());
}
protected void checkStatus(int expectedStatus, int actualStatus) protected void checkStatus(int expectedStatus, int actualStatus)
{ {
if (expectedStatus > 0 && expectedStatus != actualStatus) if (expectedStatus > 0 && expectedStatus != actualStatus)
@@ -632,3 +659,4 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return URL_NODES + "/" + nodeId + "/" + URL_CONTENT; return URL_NODES + "/" + nodeId + "/" + URL_CONTENT;
} }
} }

2
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -49,6 +49,7 @@ import org.alfresco.rest.api.model.Site;
import org.alfresco.rest.api.nodes.NodesEntityResource; import org.alfresco.rest.api.nodes.NodesEntityResource;
import org.alfresco.rest.api.tests.RepoService.TestNetwork; import org.alfresco.rest.api.tests.RepoService.TestNetwork;
import org.alfresco.rest.api.tests.RepoService.TestPerson; import org.alfresco.rest.api.tests.RepoService.TestPerson;
import org.alfresco.rest.api.tests.RepoService.TestSite;
import org.alfresco.rest.api.tests.client.HttpResponse; import org.alfresco.rest.api.tests.client.HttpResponse;
import org.alfresco.rest.api.tests.client.PublicApiClient; import org.alfresco.rest.api.tests.client.PublicApiClient;
import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging; import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
@@ -3483,3 +3484,4 @@ public class NodeApiTest extends AbstractBaseApiTest
return "public"; return "public";
} }
} }