Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 16, 2025

I backport this for parity with 17.0.15-oracle.

Several enhancements touched the files edited in this change
causing the need to resolve. Among others:
8283698: Refactor Locale constructors used in src/test
8287868: Localized names update in COMPAT locale provider
Several tests needed resolving of Copyright. I omit those in the
following list.

test/jdk/java/text/BreakIterator/BreakIteratorTest.java
Two of the modified tests not in 17.

test/jdk/java/text/Collator/APITest.java
test/jdk/java/text/Format/DateFormat/DateFormatTest.java
I had to edit the quite different test output, but changes trivial.

test/jdk/java/text/Format/NumberFormat/Bug4838107.java
Later change "8317372: Refactor some NumberFormat tests to use JUnit" was already backported
including some lines of this change.

test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java
19 added enhancement "8282625: Formatter caches Locale/DecimalFormatSymbols poorly"
I had to edit the quite different test output, but changes trivial.

test/jdk/java/util/Locale/LegacyCodesClassInvariant.java
This includes a bit of test rework I had to resolve, but the changed
code is identical to 21. The resolve is needed becuase of context
differences.

test/jdk/java/util/Locale/LocaleEnhanceTest.java
test/jdk/java/util/Locale/LocaleTest.java
These needed mostly trivial edits.

test/jdk/java/util/TimeZone/TimeZoneTest.java
Resolved as "8285844: TimeZone.getTimeZone(ZoneOffset) does not work for all
ZoneOffsets and returns GMT unexpected" not in 17.


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
  • JDK-8316696 needs maintainer approval

Issue

  • JDK-8316696: Remove the testing base classes: IntlTest and CollatorTest (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3214

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 16, 2025

👋 Welcome back goetz! 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
Copy link

openjdk bot commented Jan 16, 2025

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

8316696: Remove the testing base classes: IntlTest and CollatorTest

Reviewed-by: mdoerr

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

  • 9db8d28: 8337826: Improve logging in OCSPTimeout and SimpleOCSPResponder to help diagnose JDK-8309754
  • 18f7669: 8325024: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java incorrect comment information
  • 6a5aaaa: 8310629: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java fails with RuntimeException Server not ready
  • 2b8c19a: 8309740: Expand timeout windows for tests in JDK-8179502
  • 25c7a7b: 8179502: Enhance OCSP, CRL and Certificate Fetch Timeouts
  • df6014e: 8346887: DrawFocusRect() may cause an assertion failure

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

@GoeLin GoeLin changed the title Goetz backport 8316696 backport b859da9c548fbd1463b336059d1c55312c7b7ba4 Jan 16, 2025
@openjdk openjdk bot changed the title backport b859da9c548fbd1463b336059d1c55312c7b7ba4 8316696: Remove the testing base classes: IntlTest and CollatorTest Jan 16, 2025
@openjdk
Copy link

openjdk bot commented Jan 16, 2025

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jan 16, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 16, 2025

Webrevs

@GoeLin GoeLin force-pushed the goetz_backport_8316696 branch from 0a66b43 to 913d455 Compare January 16, 2025 18:55
@openjdk
Copy link

openjdk bot commented Jan 16, 2025

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@GoeLin GoeLin force-pushed the goetz_backport_8316696 branch from 913d455 to 5dba2d4 Compare January 16, 2025 18:59
@openjdk
Copy link

openjdk bot commented Jan 16, 2025

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the explanations.

@openjdk
Copy link

openjdk bot commented Jan 17, 2025

⚠️ @GoeLin 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 approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jan 17, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Jan 18, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 18, 2025

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

  • 9db8d28: 8337826: Improve logging in OCSPTimeout and SimpleOCSPResponder to help diagnose JDK-8309754
  • 18f7669: 8325024: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java incorrect comment information
  • 6a5aaaa: 8310629: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java fails with RuntimeException Server not ready
  • 2b8c19a: 8309740: Expand timeout windows for tests in JDK-8179502
  • 25c7a7b: 8179502: Enhance OCSP, CRL and Certificate Fetch Timeouts
  • df6014e: 8346887: DrawFocusRect() may cause an assertion failure

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 18, 2025
@openjdk openjdk bot closed this Jan 18, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 18, 2025
@openjdk
Copy link

openjdk bot commented Jan 18, 2025

@GoeLin Pushed as commit 2d29e1b.

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

@GoeLin GoeLin deleted the goetz_backport_8316696 branch January 18, 2025 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants