inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-07 18:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84312: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84198: Merged DEV to V4.2-BUG-FIX (4.2.4)
         84122: MNT-10730: In SelectNode() the third possible parameter is not evaluated properly
            - Now, true and false value will be handled as boolean.
            - Appropriate test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis 2014-09-18 17:33:46 +00:00
parent 8c2e06c458
commit 0fc1b60814
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/search/DocumentNavigator.java
View File

@ -368,6 +368,12 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
// decode the localname
localName = ISO9075.decode(localName);
// MNT-10730
if (localName != null && (localName.equalsIgnoreCase("true") || localName.equalsIgnoreCase("false")))
{
return Collections.singletonList(new Boolean(Boolean.parseBoolean(localName))).iterator();
}
ChildAssociationRef assocRef = (ChildAssociationRef) contextNode;
NodeRef childRef = assocRef.getChildRef();
QName qName = QName.createQName(namespaceURI, localName);

50
source/test-java/org/alfresco/repo/search/DocumentNavigatorTest.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.search;
import java.util.Iterator;
import org.jaxen.UnsupportedAxisException;
import junit.framework.TestCase;
public class DocumentNavigatorTest extends TestCase
{
public void testGetChildAxisIterator() throws UnsupportedAxisException
{
try
{
// Check true
DocumentNavigator docNav = new DocumentNavigator(null, null, null, null, false, false);
Iterator nodeIter = docNav.getChildAxisIterator(null, "true", "", null);
assertNotNull(nodeIter);
boolean value = (Boolean) nodeIter.next();
assertTrue("The true value should be returned. See MNT-10730", value);
// Check false
nodeIter = docNav.getChildAxisIterator(null, "false", "", null);
assertNotNull(nodeIter);
value = (Boolean) nodeIter.next();
assertFalse("The false value should be returned. See MNT-10730", value);
}
catch (NullPointerException exp)
{
fail("The boolean value should be returned. See MNT-10730");
}
}
}

1
source/test-java/org/alfresco/repo/search/SearchTestSuite.java
View File

@ -51,6 +51,7 @@ public class SearchTestSuite extends TestSuite
suite.addTestSuite(QueryRegisterComponentTest.class);
suite.addTestSuite(SearcherComponentTest.class);
suite.addTestSuite(SearchServiceTest.class);
suite.addTestSuite(DocumentNavigatorTest.class);
suite.addTestSuite(ADMLuceneCategoryTest.class);
suite.addTestSuite(ADMLuceneTest.class);
suite.addTestSuite(ALF947Test.class);