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.

Sign up for GitHub

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

Jump to bottom

8347841: Test fixes that use deprecated time zone IDs #23166

Closed
wants to merge 2 commits into from
Closed

8347841: Test fixes that use deprecated time zone IDs #23166

wants to merge 2 commits into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Jan 16, 2025 •
edited by openjdk bot
Loading

This fix is a follow on for JDK-8342550. Replaces/Removes usages of those deprecated time zone ids in tests.

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-8347841: Test fixes that use deprecated time zone IDs (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23166

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 16, 2025

👋 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
Copy link

openjdk bot commented Jan 16, 2025 •
edited
Loading

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

8347841: Test fixes that use deprecated time zone IDs

Reviewed-by: jlu, joehw

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 27 new commits pushed to 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 16, 2025
@openjdk
Copy link

openjdk bot commented Jan 16, 2025

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

  • core-libs
  • i18n
  • security

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.

@mlbridge
Copy link

mlbridge bot commented Jan 16, 2025 •
edited
Loading

Webrevs

justin-curtis-lu
justin-curtis-lu approved these changes Jan 17, 2025
View reviewed changes
Copy link
Member

@justin-curtis-lu justin-curtis-lu 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.

test/jdk/java/util/TimeZone/TimeZoneBoundaryTest.java
// "EST" is disabled because its behavior depends on the mapping property. (6466476).
//findBoundariesStepwise(1997, ONE_DAY, TimeZone.getTimeZone("EST"), 2);
findBoundariesStepwise(1997, ONE_DAY, TimeZone.getTimeZone("HST"), 0);
findBoundariesStepwise(1997, ONE_DAY, TimeZone.getTimeZone("PST"), 2);
Copy link
Member

Choose a reason for hiding this comment

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

"PST" to "America/Los_Angeles" not needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's already there at L421

Copy link
Member

Choose a reason for hiding this comment

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

Right, looks good then.

test/jdk/java/text/Format/DateFormat/DateFormatTest.java Outdated
@@ -183,7 +187,7 @@ public void TestTwoDigitYearDSTParse()
//logln(fmt.format(date)); // This shows what the current locale format is
//logln(((SimpleDateFormat)fmt).toPattern());
TimeZone save = TimeZone.getDefault();
TimeZone PST = TimeZone.getTimeZone("PST");
TimeZone PST = TimeZone.getTimeZone("America/Los_Angeles");
Copy link
Member

Choose a reason for hiding this comment

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

nit: extra space after "PST" here and below.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 17, 2025
@naotoj
Copy link
Member Author

naotoj commented Jan 21, 2025

Thanks for the reviews!
/integrate

@openjdk
Copy link

openjdk bot commented Jan 21, 2025

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

  • 3d4afc4: 8345079: Simplify/cleanup Exception handling in RMIConnectionImpl
  • a62a870: 8347995: Race condition in jdk/java/net/httpclient/offline/FixedResponseHttpClient.java
  • 8e8c948: 8346866: [ASAN] memoryReserver.cpp reported applying non-zero offset to non-null pointer produced null pointer
  • 1ed396b: 8346927: serviceability/dcmd/vm/[SystemMapTest.java|SystemDumpMapTest.java] fail at jmx
  • 5c4a387: 8348107: test/jdk/java/net/httpclient/HttpsTunnelAuthTest.java fails intermittently
  • 48c7597: 8348029: Make gtest death tests work with real crash signals
  • 4a9fba6: 8347990: Remove SIZE_FORMAT macros and replace remaining uses
  • c33c1cf: 8347909: Automatic precompiled.hpp inclusion
  • f54e0bf: 8345766: C2 should emit macro nodes for ModF/ModD instead of calls during parsing
  • 0f426e4: 8343685: C2 SuperWord: refactor VPointer with MemPointer
  • ... and 48 more: https://git.openjdk.org/jdk/compare/cfe70ebcb3a9fadceac5eccdc1f3353d0d74c235...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 21, 2025

@naotoj Pushed as commit 81912e9.

💡 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
Reviewers

@JoeWang-Java JoeWang-Java JoeWang-Java approved these changes

@justin-curtis-lu justin-curtis-lu justin-curtis-lu approved these changes

Assignees
No one assigned
Labels
core-libs [email protected] i18n [email protected] integrated Pull request has been integrated security [email protected]
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@naotoj @justin-curtis-lu @JoeWang-Java