Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
8284920: Incorrect Token type causes XPath expression to return incor…
…rect results

Backport-of: 81a8e2f8b32ad27aed45c4f6966e8d9ecf8b0fc9
  • Loading branch information
Ravi Reddy authored and coffeys committed Apr 21, 2022
1 parent c0d3d5e commit 07f4a0f
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 2 deletions.
Expand Up @@ -58,6 +58,7 @@ public final class Token {
static final String DIV = "div";
static final String MOD = "mod";
static final String QUO = "quo";
static final String DOT_STR = ".";
static final String DDOT = "..";
static final String DCOLON = "::";
static final String ATTR = "attribute";
Expand Down
Expand Up @@ -35,7 +35,7 @@
* Tokenizes and parses XPath expressions. This should really be named
* XPathParserImpl, and may be renamed in the future.
* @xsl.usage general
* @LastModified: Jan 2022
* @LastModified: Apr 2022
*/
public class XPathParser
{
Expand Down Expand Up @@ -1661,7 +1661,7 @@ protected boolean Step() throws TransformerException
opPos = m_ops.getOp(OpMap.MAPINDEX_LENGTH);
}

if (tokenIs(Token.DOT))
if (tokenIs(Token.DOT_STR))
{
nextToken();

Expand Down
121 changes: 121 additions & 0 deletions test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpTest.java
@@ -0,0 +1,121 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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 General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package xpath;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

/*
* @test
* @bug 8284920
* @run testng/othervm xpath.XPathExpTest
* @summary Tests for various XPath Expressions.
*/
public class XPathExpTest {

private static final String XML =
"<root>"
+ " <child id='1'>"
+ " <grandchild id='1'/>"
+ " <grandchild id='2'/>"
+ " </child>"
+ " <child id='2'>"
+ " <grandchild id='3'/>"
+ " <grandchild id='4'/>"
+ " </child>"
+ " <child id='3'>"
+ " <grandchild id='5'/>"
+ " <grandchild id='6'/>"
+ " </child>"
+ " </root>";
private static final String PARENT_CHILD = "child(2)";

/*
* DataProvider for XPath expression test.
* Data columns:
* see parameters of the test "test"
*/
@DataProvider(name = "xpathExp")
public Object[][] getXPathExpression() throws Exception {

return new Object[][]{
// verifies various forms of the parent axis
{"/root/child[@id='2']", PARENT_CHILD},
{"//grandchild[@id='3']/parent::child", PARENT_CHILD},
{"//grandchild[@id='3']/parent::node()", PARENT_CHILD},
{"//grandchild[@id='3']/parent::*", PARENT_CHILD},
{"//grandchild[@id='3']/parent::node()/grandchild[@id='4']/parent::node()", PARENT_CHILD},
{"//grandchild[@id='3']/..", PARENT_CHILD},
{"//grandchild[@id='3']/../grandchild[@id='4']/..", PARENT_CHILD},
{"//grandchild[@id='3']/parent::node()/grandchild[@id='4']/..", PARENT_CHILD},

// verifies various forms of the self axis
{"/root/child[@id='2']/self::child", PARENT_CHILD},
{"/root/child[@id='2']/self::node()", PARENT_CHILD},
{"/root/child[@id='2']/self::*", PARENT_CHILD},
{"self::node()/root/child[@id='2']", PARENT_CHILD},
{"/root/child[@id='2']/.", PARENT_CHILD},
{"./root/child[@id='2']", PARENT_CHILD},
{".//child[@id='2']", PARENT_CHILD},
{"//grandchild[@id='3']/./../grandchild[@id='4']/..", PARENT_CHILD},
{"//grandchild[@id='3']/./parent::node()/grandchild[@id='4']/..", PARENT_CHILD},
};
}

/**
* Verifies XPath expressions.
*
* @param exp XPath expression
* @param expected expected result
* @throws Exception
*/
@Test(dataProvider = "xpathExp")
void test(String exp, String expected) throws Exception {
Document doc = getDoc(XML);
XPath xPath = XPathFactory.newInstance().newXPath();
NodeList nl = (NodeList) xPath.evaluate(exp, doc, XPathConstants.NODESET);
Node child = nl.item(0);
Assert.assertEquals(
child.getNodeName() + "(" + child.getAttributes().item(0).getNodeValue() + ")",
expected);
}

Document getDoc(String xml) throws Exception {
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
InputStream is = new ByteArrayInputStream(xml.getBytes());
return docBuilder.parse(is);
}
}

1 comment on commit 07f4a0f

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.