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

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

Browse Source 
69767: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69723: MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Added code which check status of node (it has private working copy).
      Merged DEV to 4.2-BUG-FIX
      67109 : MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Fixed RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 17:50:11 +00:00
parent f38ddabb2d
commit c5abaaec03
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
View File

@@ -178,7 +178,8 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
objecVariant = CMISObjectVariant.CURRENT_VERSION;
objectId = connector.constructObjectId(nodeRef, CMISConnector.UNVERSIONED_VERSION_LABEL);
versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
currentObjectId = objectId;
currentObjectId = objectId;
hasPWC = connector.getCheckOutCheckInService().isCheckedOut(nodeRef);
}
protected void analyseObjectId()

33
source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
View File

@@ -669,21 +669,30 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
*/
public void testRenderPdfDocumentLongRunningCheckout() throws Exception
{
class CheckoutRunnable extends AbstractNodeModifyingRunnable
try
{
public CheckoutRunnable(NodeRef nodeRef)
class CheckoutRunnable extends AbstractNodeModifyingRunnable
{
super(nodeRef);
}
protected void modifyNode(NodeRef nodeRef)
{
AuthenticationUtil.setRunAsUserSystem();
CheckOutCheckInService checkOutCheckInService =
public CheckoutRunnable(NodeRef nodeRef)
{
super(nodeRef);
}
protected void modifyNode(NodeRef nodeRef)
{
AuthenticationUtil.setRunAsUserSystem();
CheckOutCheckInService checkOutCheckInService =
(CheckOutCheckInService) applicationContext.getBean("checkOutCheckInService");
checkOutCheckInService.checkout(nodeWithDocContent);
}
};
renderPdfDocumentLongRunningTest(new CheckoutRunnable(nodeWithDocContent));
checkOutCheckInService.checkout(nodeWithDocContent);
}
};
renderPdfDocumentLongRunningTest(new CheckoutRunnable(nodeWithDocContent));
}
finally
{
AuthenticationUtil.setRunAsUserSystem();
CheckOutCheckInService checkOutCheckInService = (CheckOutCheckInService) applicationContext.getBean("CheckOutCheckInService");
checkOutCheckInService.cancelCheckout(checkOutCheckInService.getWorkingCopy(nodeWithDocContent));
}
}
/**