diff --git a/src/share/classes/java/util/CurrencyData.properties b/src/share/classes/java/util/CurrencyData.properties index df077cd6025de3edc9acbd43aea2ab31d30d7f53..dc96c9b6afe44d45c9664c979d3580e61ae14c31 100644 --- a/src/share/classes/java/util/CurrencyData.properties +++ b/src/share/classes/java/util/CurrencyData.properties @@ -31,7 +31,7 @@ formatVersion=2 # Version of the currency code information in this class. # It is a serial number that accompanies with each amendment. -dataVersion=162 +dataVersion=164 # List of all valid ISO 4217 currency codes. # To ensure compatibility, do not remove codes. @@ -51,7 +51,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036 NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ - SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ + SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ @@ -195,7 +195,7 @@ CU=CUP CW=ANG # CYPRUS CY=EUR -# CZECH REPUBLIC (THE) +# CZECHIA CZ=CZK # DENMARK DK=DKK @@ -469,7 +469,7 @@ SM=EUR # SOUTH SUDAN SS=SSP # SAO TOME AND PRINCIPE -ST=STD +ST=STN # SAUDI ARABIA SA=SAR # SENEGAL diff --git a/src/share/classes/sun/util/resources/CurrencyNames.properties b/src/share/classes/sun/util/resources/CurrencyNames.properties index c62d518e4b57fc0bd4dad55fed4bb58726c9dd5b..6f7202d6db35f11f564901795ba5b2545933de2f 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames.properties @@ -226,6 +226,7 @@ SRD=SRD SRG=SRG SSP=SSP STD=STD +STN=STN SVC=SVC SYP=SYP SZL=SZL @@ -294,7 +295,7 @@ ats=Austrian Schilling aud=Australian Dollar awg=Aruban Florin azm=Azerbaijani Manat (1993-2006) -azn=Azerbaijani Manat +azn=Azerbaijan Manat bam=Bosnia-Herzegovina Convertible Mark bbd=Barbadian Dollar bdt=Bangladeshi Taka @@ -380,7 +381,7 @@ krw=South Korean Won kwd=Kuwaiti Dinar kyd=Cayman Islands Dollar kzt=Kazakhstani Tenge -lak=Laotian Kip +lak=Lao Kip lbp=Lebanese Pound lkr=Sri Lankan Rupee lrd=Liberian Dollar @@ -418,7 +419,7 @@ omr=Omani Rial pab=Panamanian Balboa pen=Peruvian Sol pgk=Papua New Guinean Kina -php=Philippine Peso +php=Philippine Piso pkr=Pakistani Rupee pln=Polish Zloty pte=Portuguese Escudo @@ -446,6 +447,7 @@ srd=Surinamese Dollar srg=Surinamese Guilder ssp=South Sudanese Pound std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra +stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra svc=Salvadoran Col\u00f3n syp=Syrian Pound szl=Swazi Lilangeni diff --git a/test/java/util/Currency/ValidateISO4217.java b/test/java/util/Currency/ValidateISO4217.java index 568de12d4b15fb11b239a17d448a93f4a98daf39..4423485629e92fc49d0843b8378ca31c9de786e6 100644 --- a/test/java/util/Currency/ValidateISO4217.java +++ b/test/java/util/Currency/ValidateISO4217.java @@ -23,7 +23,7 @@ /* * @test * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 - * 8074350 8074351 8145952 + * 8074350 8074351 8145952 8187946 * @summary Validate ISO 4217 data for Currency class. */ @@ -93,7 +93,11 @@ public class ValidateISO4217 { /* Codes that are obsolete, do not have related country */ static final String otherCodes = - "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR"; + "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-" + + "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-" + + "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-" + + "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-" + + "YUM-ZMK-ZWD-ZWN-ZWR"; static boolean err = false; diff --git a/test/java/util/Currency/tablea1.txt b/test/java/util/Currency/tablea1.txt index 10501b0d2eb03d9bfbb4e573712ca7f589d7b662..6f84effe93c5dded8569eae761aa19be4bb7cf6d 100644 --- a/test/java/util/Currency/tablea1.txt +++ b/test/java/util/Currency/tablea1.txt @@ -1,12 +1,12 @@ # # -# Amendments up until ISO 4217 AMENDMENT NUMBER 162 -# (As of 30 Auguest 2016) +# Amendments up until ISO 4217 AMENDMENT NUMBER 164 +# (As of 22 September 2017) # # Version FILEVERSION=2 -DATAVERSION=162 +DATAVERSION=164 # ISO 4217 currency data AF AFN 971 2 @@ -210,7 +210,7 @@ PM EUR 978 2 VC XCD 951 2 WS WST 882 2 SM EUR 978 2 -ST STD 678 2 +ST STN 930 2 SA SAR 682 2 SN XOF 952 0 # MA 134 diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData index f4c26f6defdbd2bdecaa9f0a85991df8e9651bff..0c80a8ca0802e120754df0140d6825cba30c86a7 100644 --- a/test/sun/text/resources/LocaleData +++ b/test/sun/text/resources/LocaleData @@ -8296,3 +8296,9 @@ CurrencyNames//pen=Peruvian Sol # bug #8145952 CurrencyNames//byn=Belarusian Ruble CurrencyNames/be_BY/BYN=\u0420\u0443\u0431 + +# bug #8187946 +CurrencyNames//stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra +CurrencyNames//lak=Lao Kip +CurrencyNames//php=Philippine Piso +CurrencyNames//azn=Azerbaijan Manat diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java index 94e92b95db28839d3ed7c0ef8742f03feedd1dfd..c4cbb046e3c8df4193ffa6e674aa9b6ef2b59613 100644 --- a/test/sun/text/resources/LocaleDataTest.java +++ b/test/sun/text/resources/LocaleDataTest.java @@ -37,7 +37,7 @@ * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509 * 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826 * 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 - * 8145952 8164784 + * 8145952 8164784 8187946 * @summary Verify locale data * */