mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.2 to HEAD
11016: Query performance improvements 11018: Build fixes after .... Query performance improvements 11043: Updated Lucene config and test fixes 11047: Fixed test's expected results 11049: Build fix 11051: Tighten up on Auditable tests and checks for null git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -153,7 +153,7 @@ public class SearcherComponentTest extends TestCase
|
||||
|
||||
xpath = new NodeServiceXPath("*/*", documentNavigator, null);
|
||||
list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
|
||||
assertEquals(4, list.size());
|
||||
assertEquals(5, list.size());
|
||||
|
||||
xpath = new NodeServiceXPath("*/*/*", documentNavigator, null);
|
||||
list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
|
||||
@@ -169,7 +169,7 @@ public class SearcherComponentTest extends TestCase
|
||||
|
||||
xpath = new NodeServiceXPath("*//.", documentNavigator, null);
|
||||
list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
|
||||
assertEquals(12, list.size());
|
||||
assertEquals(13, list.size());
|
||||
|
||||
xpathStr = "test:root_p_n1";
|
||||
xpath = new NodeServiceXPath(xpathStr, documentNavigator, null);
|
||||
@@ -268,7 +268,7 @@ public class SearcherComponentTest extends TestCase
|
||||
xpath = new NodeServiceXPath(xpathStr, documentNavigator, new QueryParameterDefinition[] { paramDef });
|
||||
xpath.addNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
|
||||
list = xpath.selectNodes(assocRefs.get(qname));
|
||||
assertEquals(2, list.size()); // 2 distinct paths to node n8, which is of type content
|
||||
assertEquals(3, list.size()); // 2 distinct paths to node n8, which is of type content
|
||||
|
||||
xpath = new NodeServiceXPath("/", documentNavigator, null);
|
||||
xpath.addNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
|
||||
@@ -560,7 +560,7 @@ public class SearcherComponentTest extends TestCase
|
||||
"element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
|
||||
documentNavigator, null);
|
||||
list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
|
||||
assertEquals(12, list.size());
|
||||
assertEquals(13, list.size());
|
||||
|
||||
xpath = new NodeServiceXPath("//element(jcr:root, *)".replaceAll(
|
||||
"element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
|
||||
@@ -577,7 +577,7 @@ public class SearcherComponentTest extends TestCase
|
||||
"element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
|
||||
documentNavigator, new QueryParameterDefinition[] { paramDef });
|
||||
list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
|
||||
assertEquals(2, list.size());
|
||||
assertEquals(3, list.size());
|
||||
|
||||
paramDef = new QueryParameterDefImpl(QName.createQName("test:type", namespacePrefixResolver), dictionaryService
|
||||
.getDataType(DataTypeDefinition.QNAME), true, BaseNodeServiceTest.TYPE_QNAME_TEST_CONTENT
|
||||
|
Reference in New Issue
Block a user