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

126581 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124740 gjames: RA-847, RA-848 Retrieving deleted nodes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-14 17:58:59 +00:00 · 2016-05-11 12:12:13 +00:00
parent 9d3444eee3
commit 95affed365
12 changed files with 553 additions and 66 deletions
--- a/source/test-java/org/alfresco/rest/AbstractSingleNetworkSiteTest.java
+++ b/source/test-java/org/alfresco/rest/AbstractSingleNetworkSiteTest.java
@@ -0,0 +1,95 @@
+package org.alfresco.rest;
+
+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.RepoService;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.util.JacksonUtil;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.junit.After;
+import org.junit.Before;
+
+/**
+ * Created by gethin on 31/03/16.
+ */
+public class AbstractSingleNetworkSiteTest extends AbstractBaseApiTest
+{
+    protected MutableAuthenticationService authenticationService;
+    protected PersonService personService;
+
+    protected RepoService.TestNetwork networkOne;
+    protected RepoService.TestPerson u1;
+    protected RepoService.TestSite tSite;
+    protected NodeRef docLibNodeRef;
+
+    protected JacksonUtil jacksonUtil;
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+    @Before
+    public void setup() throws Exception
+    {
+        authenticationService = applicationContext.getBean("authenticationService", MutableAuthenticationService.class);
+        personService = applicationContext.getBean("personService", PersonService.class);
+
+        jacksonUtil = new JacksonUtil(applicationContext.getBean("jsonHelper", JacksonHelper.class));
+
+        networkOne = getTestFixture().getRandomNetwork();
+        u1 = networkOne.createUser();
+        tSite = createSite(networkOne, u1, SiteVisibility.PRIVATE);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(u1.getId());
+        docLibNodeRef = tSite.getContainerNodeRef("documentLibrary");
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                if (personService.personExists(u1.getId()))
+                {
+                    authenticationService.deleteAuthentication(u1.getId());
+                    personService.deletePerson(u1.getId());
+                }
+                return null;
+            }
+        });
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+
+    protected Document createDocument(Folder parentFolder, String docName) throws Exception
+    {
+        Document d1 = new Document();
+        d1.setName(docName);
+        d1.setNodeType("cm:content");
+        ContentInfo ci = new ContentInfo();
+        ci.setMimeType("text/plain");
+        d1.setContent(ci);
+
+        // create empty file
+        HttpResponse response = post(getNodeChildrenUrl(parentFolder.getId()), u1.getId(), toJsonAsStringNonNull(d1), 201);
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+}