Skip to content

Fix for Locale matching in jdk24 #6049

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

Merged
merged 2 commits into from
Apr 22, 2025
Merged

Conversation

psawant19
Copy link
Contributor

@psawant19 psawant19 commented Mar 17, 2025

As per the openJDK release notes for JDK 24 (See : https://jdk.java.net/24/release-notes) CLDR was updated to version 46, which introduced a defaultContent mapping for Chinese (Latin, China) — zh_Latn_CN.

This commit has been done to:

  1. Update the properties files for jdk24+ versions.
  2. Update the testcases to reference jdk versions based on the jdk being tested.

References:-
https://www.oracle.com/java/technologies/javase/24-relnote-issues.html
https://cldr.unicode.org/downloads/cldr-46

Signed-off-by: Pratiksha Sawant [email protected]

@psawant19 psawant19 marked this pull request as draft March 17, 2025 13:18
@llxia
Copy link
Contributor

llxia commented Mar 17, 2025

@psawant19 psawant19 force-pushed the jdk24_localeMatching branch 2 times, most recently from a2af357 to 06acc79 Compare March 18, 2025 06:34
@psawant19
Copy link
Contributor Author

@llxia , This is a probable fix for locale.
Could you please trigger a build if it passes will create PR for this issue.

@llxia
Copy link
Contributor

llxia commented Apr 17, 2025

Grinder

00:04:27.076  TESTING:
00:04:27.076  1..5
00:04:27.076  base /home/jenkins/workspace/Grinder/jvmtest/functional/MBCS_Tests/locale_matching/
00:04:29.082  not ok 1 - LocaleFilterTest1
00:04:29.082  #   Failed test 'LocaleFilterTest1'
00:04:29.082  #   at /home/jenkins/workspace/Grinder/aqa-tests/TKG/../../jvmtest/functional/MBCS_Tests/locale_matching/test.pl line 94.
00:04:29.644  not ok 2 - LocaleFilterTest2
00:04:29.644  #   Failed test 'LocaleFilterTest2'
00:04:29.644  #   at /home/jenkins/workspace/Grinder/aqa-tests/TKG/../../jvmtest/functional/MBCS_Tests/locale_matching/test.pl line 94.
00:04:30.948  not ok 3 - LocaleFilterTest3
00:04:30.948  #   Failed test 'LocaleFilterTest3'
00:04:30.948  #   at /home/jenkins/workspace/Grinder/aqa-tests/TKG/../../jvmtest/functional/MBCS_Tests/locale_matching/test.pl line 94.
00:04:30.948  ok 4 - LocaleLookupTest1
00:04:32.214  ok 5 - LocaleLookupTest2
00:04:32.214  # Looks like you failed 3 tests of 5.
00:04:32.214  -----------------------------------
00:04:32.214  MBCS_Tests_locale_matching_zh_CN_linux_0_FAILED
00:04:32.214  -----------------------------------

@psawant19 psawant19 force-pushed the jdk24_localeMatching branch 2 times, most recently from 9fee889 to 77da7cf Compare April 22, 2025 07:03
@psawant19 psawant19 changed the title Locale matching - LocaleFilterTest3 Fix for Locale matching in jdk24 Apr 22, 2025
@psawant19
Copy link
Contributor Author

@llxia,

All test cases passed. Please find below the results.
https://hyc-runtimes-jenkins.swg-devops.com/view/Test_grinder/job/Grinder/49801/

12:36:02  TESTING:
12:36:02  1..5
12:36:02  base /home/jenkins/workspace/Grinder/jvmtest/functional/MBCS_Tests/locale_matching/
12:36:02  ok 1 - LocaleFilterTest1
12:36:03  ok 2 - LocaleFilterTest2
12:36:03  ok 3 - LocaleFilterTest3
12:36:03  ok 4 - LocaleLookupTest1
12:36:04  ok 5 - LocaleLookupTest2
12:36:04  -----------------------------------
12:36:04  MBCS_Tests_locale_matching_zh_CN_linux_0_PASSED
12:36:04  -----------------------------------

@psawant19 psawant19 marked this pull request as ready for review April 22, 2025 07:09
@karianna karianna requested a review from llxia April 22, 2025 08:37
Added an extended mapping for chinese - zh-Latn-CN

Signed-off-by: Pratiksha Sawant <[email protected]>
@psawant19 psawant19 force-pushed the jdk24_localeMatching branch from 77da7cf to 147b650 Compare April 22, 2025 09:59
@psawant19
Copy link
Contributor Author

Code changes made in LocaleFilterTest*_16.properties fixes the issues in jdk24, but fails in jdk21.
So looks like there needs to be new property files created for 24+ version (LocaleFilterTest*_24.properties) and LocaleFilterTest*_16.properties files should remain untouched.

@llxia
Copy link
Contributor

llxia commented Apr 22, 2025

Thanks @psawant19 . If this PR fails in JDK21, we cannot merge it. Please create new property files for JDK24+.
I will move this PR to draft until the issue is addressed. Thanks.

@llxia llxia marked this pull request as draft April 22, 2025 12:59
Fixed properties files as we need to have 2 different files one for 16+
and 24+ jdk versions.

Signed-off-by: Pratiksha Sawant <[email protected]>
@psawant19
Copy link
Contributor Author

I have fixed the properties files as we need to have 2 different files one for 16+ and 24+ jdk versions.

Below are the test results for jdk17, jdk21 and jdk24 versions.

https://hyc-runtimes-jenkins.swg-devops.com/view/Test_grinder/job/Grinder/49826/ -> JDK17
https://hyc-runtimes-jenkins.swg-devops.com/view/Test_grinder/job/Grinder/49827/ -> JDK21
https://hyc-runtimes-jenkins.swg-devops.com/view/Test_grinder/job/Grinder/49828/ -> JDK24

@psawant19 psawant19 marked this pull request as ready for review April 22, 2025 13:29
@llxia
Copy link
Contributor

llxia commented Apr 22, 2025

@psawant19 could you cherry-pick the PR into https://github.com/adoptium/aqa-tests/tree/v1.0.7-release? Thanks

@llxia llxia merged commit 49c7f4c into adoptium:master Apr 22, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants