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

129174 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128594 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 2
      REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:13:39 +00:00
parent 575183a5ac
commit 472785f0bd
10 changed files with 177 additions and 176 deletions

View File

@@ -31,7 +31,6 @@ import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.rest.api.tests.AbstractBaseApiTest;
import org.alfresco.rest.api.tests.NodeApiTest;
import org.alfresco.rest.api.tests.RepoService;
import org.alfresco.rest.api.tests.client.HttpResponse;
import org.alfresco.rest.api.tests.client.data.ContentInfo;
@@ -57,8 +56,8 @@ public class AbstractSingleNetworkSiteTest extends AbstractBaseApiTest
protected RepoService.TestNetwork networkOne;
protected RepoService.TestPerson u1;
protected RepoService.TestSite tSite;
protected NodeRef docLibNodeRef;
protected String tSiteId;
protected String tDocLibNodeId;
protected JacksonUtil jacksonUtil;
@@ -80,11 +79,13 @@ public class AbstractSingleNetworkSiteTest extends AbstractBaseApiTest
networkOne = getRepoService().createNetwork(this.getClass().getName().toLowerCase(), true);
networkOne.create();
u1 = networkOne.createUser();
tSite = createSite(networkOne, u1, SiteVisibility.PRIVATE);
setRequestContext(networkOne.getId(), u1.getId(), null);
tSiteId = createSite("Test Site - " + System.currentTimeMillis(), SiteVisibility.PRIVATE).getId();
tDocLibNodeId = getSiteContainerNodeId(tSiteId, "documentLibrary");
AuthenticationUtil.setFullyAuthenticatedUser(u1.getId());
docLibNodeRef = tSite.getContainerNodeRef("documentLibrary");
AuthenticationUtil.clearCurrentSecurityContext();
setRequestContext(null);
}
@After