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-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
101311: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      99978: RA-62: fix QuickShareRestApiTest so that it doesn't use /slingshot API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-04-08 16:09:41 +00:00
parent 36067fce0a
commit 74149ea9dd
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/test-java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java
View File

@@ -39,6 +39,10 @@ import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -53,7 +57,6 @@ import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.PropertyMap;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
@@ -75,8 +78,6 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
private static final String USER_ONE = "UserOne-"+RUN_ID;
private static final String USER_TWO = "UserTwo-"+RUN_ID;
private final static String COPY_URL = "/slingshot/doclib/action/copy-to/node/{copy_dest}";
private final static String SHARE_URL = "/api/internal/shared/share/{node_ref_3}";
private final static String UNSHARE_URL = "/api/internal/shared/unshare/{shared_id}";
@@ -109,7 +110,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
private SiteService siteService;
private Repository repositoryHelper;
private RetryingTransactionHelper transactionHelper;
private FileFolderService fileFolderService;
private NodeRef userOneHome;
@Override
@@ -125,7 +126,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
siteService = (SiteService) getServer().getApplicationContext().getBean("SiteService");
repositoryHelper = (Repository) getServer().getApplicationContext().getBean("repositoryHelper");
transactionHelper = (RetryingTransactionHelper)getServer().getApplicationContext().getBean("retryingTransactionHelper");
fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
createUser(USER_ONE);
@@ -315,13 +316,14 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
* @throws IOException
* @throws UnsupportedEncodingException
* @throws JSONException
* @throws FileNotFoundException
* @throws FileExistsException
*/
public void testCopy() throws UnsupportedEncodingException, IOException, JSONException
public void testCopy() throws UnsupportedEncodingException, IOException, JSONException, FileExistsException, FileNotFoundException
{
final int expectedStatusOK = 200;
String testNodeRef = testNode.toString().replace("://", "/");
String userOneNodeRef = userOneHome.toString().replace("://", "/");
// As user one ...
@@ -332,22 +334,11 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
assertNotNull(sharedId);
assertEquals(22, sharedId.length()); // note: we may have to adjust/remove this check if we change length of id (or it becomes variable length)
JSONObject jsonReq = new JSONObject();
JSONArray nodeRefs = new JSONArray();
nodeRefs.put(testNode.toString());
jsonReq.put("nodeRefs", nodeRefs);
jsonReq.put("parentId", userOneHome);
rsp = sendRequest(new PostRequest(COPY_URL.replace("{copy_dest}", userOneNodeRef), jsonReq.toString(), APPLICATION_JSON), expectedStatusOK, USER_ONE);
jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
JSONArray copyResults = jsonRsp.getJSONArray("results");
JSONObject copyResult = copyResults.getJSONObject(0);
String copyNodeRef = copyResult.getString("nodeRef");
AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
assertFalse(nodeService.hasAspect(new NodeRef(copyNodeRef), QuickShareModel.ASPECT_QSHARE));
FileInfo copyFileInfo = fileFolderService.copy(testNode, userOneHome, "Copied node");
NodeRef copyNodeRef = copyFileInfo.getNodeRef();
assertFalse(nodeService.hasAspect(copyNodeRef, QuickShareModel.ASPECT_QSHARE));
}
private void createUser(String userName)