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

Merge remote-tracking branch 'upstream/master' into dragonwell #877

Merged
merged 173 commits into from
Oct 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
c35d30d
8331263: Bump update version for OpenJDK: jdk-11.0.25
RealCLanger May 29, 2024
31a780d
8276819: javax/print/PrintServiceLookup/FlushCustomClassLoader.java f…
mrserb Jun 2, 2024
7b377ac
8329013: StackOverflowError when starting Apache Tomcat with signed jar
Jun 3, 2024
4556aa9
8317288: [macos] java/awt/Window/Grab/GrabTest.java: Press on the out…
Jun 3, 2024
69f4ac1
8240226: DeflateIn_InflateOut.java test incorrectly assumes size of c…
vieiro Jun 3, 2024
b11a980
8305906: HttpClient may use incorrect key when finding pooled HTTP/2 …
Jun 3, 2024
f7e83e8
8311666: Disabled tests in test/jdk/sun/java2d/marlin
mrserb Jun 4, 2024
8a23308
8320945: problemlist tests failing on latest Windows 11 update
Jun 5, 2024
0bacea4
8310201: Reduce verbose locale output in -XshowSettings launcher option
Jun 5, 2024
a51a9dd
8315804: Open source several Swing JTabbedPane JTextArea JTextField t…
Jun 5, 2024
07ea0f1
8331746: Create a test to verify that the cmm id is not ignored
mrserb Jun 5, 2024
f45455e
8322330: JavadocHelperTest.java OOMEs with Parallel GC and ZGC
mrserb Jun 6, 2024
48cf5a3
Merge
RealCLanger Jun 6, 2024
ee370ed
8242999: HTTP/2 client may not handle CONTINUATION frames correctly
TheRealMDoerr Jun 6, 2024
f010fe0
8305825: getBounds API returns wrong value resulting in multiple Regr…
TheRealMDoerr Jun 6, 2024
bc8aeb6
8328999: Update GIFlib to 5.2.2
TheRealMDoerr Jun 6, 2024
69b6e6d
8329004: Update Libpng to 1.6.43
TheRealMDoerr Jun 6, 2024
d659ff6
8316328: Test jdk/jfr/event/oldobject/TestSanityDefault.java times ou…
mrserb Jun 6, 2024
e72f491
8333724: Problem list security/infra/java/security/cert/CertPathValid…
Jun 7, 2024
e4fb228
8286781: Replace the deprecated/obsolete gethostbyname and inet_addr …
fitzsim Jun 8, 2024
aa0bba2
8328234: Remove unused nativeUtils files
Jun 11, 2024
b5cbf8d
8328561: test java/awt/Robot/ManualInstructions/ManualInstructions.ja…
Jun 11, 2024
f36ba5a
8328218: Delete test java/awt/Window/FindOwner/FindOwner.html
Jun 11, 2024
2f7954c
8294148: Support JSplitPane for instructions and test UI
Jun 11, 2024
bf56996
8316104: Open source several Swing SplitPane and RadioButton related …
Jun 11, 2024
2ded016
8329995: Restricted access to `/proc` can cause JFR initialization to…
neethu-prasad Jun 11, 2024
54bf522
8307091: A few client tests intermittently throw ConcurrentModificati…
Jun 12, 2024
316cd2f
7124313: [macosx] Swing Popups should overlap taskbar
mrserb Jun 12, 2024
f343625
8333839: [11u] LingeredAppTest.java fails Can't find source file: Lin…
Jun 12, 2024
c9cc14b
8333837: [11u] HexPrinterTest.java javac compile fails illegal start …
Jun 12, 2024
46b15b9
8315442: Enable parallelism in vmTestbase/nsk/monitoring/stress/threa…
Jun 13, 2024
9a2a828
8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/class…
Jun 13, 2024
be6c621
8305072: Win32ShellFolder2.compareTo is inconsistent
TheRealMDoerr Jun 13, 2024
5dddf69
8279164: Disable TLS_ECDH_* cipher suites
TheRealMDoerr Jun 13, 2024
dff2d60
8323670: A few client tests intermittently throw ConcurrentModificati…
TheRealMDoerr Jun 13, 2024
3901633
8280392: java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.…
Jun 14, 2024
f08e5e8
8316240: Open source several add/remove MenuBar manual tests
Jun 14, 2024
2e4179b
8325179: Race in BasicDirectoryModel.validateFileCache
TheRealMDoerr Jun 14, 2024
7d4ef49
8329510: Update ProblemList for JFileChooser/8194044/FileSystemRootTe…
mrserb Jun 14, 2024
667bbd3
8205076: [17u] Inet6AddressImpl.c: `lookupIfLocalHost` accesses `int …
shipilev Jun 17, 2024
014fe94
8308184: Launching java with large number of jars in classpath with j…
srutjay Jun 17, 2024
f874da3
8328953: JEditorPane.read throws ChangedCharSetException
TheRealMDoerr Jun 17, 2024
9b67f2f
8306566: Open source several clipboard AWT tests
vieiro Jun 17, 2024
6059f56
8306489: Open source AWT List related tests
vieiro Jun 17, 2024
f6e838d
8327787: Convert javax/swing/border/Test4129681.java applet test to main
mrserb Jun 17, 2024
ef08f4e
8320570: NegativeArraySizeException decoding >1G UTF8 bytes with non-…
TheRealMDoerr Jun 18, 2024
582159a
8306432: Open source several AWT Text Component related tests
vieiro Jun 18, 2024
b0a09bf
8276306: jdk/jshell/CustomInputToolBuilder.java fails intermittently …
TheRealMDoerr Jun 20, 2024
fcff4a9
8334335: [TESTBUG] Backport of 8279164 to 11u & 17u includes elements…
TheRealMDoerr Jun 20, 2024
b396665
8328011: Convert java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTe…
Jun 21, 2024
ddeb602
8327840: Automate javax/swing/border/Test4129681.java
mrserb Jun 22, 2024
cc54dc6
8331063: Some HttpClient tests don't report leaks
Jun 23, 2024
0e74e1b
8327137: Add test for ConcurrentModificationException in BasicDirecto…
Jun 24, 2024
e541cbd
8320079: The ArabicBox.java test has no control buttons
Jun 24, 2024
9f58121
8328560: java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKey…
Jun 24, 2024
e726fe7
8332936: Test vmTestbase/metaspace/gc/watermark_70_80/TestDescription…
Jun 24, 2024
b0ad167
8306850: Open source AWT Modal related tests
vieiro Jun 24, 2024
4a28ac0
8306060: Open source few AWT Insets related tests
vieiro Jun 24, 2024
7e1e239
8315898: Open source swing JMenu tests
vieiro Jun 24, 2024
2a5ba0a
8328115: Convert java/awt/font/TextLayout/TestJustification.html appl…
Jun 24, 2024
7198ea1
8299487: Test java/net/httpclient/whitebox/SSLTubeTestDriver.java tim…
Jun 25, 2024
3b4f583
8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
Jun 25, 2024
f8e87df
8268906: gc/g1/mixedgc/TestOldGenCollectionUsage.java assumes that GC…
Jun 25, 2024
8489b52
8316462: sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java…
vieiro Jun 25, 2024
cc42090
8306466: Open source more AWT Drag & Drop related tests
vieiro Jun 25, 2024
724477c
8305081: Remove finalize() from test/hotspot/jtreg/compiler/runtime/T…
Jun 25, 2024
569c669
8305079: Remove finalize() from compiler/c2/Test719030
Jun 25, 2024
59cd1a4
8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
roy-soumadipta Jun 26, 2024
e61adf6
8261433: Better pkcs11 performance for libpkcs11:C_EncryptInit/libpkc…
TheRealMDoerr Jun 26, 2024
25d6e19
Merge
RealCLanger Jun 26, 2024
6547a16
8227122: [TESTBUG] Create Docker sidecar test cases
vieiro Jun 27, 2024
8578e12
8303466: C2: failed: malformed control flow. Limit type made precise …
martinuy Jun 27, 2024
db9e313
8236917: TestInstanceKlassSize.java fails with "The size computed by …
Jun 27, 2024
f9d7601
8328110: Allow simultaneous use of PassFailJFrame with split UI and a…
Jun 27, 2024
3702e90
8276036: The value of full_count in the message of insufficient codec…
TheRealMDoerr Jun 28, 2024
2a5a4d7
8078725: method adjustments can be done just once for all classes inv…
TheRealMDoerr Jun 28, 2024
468d6a7
8222005: ClassRedefinition crashes with: guarantee(false) failed: OLD…
TheRealMDoerr Jun 28, 2024
3c9e960
8279337: The MToolkit is still referenced in a few places
Jul 1, 2024
2bbdc8c
8325862: set -XX:+ErrorFileToStderr when executing java in containers…
MBaesken Jul 2, 2024
99435be
8325876: crashes in docker container tests on Linuxppc64le Power8 mac…
MBaesken Jul 2, 2024
d88cf4f
8326140: src/jdk.accessibility/windows/native/libjavaaccessbridge/Acc…
MBaesken Jul 2, 2024
7fd48f5
8260633: [macos] java/awt/dnd/MouseEventAfterStartDragTest/MouseEvent…
Jul 3, 2024
a30852a
8327007: javax/swing/JSpinner/8008657/bug8008657.java fails
mrserb Jul 3, 2024
91cdddf
8329103: assert(!thread->in_asgct()) failed during multi-mode profiling
Jul 3, 2024
cdfb4e7
8231427: Warning cleanup in tests of java.io.Serializable
Jul 4, 2024
9b44a2a
8222884: ConcurrentClassDescLookup.java times out intermittently
Jul 8, 2024
e3ff295
8333804: java/net/httpclient/ForbiddenHeadTest.java threw an exceptio…
Jul 9, 2024
b005573
8331798: Remove unused arg of checkErgonomics() in TestMaxHeapSizeToo…
Jul 9, 2024
82e2866
8318039: GHA: Bump macOS and Xcode versions
vieiro Jul 9, 2024
5375248
8332524: Instead of printing "TLSv1.3," it is showing "TLS13"
MBaesken Jul 10, 2024
b05f58e
8334653: ISO 4217 Amendment 177 Update
MBaesken Jul 10, 2024
4c626c8
8316306: Open source and convert manual Swing test
Jul 11, 2024
236ce17
8328238: Convert few closed manual applet tests to main
Jul 11, 2024
c7b9769
8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automat…
Jul 12, 2024
9bf121d
8255898: Test java/awt/FileDialog/FilenameFilterTest/FilenameFilterTe…
Jul 12, 2024
32d2713
8309934: Update GitHub Actions to use JDK 17 for building jtreg
gdams Jul 12, 2024
78fd6b9
8330063: Upgrade jQuery to 3.7.1
MBaesken Jul 12, 2024
716621d
8320602: Lock contention in SchemaDVFactory.getInstance()
MBaesken Jul 16, 2024
697d856
8329559: Test javax/swing/JFrame/bug4419914.java failed because The E…
Jul 16, 2024
c87a410
8331466: Problemlist serviceability/dcmd/gc/RunFinalizationTest.java …
Jul 16, 2024
5647fbf
Merge
RealCLanger Jul 16, 2024
3134d7e
8330416: Update system property for Java SE specification maintenance…
Jul 17, 2024
f27e8c8
8317039: Enable specifying the JDK used to run jtreg
MBaesken Jul 17, 2024
1784030
8294310: compare.sh fails on macos after JDK-8293550
MBaesken Jul 18, 2024
163309f
8307779: Relax the java.awt.Robot specification
Jul 18, 2024
6a2cce7
8316211: Open source several manual applet tests
Jul 19, 2024
5587a96
8317316: G1: Make TestG1PercentageOptions use createTestJvm
Jul 19, 2024
5f1ed56
8328273: sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java f…
Jul 19, 2024
278f506
8249097: test/lib/jdk/test/lib/util/JarBuilder.java has a bad copyright
Jul 19, 2024
b254771
8303216: Prefer ArrayList to LinkedList in sun.net.httpserver.ServerImpl
MBaesken Jul 19, 2024
bc4a525
8315422: getSoTimeout() would be in try block in SSLSocketImpl
MBaesken Jul 22, 2024
e655a2f
8332898: failure_handler: log directory of commands
MBaesken Jul 22, 2024
b423f01
8299058: AssertionError in sun.net.httpserver.ServerImpl when connect…
MBaesken Jul 22, 2024
d51bb43
8327631: Update IANA Language Subtag Registry to Version 2024-03-07
MBaesken Jul 23, 2024
54949eb
8332424: Update IANA Language Subtag Registry to Version 2024-05-16
MBaesken Jul 24, 2024
92df183
8266153: mark hotspot compiler/onSpinWait tests which ignore VM flags
Jul 24, 2024
1943345
8275851: Deproblemlist open/test/jdk/javax/swing/JComponent/6683775/b…
Jul 24, 2024
9fe50de
8255969: Improve java/io/BufferedInputStream/LargeCopyWithMark.java u…
Jul 24, 2024
3b0f78b
8266149: mark hotspot compiler/startup tests which ignore VM flags
Jul 24, 2024
e74a76a
8249826: 5 javax/net/ssl/SSLEngine tests use @ignore w/o bug-id
Jul 24, 2024
a049bf1
8334418: Update IANA Language Subtag Registry to Version 2024-06-14
MBaesken Jul 26, 2024
e6beead
8266150: mark hotspot compiler/arguments tests which ignore VM flags
Jul 26, 2024
461e1b2
8266154: mark hotspot compiler/oracle tests which ignore VM flags
Jul 26, 2024
b6cd51a
8249772: (ch) Improve sun/nio/ch/TestMaxCachedBufferSize.java
Jul 26, 2024
6c7ee26
8335803: SunJCE cipher throws NPE for un-extractable RSA keys
Jul 26, 2024
7416eee
8253207: enable problemlists jcheck's check
MBaesken Jul 29, 2024
de90ed0
8317228: GC: Make TestXXXHeapSizeFlags use createTestJvm
Jul 30, 2024
95c0b97
8244966: Add .vscode to .hgignore and .gitignore
Jul 30, 2024
d668844
8298873: Update IllegalRecordVersion.java for changes to TLS implemen…
Aug 1, 2024
ee57792
8259274: Increase timeout duration in sun/nio/ch/TestMaxCachedBufferS…
Aug 1, 2024
7547abf
8255913: Decrease number of iterations in TestMaxCachedBufferSize
Aug 1, 2024
8ef8482
8334711: [TEST_BUG] Compilation failed of MimeFormatsTest/MimeFormats…
sashapepin Aug 1, 2024
1daafdd
8317343: GC: Make TestHeapFreeRatio use createTestJvm
Aug 5, 2024
7d34693
8317358: G1: Make TestMaxNewSize use createTestJvm
Aug 6, 2024
c5d2cc1
8336301: test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java leave…
Aug 6, 2024
3acdebe
8229822: ThrowingPushPromises tests sometimes fail due to EOF
MBaesken Aug 6, 2024
648e8f0
8330523: Reduce runtime and improve efficiency of KeepAliveTest
RealCLanger Aug 7, 2024
73dc9e8
8292044: HttpClient doesn't handle 102 or 103 properly
MBaesken Aug 9, 2024
f7217d7
8286601: Mac Aarch: Excessive warnings to be ignored for build jdk
Aug 13, 2024
3c43b2f
8315965: Open source various AWT applet tests
Aug 14, 2024
3f2d6f0
8332113: Update nsk.share.Log to be always verbose
Aug 14, 2024
fa64c0e
8316285: Opensource JButton manual tests
Aug 14, 2024
30f532b
7156347: javax/swing/JList/6462008/bug6462008.java fails
Aug 14, 2024
d8632ed
8269616: serviceability/dcmd/framework/VMVersionTest.java fails with …
Aug 14, 2024
3caf501
8336928: GHA: Bundle artifacts removal broken
zzambers Aug 15, 2024
cd9e6cb
8334166: Enable binary check
MBaesken Aug 20, 2024
cd4ae8c
8316973: GC: Make TestDisableDefaultGC use createTestJvm
Aug 21, 2024
828d645
8314614: jdk/jshell/ImportTest.java failed with "InternalError: Faile…
Aug 21, 2024
d3ce405
8206440: Remove javac -source/-target 6 from jdk regression tests
Aug 26, 2024
9ba9dd2
8224081: SOCKS v4 tests require IPv4
Aug 26, 2024
3df1852
8210338: Better output for GenerationTests.java
Aug 26, 2024
c67fe36
8325022: Incorrect error message on client authentication
Aug 26, 2024
a83d930
8273135: java/awt/color/ICC_ColorSpace/MTTransformReplacedProfile.jav…
mrserb Aug 26, 2024
6ee8bac
8338139: {ClassLoading,Memory}MXBean::isVerbose methods are inconsist…
GoeLin Sep 5, 2024
90ad5b1
8337664: Distrust TLS server certificates issued after Oct 2024 and a…
GoeLin Sep 8, 2024
0358cbd
8296410: HttpClient throws java.io.IOException: no statuscode in resp…
Sep 23, 2024
217b9fd
8341057: Add 2 SSL.com TLS roots
GoeLin Oct 1, 2024
82c330b
8341059: Change Entrust TLS distrust date to November 12, 2024
GoeLin Oct 1, 2024
240b296
8307383: Enhance DTLS connections
Sep 30, 2024
445e79e
8263031: HttpClient throws Exception if it receives a Push Promise th…
Sep 27, 2024
fe9c9c7
8303965: java.net.http.HttpClient should reset the stream if response…
Sep 27, 2024
68c131d
8284585: PushPromiseContinuation test fails intermittently in timeout
Sep 28, 2024
2d393d8
8328286: Enhance HTTP client
Sep 29, 2024
6ae4b32
8328544: Improve handling of vectorization
martinuy Aug 14, 2024
d73c162
8335713: Enhance vectorization analysis
martinuy Sep 14, 2024
51657d9
8328726: Better Kerberos support
May 10, 2024
56ded02
8331446: Improve deserialization support
Aug 13, 2024
bd85b87
8211920: Close server socket and cleanups in test/jdk/javax/naming/mo…
mrserb Oct 9, 2018
eb960ff
8251188: Update LDAP tests not to use wildcard addresses
mrserb Sep 25, 2020
34a77a4
8290367: Update default value and extend the scope of com.sun.jndi.ld…
mrserb Sep 16, 2022
86d5188
8332644: Improve graph optimizations
franferrax Sep 17, 2024
cee8535
8341675: [11u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for …
gnu-andrew Oct 7, 2024
a2d893f
Merge remote-tracking branch 'upstream/master' into dragonwell
Accelerator1996 Oct 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
8334653: ISO 4217 Amendment 177 Update
Backport-of: 42f9791b8d3f2f127c797bfc9498da31992744ec
MBaesken committed Jul 10, 2024
commit b05f58e9ec57ce7f140ad47df3b5bdf4cc42f5f9
10 changes: 5 additions & 5 deletions make/data/currency/CurrencyData.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ formatVersion=3
# Version of the currency code information in this class.
# It is a serial number that accompanies with each amendment.

dataVersion=176
dataVersion=177

# List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes.
@@ -56,8 +56,8 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
XBB956-XBC957-XBD958-XCD951-XCG532-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
ZWN942-ZWR935
XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWG924-\
ZWL932-ZWN942-ZWR935


# Mappings from ISO 3166 country codes to ISO 4217 currency codes.
@@ -582,7 +582,7 @@ YE=YER
# ZAMBIA
ZM=ZMW
# ZIMBABWE
ZW=ZWL
ZW=ZWG


# List of currencies with non-2digit decimals for minor units,
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -284,6 +284,7 @@ ZAR=ZAR
ZMK=ZMK
ZMW=ZMW
ZWD=ZWD
ZWG=ZWG
ZWL=ZWL
ZWN=ZWN
ZWR=ZWR
@@ -509,5 +510,6 @@ yum=Yugoslavian New Dinar (1994-2002)
zar=South African Rand
zmk=Zambian Kwacha
zwd=Zimbabwean Dollar (1980-2008)
zwg=Zimbabwe Gold
zwl=Zimbabwean Dollar (2009)
zwr=Zimbabwean Dollar (2008)
4 changes: 2 additions & 2 deletions test/jdk/java/util/Currency/CheckDataVersion.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
import java.util.Currency;

class CheckDataVersion {
static final String datafile = "tablea1.txt";
static final String datafile = "ISO4217-list-one.txt";
static final String FILEVERSIONKEY = "FILEVERSION=";
static final String DATAVERSIONKEY = "DATAVERSION=";
static String fileVersion;
6 changes: 3 additions & 3 deletions test/jdk/java/util/Currency/CurrencyTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531
* 6488442 7036905 8008577 8039317 8074350 8074351 8150324 8167143
* 8264792
* 8264792 8334653
* @summary Basic tests for Currency class.
* @modules java.base/java.util:open
* jdk.localedata
@@ -60,7 +60,7 @@

public class CurrencyTest {

// 'tablea1.txt' should be up-to-date before testing
// 'ISO4217-list-one.txt' should be up-to-date before testing
@Test
public void dataVersionTest() {
CheckDataVersion.check();
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
#
# Amendments up until ISO 4217 AMENDMENT NUMBER 176
# (As of 06 December 2023)
# Amendments up until ISO 4217 AMENDMENT NUMBER 177
# (As of 20 June 2024)
#

# Version
FILEVERSION=3
DATAVERSION=176
DATAVERSION=177

# ISO 4217 currency data
AF AFN 971 2
@@ -276,7 +276,7 @@ WF XPF 953 0
EH MAD 504 2
YE YER 886 2
ZM ZMW 967 2
ZW ZWL 932 2
ZW ZWG 924 2
#XAU XAU 959
#XBA XBA 955
#XBB XBB 956
11 changes: 6 additions & 5 deletions test/jdk/java/util/Currency/ValidateISO4217.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
* 8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
* 8208746 8209775 8264792 8274658 8283277 8296239 8321480
* 8208746 8209775 8264792 8274658 8283277 8296239 8321480 8334653
* @summary Validate ISO 4217 data for Currency class.
* @modules java.base/java.util:open
* jdk.localedata
@@ -60,15 +60,16 @@

/**
* This class tests the latest ISO 4217 data and Java's currency data which is
* based on ISO 4217. The golden-data file (ISO 4217 data) 'tablea1.txt' has the following
* based on ISO 4217. The golden-data file, 'ISO4217-list-one.txt', based on the
* "List one: Currency, fund and precious metal codes" has the following
* format: <Country code>\t<Currency code>\t<Numeric code>\t<Minor unit>[\t<Cutover Date>\t<new Currency code>\t<new Numeric code>\t<new Minor unit>]
* The Cutover Date is given in SimpleDateFormat's 'yyyy-MM-dd-HH-mm-ss' format in the GMT time zone.
*/
public class ValidateISO4217 {

// Input golden-data file
private static final File dataFile = new File(System.getProperty(
"test.src", "."), "tablea1.txt");
"test.src", "."), "ISO4217-list-one.txt");
// Code statuses
private static final byte UNDEFINED = 0;
private static final byte DEFINED = 1;
@@ -89,7 +90,7 @@ public class ValidateISO4217 {
+ "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-HRK-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
+ "PTE-ROL-RUR-SDD-SIT-SLL-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
+ "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
+ "YUM-ZMK-ZWD-ZWN-ZWR";
+ "YUM-ZMK-ZWD-ZWL-ZWN-ZWR";
private static final String[][] extraCodes = {
/* Defined in ISO 4217 list, but don't have code and minor unit info. */
{"AQ", "", "", "0"}, // Antarctica