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

Removed unnecessary search from test

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-10-11 14:40:23 +00:00
parent b22b576aca
commit 3726c3d5a9
1 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
View File

@@ -81,7 +81,6 @@ public class ConcurrentNodeServiceTest extends TestCase
private TransactionService transactionService; private TransactionService transactionService;
private RetryingTransactionHelper retryingTransactionHelper; private RetryingTransactionHelper retryingTransactionHelper;
private NodeRef rootNodeRef; private NodeRef rootNodeRef;
private FullTextSearchIndexer luceneFTS;
private AuthenticationComponent authenticationComponent; private AuthenticationComponent authenticationComponent;
public ConcurrentNodeServiceTest() public ConcurrentNodeServiceTest()
@@ -107,7 +106,6 @@ public class ConcurrentNodeServiceTest extends TestCase
nodeService = (NodeService) ctx.getBean("dbNodeService"); nodeService = (NodeService) ctx.getBean("dbNodeService");
transactionService = (TransactionService) ctx.getBean("transactionComponent"); transactionService = (TransactionService) ctx.getBean("transactionComponent");
retryingTransactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper"); retryingTransactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper");
luceneFTS = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer");
this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
this.authenticationComponent.setSystemUserAsCurrentUser(); this.authenticationComponent.setSystemUserAsCurrentUser();
@@ -205,10 +203,6 @@ public class ConcurrentNodeServiceTest extends TestCase
public void testConcurrent() throws Exception public void testConcurrent() throws Exception
{ {
luceneFTS.pause();
// TODO: LUCENE UPDATE ISSUE fix commit lock time out
// IndexWriter.COMMIT_LOCK_TIMEOUT = 100000;
Map<QName, ChildAssociationRef> assocRefs = commitNodeGraph(); Map<QName, ChildAssociationRef> assocRefs = commitNodeGraph();
Thread runner = null; Thread runner = null;
@@ -251,33 +245,7 @@ public class ConcurrentNodeServiceTest extends TestCase
SearchService searcher = (SearchService) ctx.getBean(ServiceRegistry.SEARCH_SERVICE.getLocalName()); SearchService searcher = (SearchService) ctx.getBean(ServiceRegistry.SEARCH_SERVICE.getLocalName());
assertEquals( assertEquals(
2 * ((COUNT * REPEATS) + 1), 2 * ((COUNT * REPEATS) + 1),
searcher.selectNodes(rootNodeRef, "/*", null, getNamespacePrefixReolsver(""), false).size()); searcher.selectNodes(rootNodeRef, "/*", null, getNamespacePrefixResolver(""), false).size());
ResultSet results = null;
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*\"");
// n6 has root aspect - there are three things at the root level in the index
assertEquals(3 * ((COUNT * REPEATS) + 1), results.length());
results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*\"");
// n6 has root aspect - there are three things at the root level in the index
assertEquals(4 * ((COUNT * REPEATS) + 1), results.length());
results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*\"");
// n6 has root aspect - there are three things at the root level in the index
assertEquals(2 * ((COUNT * REPEATS) + 1), results.length());
results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*/*\"");
// n6 has root aspect - there are three things at the root level in the index
assertEquals(1 * ((COUNT * REPEATS) + 1), results.length());
results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*/*/*\"");
// n6 has root aspect - there are three things at the root level in the index
assertEquals(0 * ((COUNT * REPEATS) + 1), results.length());
results.close();
return null; return null;
} }
@@ -352,7 +320,6 @@ public class ConcurrentNodeServiceTest extends TestCase
{ {
final List<Thread> threads = new ArrayList<Thread>(); final List<Thread> threads = new ArrayList<Thread>();
final int loops = 200; final int loops = 200;
luceneFTS.pause();
// Have 5 threads, each trying to edit their own properties on the same node // Have 5 threads, each trying to edit their own properties on the same node
// Loop repeatedly // Loop repeatedly
@@ -493,7 +460,7 @@ public class ConcurrentNodeServiceTest extends TestCase
transactionService.getRetryingTransactionHelper().doInTransaction(checkCallback, true); transactionService.getRetryingTransactionHelper().doInTransaction(checkCallback, true);
} }
private NamespacePrefixResolver getNamespacePrefixReolsver(String defaultURI) private NamespacePrefixResolver getNamespacePrefixResolver(String defaultURI)
{ {
DynamicNamespacePrefixResolver nspr = new DynamicNamespacePrefixResolver(null); DynamicNamespacePrefixResolver nspr = new DynamicNamespacePrefixResolver(null);
nspr.registerNamespace(NamespaceService.SYSTEM_MODEL_PREFIX, NamespaceService.SYSTEM_MODEL_1_0_URI); nspr.registerNamespace(NamespaceService.SYSTEM_MODEL_PREFIX, NamespaceService.SYSTEM_MODEL_1_0_URI);