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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
93591: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93523: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         93517: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         Fixed MultiUserRenditionTest.testRenditionOwnerHasChangedAfterSourceOwnerChange() to run on MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:28:35 +00:00
parent faf2708844
commit 127d6c6ca8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/test-java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
View File

@@ -234,11 +234,19 @@ public class MultiUserRenditionTest
// Create another doc as non-admin // Create another doc as non-admin
AuthenticationUtil.setFullyAuthenticatedUser(NON_ADMIN_USER); AuthenticationUtil.setFullyAuthenticatedUser(NON_ADMIN_USER);
final NodeRef nonAdminPdfNode = txnHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<NodeRef>()
{
public NodeRef execute() throws Throwable
{
NodeRef nonAdminPdfNode = createPdfDocumentAsCurrentlyAuthenticatedUser(NON_ADMIN_USER + "_content");
return nonAdminPdfNode;
}
});
final Pair<NodeRef, NodeRef> nonAdminNodes = txnHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Pair<NodeRef, NodeRef>>() final Pair<NodeRef, NodeRef> nonAdminNodes = txnHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Pair<NodeRef, NodeRef>>()
{ {
public Pair<NodeRef, NodeRef> execute() throws Throwable public Pair<NodeRef, NodeRef> execute() throws Throwable
{ {
NodeRef nonAdminPdfNode = createPdfDocumentAsCurrentlyAuthenticatedUser(NON_ADMIN_USER + "_content");
renditionService.render(nonAdminPdfNode, doclibRendDefQName); renditionService.render(nonAdminPdfNode, doclibRendDefQName);
// caches rendition owner // caches rendition owner
NodeRef nonAdminRenditionNode = renditionService.getRenditions(nonAdminPdfNode).get(0).getChildRef(); NodeRef nonAdminRenditionNode = renditionService.getRenditions(nonAdminPdfNode).get(0).getChildRef();