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

AVM - build/test fix (follow on from 11225)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-10-07 10:59:07 +00:00
parent de9d724dde
commit 1a65e7d914
2 changed files with 102 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
View File

@@ -74,6 +74,8 @@ public class AVMCrawlTestP extends AVMServiceTestBase
* @param runTime Min run time (in msecs) * @param runTime Min run time (in msecs)
*/ */
private void testCrawl(int n, String fsPath, int m, long runTime) private void testCrawl(int n, String fsPath, int m, long runTime)
{
try
{ {
Authentication authentication = AuthenticationUtil.setCurrentUser(AuthenticationUtil.SYSTEM_USER_NAME); Authentication authentication = AuthenticationUtil.setCurrentUser(AuthenticationUtil.SYSTEM_USER_NAME);
try try
@@ -83,11 +85,6 @@ public class AVMCrawlTestP extends AVMServiceTestBase
fail("Must have at least one 1 copy of content"); fail("Must have at least one 1 copy of content");
} }
if (fService.getStore("main") != null)
{
fService.purgeStore("main");
}
BulkLoader loader = new BulkLoader(); BulkLoader loader = new BulkLoader();
loader.setAvmService(fService); loader.setAvmService(fService);
for (int i = 0; i < m; i++) for (int i = 0; i < m; i++)
@@ -198,4 +195,9 @@ public class AVMCrawlTestP extends AVMServiceTestBase
} }
} }
} }
finally
{
AuthenticationUtil.clearCurrentSecurityContext();
}
}
} }

8
source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
View File

@@ -86,6 +86,8 @@ public class AVMServiceTestBase extends TestCase
protected static AVMLockingService fLockingService; protected static AVMLockingService fLockingService;
protected static AuthenticationService fAuthService;
public void testSetup() public void testSetup()
{ {
// NOOP // NOOP
@@ -109,9 +111,8 @@ public class AVMServiceTestBase extends TestCase
fTransactionService = (TransactionService)fContext.getBean("transactionComponent"); fTransactionService = (TransactionService)fContext.getBean("transactionComponent");
fLockingService = (AVMLockingService)fContext.getBean("AVMLockingService"); fLockingService = (AVMLockingService)fContext.getBean("AVMLockingService");
fIndexingInterceptor = (AVMSnapShotTriggeredIndexingMethodInterceptor)fContext.getBean("avmSnapShotTriggeredIndexingMethodInterceptor"); fIndexingInterceptor = (AVMSnapShotTriggeredIndexingMethodInterceptor)fContext.getBean("avmSnapShotTriggeredIndexingMethodInterceptor");
fAuthService = (AuthenticationService)fContext.getBean("AuthenticationService");
AuthenticationService authService = (AuthenticationService)fContext.getBean("AuthenticationService");
authService.authenticate("admin", "admin".toCharArray());
CreateStoreTxnListener cstl = (CreateStoreTxnListener)fContext.getBean("createStoreTxnListener"); CreateStoreTxnListener cstl = (CreateStoreTxnListener)fContext.getBean("createStoreTxnListener");
cstl.addCallback( cstl.addCallback(
new CreateStoreCallback() new CreateStoreCallback()
@@ -153,6 +154,9 @@ public class AVMServiceTestBase extends TestCase
} }
); );
} }
fAuthService.authenticate("admin", "admin".toCharArray());
if (fService.getStore("main") == null) if (fService.getStore("main") == null)
{ {
fService.createStore("main"); fService.createStore("main");