Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8289511: Improve test coverage for XPath Axes: child #2243

Closed

Conversation

SoniaZaldana
Copy link
Member

@SoniaZaldana SoniaZaldana commented Oct 30, 2023

This backport contains cfe9026fe0506488cc0f0557299cfa585811d194.

Patch does not apply cleanly. Notably, I made a change in how the string XML is initialized.
Original commit uses triple quotes which are not yet enabled in jdk 11. I am adding the relevant differences below.
Test passes.

diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpChildTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpChildTest.java
index 00d6002209f..6f06192c44e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpChildTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpChildTest.java
@@ -45,19 +45,20 @@ import java.io.InputStream;
  */
 public class XPathExpChildTest {
 
-    private static final String XML =
-            "<store>\n" +
-            "   <book id=\"1\" lang=\"en\">\n" +
-            "       <title/>\n" +
-            "       <author id=\"1\"/>\n" +
-            "       <isbn>1234</isbn>\n" +
-            "   </book>\n" +
-            "   <book id=\"2\" lang=\"en\">\n" +
-            "       <title/>\n" +
-            "       <author id=\"2\"/>\n" +
-            "       <isbn>5678</isbn>\n" +
-            "   </book>\n" +
-            "</store>";
+    private static final String XML = """
+            <store>
+               <book id="1" lang="en">
+                  <title/>
+                  <author id="1"/>
+                  <isbn>1234</isbn>
+               </book>
+               <book id="2" lang="en">
+                  <title/>
+                  <author id="2"/>
+                  <isbn>5678</isbn>
+               </book>
+            </store>
+            """;
     private static final String AUTHOR_1 = "author_1";
     private static final String AUTHOR_2 = "author_2";
     private static final Document doc;

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8289511 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8289511: Improve test coverage for XPath Axes: child (Sub-task - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2243/head:pull/2243
$ git checkout pull/2243

Update a local copy of the PR:
$ git checkout pull/2243
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2243/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2243

View PR using the GUI difftool:
$ git pr show -t 2243

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2243.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 2023

👋 Welcome back szaldana! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport cfe9026fe0506488cc0f0557299cfa585811d194 8289511: Improve test coverage for XPath Axes: child Oct 30, 2023
@openjdk
Copy link

openjdk bot commented Oct 30, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 30, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 30, 2023

Webrevs

@openjdk openjdk bot added the approval label Oct 30, 2023
@GoeLin
Copy link
Member

GoeLin commented Oct 31, 2023

Hi @SoniaZaldana, please first get a review, then request approval. I eventually will remove the label to get it out of my worklist if it is not ready for approval. You can label again once it fulfils all requirements.
See also https://wiki.openjdk.org/display/JDKUpdates/How+to+contribute+or+backport+a+fix

@openjdk openjdk bot removed the approval label Nov 1, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 28, 2023

@SoniaZaldana This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk
Copy link

openjdk bot commented Nov 28, 2023

⚠️ @SoniaZaldana This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Nov 28, 2023
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Backport looks clean, other than the need to replace the use of JEP 355 Text Blocks. The replacement version looks good, though I can see why they wanted to use text blocks for this and avoid all the additional escaping.
I presume the test passes on 11u?

@GoeLin
Copy link
Member

GoeLin commented Nov 29, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Nov 29, 2023

@GoeLin
8289511: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Nov 29, 2023

@SoniaZaldana This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8289511: Improve test coverage for XPath Axes: child

Reviewed-by: aph, andrew

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 70 new commits pushed to the master branch:

  • 3a3efef: 8227438: [TESTLIB] Determine if file exists by Files.exists in function FileUtils.deleteFileIfExistsWithRetry
  • cf544e0: 8214915: CtwRunner misses export for jdk.internal.access
  • 9d4da7c: 8214908: add ctw tests for jdk.jfr and jdk.management.jfr modules
  • 9591e12: 8219475: javap man page needs to be updated
  • 0e29291: 8320884: Bump update version for OpenJDK: jdk-11.0.23
  • be01e6e: 8263530: sun.awt.X11.ListHelper.removeAll() should use clear()
  • 40ee106: 8282143: Objects.requireNonNull should be ForceInline
  • a3661a5: 8231556: Wrong font ligatures used when 2 versions of same font used
  • f65058e: 8053479: (dc) DatagramChannel.read() throws exception instead of discarding data when buffer too small
  • a956ba6: 8315692: Parallelize gc/stress/TestStressRSetCoarsening.java test
  • ... and 60 more: https://git.openjdk.org/jdk11u-dev/compare/2fbb4b92bdcbc3a478c06cc6c904391c1d2e326e...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@theRealAph, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Nov 29, 2023
@SoniaZaldana
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 29, 2023
@openjdk
Copy link

openjdk bot commented Nov 29, 2023

@SoniaZaldana
Your change (at version b5a238b) is now ready to be sponsored by a Committer.

@SoniaZaldana
Copy link
Member Author

Backport looks clean, other than the need to replace the use of JEP 355 Text Blocks. The replacement version looks good, though I can see why they wanted to use text blocks for this and avoid all the additional escaping. I presume the test passes on 11u?

Thanks @gnu-andrew! Yes, the test passes on 11u.

@tstuefe
Copy link
Member

tstuefe commented Nov 29, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 29, 2023

Going to push as commit ac1764d.
Since your change was applied there have been 70 commits pushed to the master branch:

  • 3a3efef: 8227438: [TESTLIB] Determine if file exists by Files.exists in function FileUtils.deleteFileIfExistsWithRetry
  • cf544e0: 8214915: CtwRunner misses export for jdk.internal.access
  • 9d4da7c: 8214908: add ctw tests for jdk.jfr and jdk.management.jfr modules
  • 9591e12: 8219475: javap man page needs to be updated
  • 0e29291: 8320884: Bump update version for OpenJDK: jdk-11.0.23
  • be01e6e: 8263530: sun.awt.X11.ListHelper.removeAll() should use clear()
  • 40ee106: 8282143: Objects.requireNonNull should be ForceInline
  • a3661a5: 8231556: Wrong font ligatures used when 2 versions of same font used
  • f65058e: 8053479: (dc) DatagramChannel.read() throws exception instead of discarding data when buffer too small
  • a956ba6: 8315692: Parallelize gc/stress/TestStressRSetCoarsening.java test
  • ... and 60 more: https://git.openjdk.org/jdk11u-dev/compare/2fbb4b92bdcbc3a478c06cc6c904391c1d2e326e...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 29, 2023
@openjdk openjdk bot closed this Nov 29, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 29, 2023
@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Nov 29, 2023
@openjdk
Copy link

openjdk bot commented Nov 29, 2023

@tstuefe @SoniaZaldana Pushed as commit ac1764d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants