8310631: test/jdk/sun/nio/cs/TestCharsetMapping.java is spuriously passing #15807

naotoj · 2023-09-19T01:01:14Z

Fixed the failing (well, false-positive) test case. Made the following changes to the test:

Corrected the path to the mapping files directory
Made sure to fail if the directory path is incorrect
Took care of GB18030 alias, which is dynamically derived at runtime
Provided MS950_HKSCS.map, which is simply a copy of HKSCS2008.map
Excluded other failing tests for IBM charsets that do not have map files.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8310631: test/jdk/sun/nio/cs/TestCharsetMapping.java is spuriously passing (Bug - P3)

Reviewers

Justin Lu (@justin-curtis-lu - Committer) ⚠️ Review applies to e2731ff8
Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15807/head:pull/15807
$ git checkout pull/15807

Update a local copy of the PR:
$ git checkout pull/15807
$ git pull https://git.openjdk.org/jdk.git pull/15807/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15807

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15807.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2023-09-19T01:02:07Z

👋 Welcome back naoto! 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 · 2023-09-19T01:04:06Z

@naotoj The following labels will be automatically applied to this pull request:

build
i18n

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

naotoj · 2023-09-19T01:04:55Z

/label remove build
/label add nio-dev core-libs-dev

openjdk · 2023-09-19T01:05:20Z

@naotoj
The build label was successfully removed.

openjdk · 2023-09-19T01:06:03Z

@naotoj
The nio label was successfully added.

The core-libs label was successfully added.

mlbridge · 2023-09-19T01:10:08Z

Webrevs

01: Full - Incremental (6d28a5ae)
00: Full (e2731ff8)

justin-curtis-lu

Actually tests 138 charsets now, looks good

justin-curtis-lu · 2023-09-19T18:15:54Z

test/jdk/sun/nio/cs/TestCharsetMapping.java

-            // not inside jdk repo, no mappings, exit silently
-            log.println("Nothing done, not in a jdk repo: ");
-            return;
+            throw new Exception("charsetmapping directory cannot be located.");


Might be helpful to provide directory location in exception message

Good point. Fixed.

AlanBateman

I suspect it was setup this way to allow the test tree be zipped up and the tests run without access to the src tree. In any case, the changes look okay, although a bit fragile to be reaching into the make/data tree for mapping data.

openjdk · 2023-09-25T06:26:59Z

@naotoj 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:

8310631: test/jdk/sun/nio/cs/TestCharsetMapping.java is spuriously passing

Reviewed-by: jlu, alanb

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

481cfc7: 8287325: AArch64: fix virtual threads with -XX:UseBranchProtection=pac-ret
f0ff001: 8315742: Open source several Swing Scroll related tests
a2391a9: 8316053: Open some swing tests 3
d2d7d9a: 8315882: Open some swing tests 2
68a9c81: 8316711: SEGV in LoaderConstraintTable::find_loader_constraint after JDK-8310874
e015e6c: 8315825: Open some swing tests
9aaac2e: 8301639: JDI and JDWP specs should clarify potential deadlock issues with method invocation
6b8261b: 8315464: Uncouple AllClassesIndexWriter from IndexBuilder
9b65b7d: 8316305: Initial buffer size of StackWalker is too small caused by JDK-8285447
53516ae: 8304956: Update KeyStore.getDefaultType() specification to return pkcs12 as fallback
... and 94 more: https://git.openjdk.org/jdk/compare/f09b7af6851c725b0fc4d63832b52e17c4d24836...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.

naotoj · 2023-09-25T17:45:09Z

/integrate

openjdk · 2023-09-25T18:04:27Z

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

9291b46: 8313804: JDWP support for -Djava.net.preferIPv6Addresses=system
afa4833: 8271268: Fix Javadoc links for Stream.mapMulti
9688ec2: 8311823: JFR: Uninitialized EventEmitter::_thread_id field
0f77d25: 8315684: Parallelize sun/security/util/math/TestIntegerModuloP.java
311c746: 8316859: RISC-V: Disable detection of V through HWCAP
0f0c5b2: 8316648: jrt-fs.jar classes not reproducible between standard and bootcycle builds
3d6e775: 8316669: ImmutableOopMapSet destructor not called
837783c: 8316670: Remove effectively unused nmethodBucket::_count
89e068b: 8316556: Fix typos in java.desktop
481cfc7: 8287325: AArch64: fix virtual threads with -XX:UseBranchProtection=pac-ret
... and 103 more: https://git.openjdk.org/jdk/compare/f09b7af6851c725b0fc4d63832b52e17c4d24836...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-09-25T18:05:15Z

@naotoj Pushed as commit e3201d1.

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

initial commit

e2731ff

openjdk bot added the rfr Pull request is ready for review label Sep 19, 2023

openjdk bot added build build-dev@openjdk.org i18n i18n-dev@openjdk.org labels Sep 19, 2023

openjdk bot removed the build build-dev@openjdk.org label Sep 19, 2023

openjdk bot added nio nio-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Sep 19, 2023

justin-curtis-lu approved these changes Sep 19, 2023

View reviewed changes

Included the failed directory location in the exception message

6d28a5a

AlanBateman approved these changes Sep 25, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 25, 2023

openjdk bot added the integrated Pull request has been integrated label Sep 25, 2023

openjdk bot closed this Sep 25, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 25, 2023

8310631: test/jdk/sun/nio/cs/TestCharsetMapping.java is spuriously passing #15807

8310631: test/jdk/sun/nio/cs/TestCharsetMapping.java is spuriously passing #15807

Uh oh!

Conversation

naotoj commented Sep 19, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Sep 19, 2023

Uh oh!

openjdk bot commented Sep 19, 2023

Uh oh!

naotoj commented Sep 19, 2023

Uh oh!

openjdk bot commented Sep 19, 2023

Uh oh!

openjdk bot commented Sep 19, 2023

Uh oh!

mlbridge bot commented Sep 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

justin-curtis-lu left a comment

Choose a reason for hiding this comment

Uh oh!

justin-curtis-lu Sep 19, 2023

Choose a reason for hiding this comment

Uh oh!

naotoj Sep 19, 2023

Choose a reason for hiding this comment

Uh oh!

AlanBateman left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Sep 25, 2023

Uh oh!

naotoj commented Sep 25, 2023

Uh oh!

openjdk bot commented Sep 25, 2023

Uh oh!

openjdk bot commented Sep 25, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

naotoj commented Sep 19, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 19, 2023 •

edited

Loading