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

8264512: jdk/test/jdk/java/util/prefs/ExportNode.java relies on default platform encoding #3332

Closed
wants to merge 1 commit into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Apr 2, 2021

This test emits to a java.io.ByteArrayOutputStream the contents of a java.utils.prefs.Preferences node. The UTF-8 character encoding is used [1]. The ByteArrayOutputStream is then converted to a String using toString() which uses the platform's default character set [2]. The resulting String is then checked for the node names that it should and should not contain.

This change proposes to use ByteArrayOutputStream.toString(String) to obtain the string [3] to maintain consistency of the encoding. It also adds throwing a RuntimeException if the node string is not as expected. It is unclear why this test was not already throwing such an exception.

[1] https://docs.oracle.com/en/java/javase/16/docs/api/java.prefs/java/util/prefs/Preferences.html#exportNode(java.io.OutputStream)
[2] https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/ByteArrayOutputStream.html#toString()
[3] https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/ByteArrayOutputStream.html#toString(java.lang.String)


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264512: jdk/test/jdk/java/util/prefs/ExportNode.java relies on default platform encoding

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3332/head:pull/3332
$ git checkout pull/3332

Update a local copy of the PR:
$ git checkout pull/3332
$ git pull https://git.openjdk.java.net/jdk pull/3332/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3332

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3332.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 2, 2021

👋 Welcome back bpb! 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 added the rfr Pull request is ready for review label Apr 2, 2021
@openjdk
Copy link

openjdk bot commented Apr 2, 2021

@bplb The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 2, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 2, 2021

Webrevs

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Apr 2, 2021

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8264512: jdk/test/jdk/java/util/prefs/ExportNode.java relies on default platform encoding

Reviewed-by: naoto

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 237 new commits pushed to the master branch:

  • 9c283da: 8264662: ProblemList vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java on win-x64 with ZGC
  • eb0ac86: 8264655: Minor internal doc comment cleanup
  • 3991b32: 8264539: Improve failure message of java/nio/file/WatchService/SensitivityModifier.java
  • 4133ded: 8264658: ProblemList javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java on linux-x64
  • 220ddbd: 8264657: ProblemList java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java on linux-x64
  • d0f3cc9: 8264656: ProblemList sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java on linux-x64
  • 6c145c4: 8264544: Case-insensitive comparison issue with supplementary characters.
  • f60e81b: 8264548: Dependencies: ClassHierarchyWalker::is_witness() cleanups
  • 177bc84: 8264606: More comment for ECDH public key validation
  • 885916e: 8262280: Incorrect exception handling for VMThread in class redefinition
  • ... and 227 more: https://git.openjdk.java.net/jdk/compare/6aa28b3bdb78eb041a963d659d61e1622bc43ef8...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 2, 2021
@bplb
Copy link
Member Author

bplb commented Apr 5, 2021

/integrate

@openjdk openjdk bot closed this Apr 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 5, 2021
@openjdk
Copy link

openjdk bot commented Apr 5, 2021

@bplb Since your change was applied there have been 248 commits pushed to the master branch:

  • a0ec2cb: 8248862: Implement Enhanced Pseudo-Random Number Generators
  • 39719da: 8253266: JList and JTable constructors should clear OPAQUE_SET before calling updateUI
  • a8005ef: 8166727: javac crashed: [jimage.dll+0x1942] ImageStrings::find+0x28
  • 7f9ece2: 8264650: Cross-compilation to macos/aarch64
  • 0039c18: 8264475: CopyArea ignores clip state in metal rendering pipeline
  • f084bd2: 8262355: Support for AVX-512 opmask register allocation.
  • 0780666: 8254050: HotSpot Style Guide should permit using the "override" virtual specifier
  • f259eea: 8264393: JDK-8258284 introduced dangling TLH race
  • 9b2232b: 8264123: add ThreadsList.is_valid() support
  • e8eda65: 8264664: use text blocks in javac module tests
  • ... and 238 more: https://git.openjdk.java.net/jdk/compare/6aa28b3bdb78eb041a963d659d61e1622bc43ef8...master

Your commit was automatically rebased without conflicts.

Pushed as commit 104e925.

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

@bplb bplb deleted the ExportNode-8264512 branch April 6, 2021 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants