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

Commit

Permalink
Browse files Browse the repository at this point in the history
8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head
Reviewed-by: bae
  • Loading branch information
Yuri Nesterenko committed May 16, 2022
1 parent c83eb83 commit 7ecb5b2
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 10 deletions.
Expand Up @@ -359,7 +359,7 @@ else if ((Token.LPAREN != c) && (Token.RPAREN != c) && (Token.RBRACK != c)) {

addToTokenQueue(pat.substring(i, i + 1));
break;
case Token.COLON_CHAR:
case Token.COLON :
if (i>0)
{
if (posOfNSSep == (i - 1))
Expand Down Expand Up @@ -614,7 +614,7 @@ private void recordTokenString(Vector targetStrings)
resetTokenMark(tokPos + 1);
}

if (m_processor.lookahead(Token.COLON_CHAR, 1))
if (m_processor.lookahead(Token.COLON, 1))
{
tokPos += 2;
}
Expand Down
Expand Up @@ -45,9 +45,10 @@ public final class Token {
static final char LPAREN = '(';
static final char RPAREN = ')';
static final char COMMA = ',';
static final char DOT = '.';
static final char AT = '@';
static final char US = '_';
static final char COLON_CHAR = ':';
static final char COLON = ':';
static final char SQ = '\'';
static final char DQ = '"';
static final char DOLLAR = '$';
Expand All @@ -57,7 +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 = ".";
static final String DOT_STR = ".";
static final String DDOT = "..";
static final String DCOLON = "::";
static final String ATTR = "attribute";
Expand Down
Expand Up @@ -38,7 +38,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 @@ -1461,7 +1461,7 @@ else if ((null != m_token) && ((('.' == m_tokenChar) && (m_token.length() > 1) &

matchFound = true;
}
else if (lookahead(Token.LPAREN, 1) || (lookahead(Token.COLON_CHAR, 1) && lookahead(Token.LPAREN, 3)))
else if (lookahead(Token.LPAREN, 1) || (lookahead(Token.COLON, 1) && lookahead(Token.LPAREN, 3)))
{
matchFound = FunctionCall();
}
Expand Down Expand Up @@ -1505,7 +1505,7 @@ protected boolean FunctionCall() throws TransformerException

int opPos = m_ops.getOp(OpMap.MAPINDEX_LENGTH);

if (lookahead(Token.COLON_CHAR, 1))
if (lookahead(Token.COLON, 1))
{
appendOp(4, OpCodes.OP_EXTFUNCTION);

Expand Down Expand Up @@ -1709,7 +1709,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 Expand Up @@ -1889,7 +1889,7 @@ protected void NodeTest(int axesType) throws TransformerException
m_ops.setOp(m_ops.getOp(OpMap.MAPINDEX_LENGTH), OpCodes.NODENAME);
m_ops.setOp(OpMap.MAPINDEX_LENGTH, m_ops.getOp(OpMap.MAPINDEX_LENGTH) + 1);

if (lookahead(Token.COLON_CHAR, 1))
if (lookahead(Token.COLON, 1))
{
if (tokenIs(Token.STAR))
{
Expand Down Expand Up @@ -1992,7 +1992,7 @@ protected void PredicateExpr() throws TransformerException
protected void QName() throws TransformerException
{
// Namespace
if(lookahead(Token.COLON_CHAR, 1))
if(lookahead(Token.COLON, 1))
{
m_ops.setOp(m_ops.getOp(OpMap.MAPINDEX_LENGTH), m_queueMark - 1);
m_ops.setOp(OpMap.MAPINDEX_LENGTH, m_ops.getOp(OpMap.MAPINDEX_LENGTH) + 1);
Expand Down
121 changes: 121 additions & 0 deletions jdk/test/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 7ecb5b2

@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.