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 V3.4-BUG-FIX to HEAD

Browse Source 
31676: ALF-8906: Fix IMAP unit test failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-11-03 10:47:23 +00:00
parent 9e738b2b69
commit b9034085db
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/imap/ImapMessageTest.java
View File

@@ -205,7 +205,7 @@ public class ImapMessageTest extends TestCase
// Starting IMAP // Starting IMAP
imapServiceImpl.startupInTxn(); imapServiceImpl.startupInTxn(true);
nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + IMAP_FOLDER_NAME, null, nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + IMAP_FOLDER_NAME, null,
namespaceService, false); namespaceService, false);

6
source/java/org/alfresco/repo/imap/ImapServiceImpl.java
View File

@@ -204,7 +204,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
@Override @Override
protected void onBootstrap(ApplicationEvent event) protected void onBootstrap(ApplicationEvent event)
{ {
service.startupInTxn(); service.startupInTxn(false);
} }
@Override @Override
@@ -431,9 +431,9 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
{ {
} }
protected void startupInTxn() protected void startupInTxn(boolean force)
{ {
if (getImapServerEnabled()) if (force || getImapServerEnabled())
{ {
AuthenticationUtil.runAs(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()
{ {

2
source/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java
View File

@@ -98,7 +98,7 @@ public class ImapServiceImplCacheTest extends TestCase
imapServiceImpl.setImapHome(imapHome); imapServiceImpl.setImapHome(imapHome);
// Starting IMAP // Starting IMAP
imapServiceImpl.startupInTxn(); imapServiceImpl.startupInTxn(true);
nodeRefs = searchService.selectNodes(storeRootNodeRef, nodeRefs = searchService.selectNodes(storeRootNodeRef,
companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_FOLDER_NAME, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_FOLDER_NAME,

2
source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
View File

@@ -180,7 +180,7 @@ public class ImapServiceImplTest extends TestCase
imapServiceImpl.setImapHome(imapHome); imapServiceImpl.setImapHome(imapHome);
// Starting IMAP // Starting IMAP
imapServiceImpl.startupInTxn(); imapServiceImpl.startupInTxn(true);
nodeRefs = searchService.selectNodes(storeRootNodeRef, nodeRefs = searchService.selectNodes(storeRootNodeRef,
companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_FOLDER_NAME, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_FOLDER_NAME,

2
source/java/org/alfresco/repo/imap/LoadTester.java
View File

@@ -163,7 +163,7 @@ public class LoadTester extends TestCase
imapServiceImpl.setImapHome(imapHome); imapServiceImpl.setImapHome(imapHome);
// Starting IMAP // Starting IMAP
imapServiceImpl.startupInTxn(); imapServiceImpl.startupInTxn(true);
nodeRefs = searchService.selectNodes(storeRootNodeRef, nodeRefs = searchService.selectNodes(storeRootNodeRef,
companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_ROOT_FOLDER_NAME, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_ROOT_FOLDER_NAME,