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

MTDemoTest fix - fallout from r14588 (changes to authorities)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-06-12 14:07:12 +00:00
parent bc991a45bc
commit 0dcda8c629
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/java/org/alfresco/repo/search/SearcherComponentTest.java
View File

@@ -121,7 +121,6 @@ public class SearcherComponentTest extends TestCase
public void testNodeXPath() throws Exception
{
Map<QName, ChildAssociationRef> assocRefs = BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
@@ -274,6 +273,12 @@ public class SearcherComponentTest extends TestCase
xpath.addNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
list = xpath.selectNodes(assocRefs.get(qname));
assertEquals(1, list.size());
xpathStr = "test:root_p_n1 | test:root_p_n2";
xpath = new NodeServiceXPath(xpathStr, documentNavigator, null);
xpath.addNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
assertEquals(2, list.size());
}
public void testSelectAPI() throws Exception
@@ -296,6 +301,51 @@ public class SearcherComponentTest extends TestCase
List<Serializable> attributes = searcher.selectProperties(rootNodeRef, "//@test:animal", null,
namespacePrefixResolver, false);
assertEquals(1, attributes.size());
NodeRef n1 = assocRefs.get(QName.createQName(BaseNodeServiceTest.NAMESPACE, "root_p_n1")).getChildRef();
NodeRef n2 = assocRefs.get(QName.createQName(BaseNodeServiceTest.NAMESPACE, "root_p_n2")).getChildRef();
answer = searcher.selectNodes(rootNodeRef, "test:root_p_n1 | test:root_p_n2", null, namespacePrefixResolver, false);
assertEquals(2, answer.size());
assertTrue(answer.contains(n1));
assertTrue(answer.contains(n2));
NodeRef n3 = assocRefs.get(QName.createQName(BaseNodeServiceTest.NAMESPACE, "n1_p_n3")).getChildRef();
answer = searcher.selectNodes(rootNodeRef, "//@test:animal", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
answer = searcher.selectNodes(rootNodeRef, "*//.[@test:animal]", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
answer = searcher.selectNodes(rootNodeRef, "*//.[@test:animal='monkey']", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
answer = searcher.selectNodes(rootNodeRef, "//.[@test:animal='monkey']", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
answer = searcher.selectNodes(rootNodeRef, "*//.[@test:animal='monkey']", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
answer = searcher.selectNodes(rootNodeRef, "//*[like(@test:animal, 'monk*')]", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
answer = searcher.selectNodes(rootNodeRef, "//@*", null, namespacePrefixResolver, false);
assertEquals(9, answer.size());
QName qname = QName.createQName(BaseNodeServiceTest.NAMESPACE, "my@test_with_at_sign");
ChildAssociationRef assoc = nodeService.createNode(n1, BaseNodeServiceTest.ASSOC_TYPE_QNAME_TEST_CHILDREN, qname, ContentModel.TYPE_CONTAINER);
NodeRef n4 = assoc.getChildRef();
answer = searcher.selectNodes(rootNodeRef, "/test:root_p_n1/test:my@test_with_at_sign", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n4));
}
/**

10
source/java/org/alfresco/repo/search/impl/NodeSearcher.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -123,9 +123,13 @@ public class NodeSearcher
throw new IllegalArgumentException("Malformed order by expression " + split[1]);
}
}
}
}
else
{
// match '@' in a folder/filename (but do not match XPath query syntax '[@' or '/@' or '(@' or '@*')
// TODO cannot yet match '(@' or '[@' in a folder/filename - would need to identify and encode path elements
xpath = xpath.replaceAll("(?<![/\\[(])@(?!//*)", "_x0040_");
}
DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searchService,