Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: mdoerr, akozlov
- Loading branch information
1 parent
c464f20
commit a95482a
Showing
4 changed files
with
132 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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); | ||
| } | ||
| } |
a95482aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk11u-dev
a95482aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
a95482aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RealCLanger the backport was successfully created on the branch RealCLanger-backport-a95482ac in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev: