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 
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:35:56 +00:00
parent 1811553da1
commit 3929596255
5 changed files with 91 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/test-java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java
View File

@@ -384,32 +384,18 @@ public class RenditionServicePermissionsTest
testSiteInfo.doclib,
"quick.jpg",
AuthenticationUtil.getFullyAuthenticatedUser());
return imgNode;
}
});
// This is what ScriptNode.createThumbnail does
final ThumbnailDefinition details = thumbnailRegistry.getThumbnailDefinition("doclib");
final Action action = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Action>()
{
@Override
public Action execute() throws Throwable
{
return ThumbnailHelper.createCreateThumbnailAction(details, services);
}
});
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
// This is what ScriptNode.createThumbnail does
ThumbnailDefinition details = thumbnailRegistry.getThumbnailDefinition("doclib");
Action action = ThumbnailHelper.createCreateThumbnailAction(details, services);
// Creation of thumbnail
services.getActionService().executeAction(action, imgNode, true, false);
// The node in question should now have a thumbnail/rendition.
assertEquals(1, renditionService.getRenditions(imgNode).size());
return null;
return imgNode;
}
});