From 68205b2c8a758baeec5bfec29ac479cde74a65c7 Mon Sep 17 00:00:00 2001 From: macchiati Date: Tue, 12 Sep 2023 10:58:50 -0700 Subject: [PATCH 1/6] CLDR-17081 Fix PNF test data for ICU --- common/testData/personNameTest/br.txt | 276 ------- common/testData/personNameTest/gaa.txt | 181 ----- common/testData/personNameTest/lv.txt | 54 +- common/testData/personNameTest/to.txt | 720 ------------------ .../cldr/tool/GeneratePersonNameTestData.java | 18 +- 5 files changed, 33 insertions(+), 1216 deletions(-) delete mode 100644 common/testData/personNameTest/br.txt delete mode 100644 common/testData/personNameTest/gaa.txt delete mode 100644 common/testData/personNameTest/to.txt diff --git a/common/testData/personNameTest/br.txt b/common/testData/personNameTest/br.txt deleted file mode 100644 index 143a0cb4b0a..00000000000 --- a/common/testData/personNameTest/br.txt +++ /dev/null @@ -1,276 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: br -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Yann -name ; locale; br_AQ - -expectedResult; Yann - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Y - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Katell -name ; surname; ar Gall -name ; locale; br_AQ - -expectedResult; ar Gall Katell - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Katell ar Gall - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; AK - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -expectedResult; KA - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; Yann -name ; given2; Erwan -name ; surname; ar Go -name ; locale; br_AQ - -expectedResult; ar Go Yann Erwan - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Yann Erwan ar Go - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; AYE - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -expectedResult; YEA - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -endName - -# foreignFull -name ; title; Prof. Dr. -name ; locale; ko_AQ - -expectedResult; Prof. Dr. - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -endName diff --git a/common/testData/personNameTest/gaa.txt b/common/testData/personNameTest/gaa.txt deleted file mode 100644 index e80f2125e94..00000000000 --- a/common/testData/personNameTest/gaa.txt +++ /dev/null @@ -1,181 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: gaa -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# foreignFull -name ; title; Prof. Dr. -name ; given; Ada Kornelia -name ; given-informal; Neele -name ; given2; Eva Sofia -name ; surname-prefix; van den -name ; surname-core; Wolf -name ; surname2; Beker Shmidt -name ; credentials; M.D. Ph.D. -name ; locale; fr_AQ - -expectedResult; Ada Kornelia Eva Sofia van den Wolf M.D. Ph.D. - -parameters; givenFirst; long; referring; formal - -expectedResult; van den Wolf Ada Kornelia Eva Sofia M.D. Ph.D. - -parameters; surnameFirst; long; referring; formal - -expectedResult; Ada Kornelia E. S. van den Wolf M.D. Ph.D. - -parameters; givenFirst; medium; referring; formal - -expectedResult; van den Wolf Ada Kornelia E. S. M.D. Ph.D. - -parameters; surnameFirst; medium; referring; formal - -expectedResult; Wolf, Ada Kornelia Eva Sofia van den - -parameters; sorting; long; referring; formal - -expectedResult; Wolf, Ada Kornelia E. S. van den - -parameters; sorting; medium; referring; formal - -expectedResult; Wolf, A. K. E. S. van den - -parameters; sorting; short; referring; formal - -expectedResult; A. K. E. S. van den Wolf - -parameters; givenFirst; short; referring; formal - -expectedResult; van den Wolf A. K. E. S. - -parameters; surnameFirst; short; referring; formal - -expectedResult; Prof. Dr. van den Wolf - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; van den Wolf, Neele - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Neele van den Wolf - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; van den Wolf A. K. - -parameters; surnameFirst; short; referring; informal - -expectedResult; van den Wolf Neele - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Neele v. d. W. - -parameters; givenFirst; short; referring; informal - -expectedResult; Neele - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; AEV - -parameters; givenFirst; long; monogram; formal - -expectedResult; VAE - -parameters; surnameFirst; long; monogram; formal - -expectedResult; NV - -parameters; givenFirst; long; monogram; informal - -expectedResult; VN - -parameters; surnameFirst; long; monogram; informal - -expectedResult; N - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; V - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName diff --git a/common/testData/personNameTest/lv.txt b/common/testData/personNameTest/lv.txt index 4bd06e0b8ef..d7a6d14822d 100644 --- a/common/testData/personNameTest/lv.txt +++ b/common/testData/personNameTest/lv.txt @@ -63,11 +63,6 @@ enum ; formality ; formal, informal name ; given; Jānis name ; locale; lv_AQ -expectedResult; Jānisᵍ - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; Jānis parameters; givenFirst; long; referring; formal @@ -84,9 +79,11 @@ parameters; givenFirst; short; addressing; formal parameters; givenFirst; short; addressing; informal parameters; surnameFirst; long; referring; formal parameters; surnameFirst; long; referring; informal +parameters; surnameFirst; long; addressing; formal parameters; surnameFirst; long; addressing; informal parameters; surnameFirst; medium; referring; formal parameters; surnameFirst; medium; referring; informal +parameters; surnameFirst; medium; addressing; formal parameters; surnameFirst; medium; addressing; informal parameters; surnameFirst; short; referring; formal parameters; surnameFirst; short; referring; informal @@ -157,11 +154,6 @@ expectedResult; Kalniņa A. parameters; surnameFirst; short; referring; formal parameters; surnameFirst; short; referring; informal -expectedResult; Kalniņaᵍ - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; Aina K. parameters; givenFirst; short; referring; informal @@ -171,6 +163,8 @@ expectedResult; Kalniņa parameters; givenFirst; long; addressing; formal parameters; givenFirst; medium; addressing; formal parameters; givenFirst; short; addressing; formal +parameters; surnameFirst; long; addressing; formal +parameters; surnameFirst; medium; addressing; formal expectedResult; Aina @@ -264,11 +258,6 @@ expectedResult; Bērziņa A. parameters; surnameFirst; short; referring; informal -expectedResult; Bērziņaᵍ - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; Anna B. parameters; givenFirst; short; referring; informal @@ -278,6 +267,8 @@ expectedResult; Bērziņa parameters; givenFirst; long; addressing; formal parameters; givenFirst; medium; addressing; formal parameters; givenFirst; short; addressing; formal +parameters; surnameFirst; long; addressing; formal +parameters; surnameFirst; medium; addressing; formal expectedResult; Anna @@ -363,7 +354,7 @@ expectedResult; Ozoliņš, P. K. parameters; sorting; short; referring; formal -expectedResult; Ozoliņšᵍ kungs +expectedResult; Ozoliņš kungs parameters; surnameFirst; long; addressing; formal parameters; surnameFirst; medium; addressing; formal @@ -432,11 +423,6 @@ endName name ; given; Sinbads name ; locale; ja_AQ -expectedResult; Sinbadsᵍ - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; Sinbads parameters; givenFirst; long; referring; formal @@ -453,9 +439,11 @@ parameters; givenFirst; short; addressing; formal parameters; givenFirst; short; addressing; informal parameters; surnameFirst; long; referring; formal parameters; surnameFirst; long; referring; informal +parameters; surnameFirst; long; addressing; formal parameters; surnameFirst; long; addressing; informal parameters; surnameFirst; medium; referring; formal parameters; surnameFirst; medium; referring; informal +parameters; surnameFirst; medium; addressing; formal parameters; surnameFirst; medium; addressing; informal parameters; surnameFirst; short; referring; formal parameters; surnameFirst; short; referring; informal @@ -530,16 +518,13 @@ expectedResult; Keita M. parameters; givenFirst; short; referring; informal -expectedResult; Millereᵍ - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; Millere parameters; givenFirst; long; addressing; formal parameters; givenFirst; medium; addressing; formal parameters; givenFirst; short; addressing; formal +parameters; surnameFirst; long; addressing; formal +parameters; surnameFirst; medium; addressing; formal expectedResult; Keita @@ -637,16 +622,13 @@ expectedResult; Pīters M. parameters; givenFirst; short; referring; informal -expectedResult; Millersᵍ - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; Millers parameters; givenFirst; long; addressing; formal parameters; givenFirst; medium; addressing; formal parameters; givenFirst; short; addressing; formal +parameters; surnameFirst; long; addressing; formal +parameters; surnameFirst; medium; addressing; formal expectedResult; Pīters @@ -742,15 +724,15 @@ expectedResult; Laima Kristīne v. d. V. parameters; givenFirst; short; referring; informal -expectedResult; van den Volfaᵍ Prof. - -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal - expectedResult; van den Volfa L. K. parameters; surnameFirst; short; referring; informal +expectedResult; van den Volfa Prof. + +parameters; surnameFirst; long; addressing; formal +parameters; surnameFirst; medium; addressing; formal + expectedResult; Volfa, L. K. E. S. parameters; sorting; short; referring; formal diff --git a/common/testData/personNameTest/to.txt b/common/testData/personNameTest/to.txt deleted file mode 100644 index 289c462e706..00000000000 --- a/common/testData/personNameTest/to.txt +++ /dev/null @@ -1,720 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: to -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Tēvita -name ; locale; to_AQ - -expectedResult; Tēvita - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; T - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Mele -name ; surname; Moala -name ; locale; to_AQ - -expectedResult; Moala, Mele - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Mele Moala - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal - -expectedResult; Moala, M. - -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; sorting; short; referring; formal - -expectedResult; M. Moala - -parameters; givenFirst; short; referring; formal - -expectedResult; Mele M. - -parameters; givenFirst; short; referring; informal - -expectedResult; Moala - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Mele - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; MM - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal - -expectedResult; M - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; ʻAna -name ; given2; Lātū -name ; surname; Tupou -name ; locale; to_AQ - -expectedResult; Tupou, ʻAna Lātū - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; ʻAna Lātū Tupou - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal - -expectedResult; Tupou, ʻ. L. - -parameters; surnameFirst; short; referring; formal -parameters; sorting; short; referring; formal - -expectedResult; ʻ. L. Tupou - -parameters; givenFirst; short; referring; formal - -expectedResult; Tupou, ʻAna - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; ʻAna Tupou - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Tupou, ʻ. - -parameters; surnameFirst; short; referring; informal - -expectedResult; ʻAna T. - -parameters; givenFirst; short; referring; informal - -expectedResult; Tupou - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; ʻAna - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; ʻLT - -parameters; givenFirst; long; monogram; formal - -expectedResult; TʻL - -parameters; surnameFirst; long; monogram; formal - -expectedResult; ʻT - -parameters; givenFirst; long; monogram; informal - -expectedResult; Tʻ - -parameters; surnameFirst; long; monogram; informal - -expectedResult; ʻ - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; T - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName - -# nativeFull -name ; title; Hon. -name ; given; Sione Paulo -name ; given-informal; Sione -name ; given2; Taniela Pita -name ; surname-core; Tonga -name ; generation; siʻʻi -name ; credentials; CBE -name ; locale; to_AQ - -expectedResult; Tonga, Sione Paulo Taniela Pita CBE - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; Sione Paulo Taniela Pita Tonga CBE - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal - -expectedResult; Tonga, S. P. T. P. - -parameters; surnameFirst; short; referring; formal -parameters; sorting; short; referring; formal - -expectedResult; S. P. T. P. Tonga - -parameters; givenFirst; short; referring; formal - -expectedResult; Tonga, S. P. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Tonga, Sione - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Sione Tonga - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Hon. Tonga - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Sione T. - -parameters; givenFirst; short; referring; informal - -expectedResult; Sione - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; STT - -parameters; givenFirst; long; monogram; formal - -expectedResult; TST - -parameters; surnameFirst; long; monogram; formal - -expectedResult; ST - -parameters; givenFirst; long; monogram; informal - -expectedResult; TS - -parameters; surnameFirst; long; monogram; informal - -expectedResult; S - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; T - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName - -# foreignG -name ; given; Tinūviel -name ; locale; ja_AQ - -expectedResult; Tinūviel - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; T - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; Jan -name ; surname; Jurk -name ; locale; ja_AQ - -expectedResult; Jurk, Jan - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Jan Jurk - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal - -expectedResult; Jurk, J. - -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; sorting; short; referring; formal - -expectedResult; J. Jurk - -parameters; givenFirst; short; referring; formal - -expectedResult; Jan J. - -parameters; givenFirst; short; referring; informal - -expectedResult; Jurk - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Jan - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; JJ - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal - -expectedResult; J - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGGS -name ; given; Star -name ; given2; Light -name ; surname; Moonshine -name ; locale; ja_AQ - -expectedResult; Moonshine, Star Light - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; Star Light Moonshine - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal - -expectedResult; Moonshine, S. L. - -parameters; surnameFirst; short; referring; formal -parameters; sorting; short; referring; formal - -expectedResult; Moonshine, Star - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; S. L. Moonshine - -parameters; givenFirst; short; referring; formal - -expectedResult; Star Moonshine - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Moonshine, S. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Moonshine - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Star M. - -parameters; givenFirst; short; referring; informal - -expectedResult; Star - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; MSL - -parameters; surnameFirst; long; monogram; formal - -expectedResult; SLM - -parameters; givenFirst; long; monogram; formal - -expectedResult; MS - -parameters; surnameFirst; long; monogram; informal - -expectedResult; SM - -parameters; givenFirst; long; monogram; informal - -expectedResult; M - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; S - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; title; Tōketā -name ; given; Pua -name ; given-informal; Siana -name ; given2; Lātū -name ; surname-core; Fīnau -name ; generation; Jr -name ; credentials; O.T.K. -name ; locale; ja_AQ - -expectedResult; Fīnau, Pua Lātū O.T.K. - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; Pua Lātū Fīnau O.T.K. - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal - -expectedResult; Fīnau, P. L. - -parameters; surnameFirst; short; referring; formal -parameters; sorting; short; referring; formal - -expectedResult; Fīnau, Siana - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Tōketā Fīnau - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; P. L. Fīnau - -parameters; givenFirst; short; referring; formal - -expectedResult; Siana Fīnau - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Fīnau, P. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Siana F. - -parameters; givenFirst; short; referring; informal - -expectedResult; Siana - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; FPL - -parameters; surnameFirst; long; monogram; formal - -expectedResult; PLF - -parameters; givenFirst; long; monogram; formal - -expectedResult; FS - -parameters; surnameFirst; long; monogram; informal - -expectedResult; SF - -parameters; givenFirst; long; monogram; informal - -expectedResult; F - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; S - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java index b761a3b3e5b..9fee8094b8a 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java @@ -17,6 +17,7 @@ import java.util.regex.Pattern; import org.unicode.cldr.util.CLDRConfig; import org.unicode.cldr.util.CLDRFile; +import org.unicode.cldr.util.CLDRFile.DraftStatus; import org.unicode.cldr.util.CLDRPaths; import org.unicode.cldr.util.Factory; import org.unicode.cldr.util.TempPrintWriter; @@ -48,8 +49,9 @@ enum Options { sorting } + static File dir = new File(CLDRPaths.TEST_DATA, "personNameTest"); + public static void main(String[] args) { - File dir = new File(CLDRPaths.TEST_DATA, "personNameTest"); Factory factory = CLDR_CONFIG.getCldrFactory(); Matcher localeMatcher = null; @@ -69,7 +71,9 @@ public static void main(String[] args) { } try { - CLDRFile cldrFile = factory.make(locale, true); + CLDRFile cldrFile = + factory.make(locale, true, DraftStatus.contributed); // don't include + // draft=unconfirmed/provisional CLDRFile unresolved = cldrFile.getUnresolved(); // Check that we have person data @@ -93,9 +97,11 @@ public static void main(String[] args) { names = PersonNameFormatter.loadSampleNames(cldrFile); formatter = new PersonNameFormatter(cldrFile); } catch (Exception e) { + removeTestFile(locale); continue; } if (names.isEmpty()) { + removeTestFile(locale); continue; } @@ -192,7 +198,8 @@ public static void main(String[] args) { String formatted = formatter .format(nameObject, parameters) - .replace("ᵛ", ""); // remove special CLDR ST hack + .replace("ᵛ", "") // remove two special CLDR ST hacks + .replace("ᵍ", ""); if (formatted.isEmpty()) { continue; @@ -285,11 +292,16 @@ public static void main(String[] args) { } catch (Exception e) { System.out.println("Skipping " + locale); e.printStackTrace(); + removeTestFile(locale); continue; } } } + private static void removeTestFile(String locale) { + new File(dir.toString(), locale + ".txt").delete(); + } + public static ULocale addRegionIfMissing(ULocale myLocale, String region) { return !myLocale.getCountry().isEmpty() ? myLocale From 49aea5587e00d043a50c41d868ca3a532d823682 Mon Sep 17 00:00:00 2001 From: macchiati Date: Tue, 12 Sep 2023 14:11:36 -0700 Subject: [PATCH 2/6] CLDR-17081 More complete test of qualifying PNF data --- common/testData/personNameTest/brx.txt | 492 ----------- common/testData/personNameTest/ie.txt | 492 ----------- common/testData/personNameTest/ks_Deva.txt | 492 ----------- common/testData/personNameTest/lij.txt | 445 ---------- common/testData/personNameTest/mt.txt | 242 ------ common/testData/personNameTest/pcm.txt | 784 ------------------ common/testData/personNameTest/sat.txt | 168 ---- common/testData/personNameTest/tt.txt | 492 ----------- common/testData/personNameTest/xh.txt | 492 ----------- .../cldr/tool/GeneratePersonNameTestData.java | 57 +- 10 files changed, 38 insertions(+), 4118 deletions(-) delete mode 100644 common/testData/personNameTest/brx.txt delete mode 100644 common/testData/personNameTest/ie.txt delete mode 100644 common/testData/personNameTest/ks_Deva.txt delete mode 100644 common/testData/personNameTest/lij.txt delete mode 100644 common/testData/personNameTest/mt.txt delete mode 100644 common/testData/personNameTest/pcm.txt delete mode 100644 common/testData/personNameTest/sat.txt delete mode 100644 common/testData/personNameTest/tt.txt delete mode 100644 common/testData/personNameTest/xh.txt diff --git a/common/testData/personNameTest/brx.txt b/common/testData/personNameTest/brx.txt deleted file mode 100644 index a63bd79927e..00000000000 --- a/common/testData/personNameTest/brx.txt +++ /dev/null @@ -1,492 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: brx -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; जेन्दाया -name ; locale; brx_AQ - -expectedResult; जेन्दाया - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; जे - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; आईरिन -name ; locale; brx_AQ - -expectedResult; आईरिन - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; आ - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; मेरि सु -name ; locale; brx_AQ - -expectedResult; मेरि सु - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; मे - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeFull -name ; given; बारत्राम विलबारफर्स -name ; locale; brx_AQ - -expectedResult; बारत्राम विलबारफर्स - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; बा - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignG -name ; given; सिन्दबाद -name ; locale; ja_AQ - -expectedResult; सिन्दबाद - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; सि - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; कैथ -name ; locale; ja_AQ - -expectedResult; कैथ - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; कै - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGGS -name ; given; जाजीलिया -name ; locale; ja_AQ - -expectedResult; जाजीलिया - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; जा - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; given; आह-दा कर्नेलिया -name ; locale; ja_AQ - -expectedResult; आह-दा कर्नेलिया - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; आ - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/ie.txt b/common/testData/personNameTest/ie.txt deleted file mode 100644 index 58d4b6eb077..00000000000 --- a/common/testData/personNameTest/ie.txt +++ /dev/null @@ -1,492 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: ie -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Zendaya -name ; locale; ie_AQ - -expectedResult; Zendaya - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Z - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Irene -name ; surname; Adler -name ; locale; ie_AQ - -expectedResult; Adler Irene - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Irene Adler - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; AI - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -expectedResult; IA - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; Mary Sue -name ; surname; Peipers -name ; locale; ie_AQ - -expectedResult; Mary Sue Peipers - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; Peipers Mary Sue - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; MP - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -expectedResult; PM - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeFull -name ; title; Sr. -name ; given; Richard -name ; given-informal; Ric -name ; surname-prefix; de -name ; surname-core; Wahl -name ; locale; ie_AQ - -expectedResult; de Wahl Sr. Richard - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Sr. Richard de Wahl - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; Richard de Wahl - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; informal - -expectedResult; DR - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -expectedResult; RD - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -endName - -# foreignG -name ; given; Sinbad -name ; locale; ja_AQ - -expectedResult; Sinbad - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; S - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; Kurt -name ; surname; Prorók -name ; locale; ja_AQ - -expectedResult; Kurt Prorók - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; Prorók Kurt - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; KP - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -expectedResult; PK - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; title; Dr. Ing. -name ; given; Ada Cornelia -name ; given-informal; Neele -name ; given2; César Martín -name ; surname-prefix; von -name ; surname-core; Brühl -name ; surname2; González Domingo -name ; generation; Jr -name ; credentials; MD DDS -name ; locale; ja_AQ - -expectedResult; Dr. Ing. Ada Cornelia César Martín von Brühl-González Domingo, MD DDS - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; von Brühl González Domingo, Dr. Ing. Ada Cornelia César Martín MD DDS - -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; von Brühl González Domingo Dr. Ing. Ada Cornelia César Martín MD DDS - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal - -expectedResult; Ada Cornelia César Martín von Brühl-González Domingo - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; informal - -expectedResult; ACV - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -expectedResult; VAC - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/ks_Deva.txt b/common/testData/personNameTest/ks_Deva.txt deleted file mode 100644 index 7c3ef38bb20..00000000000 --- a/common/testData/personNameTest/ks_Deva.txt +++ /dev/null @@ -1,492 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: ks_Deva -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; ज़ेनडेया -name ; locale; ks_Deva_AQ - -expectedResult; ज़ेनडेया - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; ज़े - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; आइरीन -name ; locale; ks_Deva_AQ - -expectedResult; आइरीन - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; आ - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; मेरी सू -name ; locale; ks_Deva_AQ - -expectedResult; मेरी सू - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; मे - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeFull -name ; given; बर्टराम विल्बरफोरस -name ; locale; ks_Deva_AQ - -expectedResult; बर्टराम विल्बरफोरस - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; ब - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignG -name ; given; सिन्बाद -name ; locale; ko_AQ - -expectedResult; सिन्बाद - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; सि - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; काथे -name ; locale; ko_AQ - -expectedResult; काथे - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; का - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGGS -name ; given; ज़ाज़िलिया -name ; locale; ko_AQ - -expectedResult; ज़ाज़िलिया - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; ज़ा - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; given; एडा कारनीलिया -name ; locale; ko_AQ - -expectedResult; एडा कारनीलिया - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; ए - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/lij.txt b/common/testData/personNameTest/lij.txt deleted file mode 100644 index c2e4a78131d..00000000000 --- a/common/testData/personNameTest/lij.txt +++ /dev/null @@ -1,445 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: lij -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Zane -name ; locale; lij_AQ - -expectedResult; Zane - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Z - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Luçia -name ; surname; Cangiaxo -name ; locale; lij_AQ - -expectedResult; Cangiaxo, Luçia - -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal - -expectedResult; Cangiaxo Luçia - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Luçia Cangiaxo - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal - -expectedResult; Cangiaxo, L. - -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Cangiaxo L. - -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal - -expectedResult; L. Cangiaxo - -parameters; givenFirst; short; referring; formal - -expectedResult; Cangiaxo - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Luçia C. - -parameters; givenFirst; short; referring; informal - -expectedResult; Luçia - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; CL - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal - -expectedResult; LC - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal - -expectedResult; C - -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; L - -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; Françesco -name ; given2; Maria -name ; surname; Parödi -name ; locale; lij_AQ - -expectedResult; Parödi, Françesco Maria - -parameters; sorting; long; referring; formal - -expectedResult; Françesco Maria Parödi - -parameters; givenFirst; long; referring; formal - -expectedResult; Parödi Françesco Maria - -parameters; surnameFirst; long; referring; formal - -expectedResult; Parödi, Françesco M. - -parameters; sorting; medium; referring; formal - -expectedResult; Françesco M. Parödi - -parameters; givenFirst; medium; referring; formal - -expectedResult; Parödi Françesco M. - -parameters; surnameFirst; medium; referring; formal - -expectedResult; Parödi, Françesco - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal - -expectedResult; Françesco Parödi - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Parödi Françesco - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Parödi, F. M. - -parameters; sorting; short; referring; formal - -expectedResult; F. M. Parödi - -parameters; givenFirst; short; referring; formal - -expectedResult; Françesco P. - -parameters; givenFirst; short; referring; informal - -expectedResult; Parödi F. M. - -parameters; surnameFirst; short; referring; formal - -expectedResult; Parödi, F. - -parameters; sorting; short; referring; informal - -expectedResult; Françesco - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; Parödi F. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Parödi - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; FMP - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; medium; monogram; formal - -expectedResult; PFM - -parameters; surnameFirst; long; monogram; formal - -expectedResult; FP - -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; informal - -expectedResult; PF - -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal - -expectedResult; F - -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; P - -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName - -# nativeFull -name ; title; Dott.a Prof.a -name ; given; Maria Giöxeppiña -name ; given-informal; Maiòllo -name ; given2; Reusa Texa -name ; surname-prefix; De -name ; surname-core; Franchi -name ; surname2; Carcagno Baçigalô -name ; credentials; OMRI -name ; locale; lij_AQ - -expectedResult; Franchi, Dott.a Prof.a Maria Giöxeppiña Reusa Texa De - -parameters; sorting; long; referring; formal - -expectedResult; Dott.a Prof.a Maria Giöxeppiña Reusa Texa De Franchi - -parameters; givenFirst; long; referring; formal - -expectedResult; De Franchi Maria Giöxeppiña Reusa Texa - -parameters; surnameFirst; long; referring; formal - -expectedResult; Franchi, Maria Giöxeppiña R. T. De - -parameters; sorting; medium; referring; formal - -expectedResult; De Franchi Maria Giöxeppiña R. T. - -parameters; surnameFirst; medium; referring; formal - -expectedResult; Maria Giöxeppiña R. T. De Franchi - -parameters; givenFirst; medium; referring; formal - -expectedResult; Dott.a Prof.a De Franchi - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Franchi, M. G. R. T. De - -parameters; sorting; short; referring; formal - -expectedResult; De Franchi M. G. R. T. - -parameters; surnameFirst; short; referring; formal - -expectedResult; M. G. R. T. De Franchi - -parameters; givenFirst; short; referring; formal - -expectedResult; Franchi, Maiòllo De - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal - -expectedResult; De Franchi Maiòllo - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Maiòllo De Franchi - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Franchi, M. De - -parameters; sorting; short; referring; informal - -expectedResult; De Franchi M. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Maiòllo D. F. - -parameters; givenFirst; short; referring; informal - -expectedResult; Maiòllo - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; DMR - -parameters; surnameFirst; long; monogram; formal - -expectedResult; MRD - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; medium; monogram; formal - -expectedResult; DM - -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal - -expectedResult; MD - -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; informal - -expectedResult; D - -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; M - -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/mt.txt b/common/testData/personNameTest/mt.txt deleted file mode 100644 index 2331de3ed48..00000000000 --- a/common/testData/personNameTest/mt.txt +++ /dev/null @@ -1,242 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: mt -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeGS -name ; surname; Grech -name ; locale; mt_AQ - -expectedResult; Grech - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; G - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; Maria Elena -name ; given2; Farrugia -name ; surname; Vella -name ; locale; mt_AQ - -expectedResult; Maria Elena Farrugia Vella - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; Vella Maria Elena Farrugia - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; MFV - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -expectedResult; VMF - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeFull -name ; title; Is-Sur -name ; given; Evaristu Muscat -name ; given-informal; Varist -name ; given2; George Mifsud -name ; surname-core; Azzopardi -name ; generation; Jr -name ; credentials; MP -name ; locale; mt_AQ - -expectedResult; Azzopardi Is-Sur Evaristu Muscat George Mifsud MP - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Is-Sur Evaristu Muscat George Mifsud Azzopardi MP - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal - -expectedResult; AEG - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -expectedResult; EGA - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/pcm.txt b/common/testData/personNameTest/pcm.txt deleted file mode 100644 index 5e94e5181d9..00000000000 --- a/common/testData/personNameTest/pcm.txt +++ /dev/null @@ -1,784 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: pcm -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Sinbad -name ; locale; pcm_AQ - -expectedResult; Sinbad - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; S - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Irene -name ; surname; Adler -name ; locale; pcm_AQ - -expectedResult; Adler, Irene - -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Adler Irene - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Irene Adler - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal - -expectedResult; Adler, I. - -parameters; sorting; short; referring; formal - -expectedResult; Adler I. - -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal - -expectedResult; I. Adler - -parameters; givenFirst; short; referring; formal - -expectedResult; Irene A. - -parameters; givenFirst; short; referring; informal - -expectedResult; Adler - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal - -expectedResult; Irene - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; AI - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal - -expectedResult; IA - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal - -expectedResult; A - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; I - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; John -name ; given2; Hámish -name ; surname; Watson -name ; locale; pcm_AQ - -expectedResult; Watson, John Hámish - -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; John Hámish Watson - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; addressing; formal - -expectedResult; Watson John Hámish - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Watson, J. H. - -parameters; sorting; short; referring; formal - -expectedResult; J. H. Watson - -parameters; givenFirst; short; referring; formal - -expectedResult; Watson J. H. - -parameters; surnameFirst; short; referring; formal - -expectedResult; Watson, John - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; John Watson - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Watson John - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Watson J. - -parameters; surnameFirst; short; referring; informal - -expectedResult; John W. - -parameters; givenFirst; short; referring; informal - -expectedResult; Watson - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal - -expectedResult; John - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; JHW - -parameters; givenFirst; long; monogram; formal - -expectedResult; WJH - -parameters; surnameFirst; long; monogram; formal - -expectedResult; JW - -parameters; givenFirst; long; monogram; informal - -expectedResult; WJ - -parameters; surnameFirst; long; monogram; informal - -expectedResult; J - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; W - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName - -# nativeFull -name ; title; Mr. -name ; given; Elizabeth Windsor -name ; given-informal; Lilibet -name ; given2; Maria Teresa -name ; surname-prefix; bin -name ; surname-core; Stromae -name ; surname2; Robert -name ; generation; Jr. -name ; credentials; MP -name ; locale; pcm_AQ - -expectedResult; bin Stromae, Elizabeth Windsor Maria Teresa MP - -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; bin Stromae Elizabeth Windsor Maria Teresa MP - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Elizabeth Windsor Maria Teresa bin Stromae MP - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; addressing; formal - -expectedResult; bin Stromae, E. W. M. T. - -parameters; sorting; short; referring; formal - -expectedResult; bin Stromae E. W. M. T. - -parameters; surnameFirst; short; referring; formal - -expectedResult; E. W. M. T. bin Stromae - -parameters; givenFirst; short; referring; formal - -expectedResult; bin Stromae, Lilibet - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; bin Stromae Lilibet - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Lilibet bin Stromae - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; bin Stromae E. W. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Mr. bin Stromae - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal - -expectedResult; Lilibet b. S. - -parameters; givenFirst; short; referring; informal - -expectedResult; Lilibet - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; BEM - -parameters; surnameFirst; long; monogram; formal - -expectedResult; EMB - -parameters; givenFirst; long; monogram; formal - -expectedResult; BL - -parameters; surnameFirst; long; monogram; informal - -expectedResult; LB - -parameters; givenFirst; long; monogram; informal - -expectedResult; B - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; L - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignG -name ; given; Miret -name ; locale; ko_AQ - -expectedResult; Miret - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; M - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; Katie -name ; surname; Stefan -name ; locale; ko_AQ - -expectedResult; Stefan, Katie - -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Katie Stefan - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal - -expectedResult; Stefan Katie - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Stefan, K. - -parameters; sorting; short; referring; formal - -expectedResult; K. Stefan - -parameters; givenFirst; short; referring; formal - -expectedResult; Stefan K. - -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal - -expectedResult; Katie S. - -parameters; givenFirst; short; referring; informal - -expectedResult; Stefan - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal - -expectedResult; Katie - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; KS - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal - -expectedResult; SK - -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal - -expectedResult; K - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; S - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName - -# foreignGGS -name ; given; Tunde -name ; given2; Seun -name ; surname; Okeke -name ; locale; ko_AQ - -expectedResult; Okeke, Tunde Seun - -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; Okeke Tunde Seun - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; Tunde Seun Okeke - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; addressing; formal - -expectedResult; Okeke, T. S. - -parameters; sorting; short; referring; formal - -expectedResult; Okeke, Tunde - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Okeke T. S. - -parameters; surnameFirst; short; referring; formal - -expectedResult; Okeke Tunde - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; T. S. Okeke - -parameters; givenFirst; short; referring; formal - -expectedResult; Tunde Okeke - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; Okeke T. - -parameters; surnameFirst; short; referring; informal - -expectedResult; Tunde O. - -parameters; givenFirst; short; referring; informal - -expectedResult; Okeke - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal - -expectedResult; Tunde - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; OTS - -parameters; surnameFirst; long; monogram; formal - -expectedResult; TSO - -parameters; givenFirst; long; monogram; formal - -expectedResult; OT - -parameters; surnameFirst; long; monogram; informal - -expectedResult; TO - -parameters; givenFirst; long; monogram; informal - -expectedResult; O - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -expectedResult; T - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; title; Prọf. Dọk. -name ; given; Adá Cornelia -name ; given-informal; Néele -name ; given2; Ẹ́va Sophia -name ; surname-prefix; ván den -name ; surname-core; Wólf -name ; surname2; Bécker Schmidt -name ; generation; jẹnereṣọn -name ; credentials; M.D. PhD. -name ; locale; ko_AQ - -expectedResult; ván den Wólf, Adá Cornelia Ẹ́va Sophia M.D. PhD. - -parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal - -expectedResult; Adá Cornelia Ẹ́va Sophia ván den Wólf M.D. PhD. - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; addressing; formal - -expectedResult; ván den Wólf Adá Cornelia Ẹ́va Sophia M.D. PhD. - -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; short; addressing; formal - -expectedResult; ván den Wólf, A. C. Ẹ́. S. - -parameters; sorting; short; referring; formal - -expectedResult; A. C. Ẹ́. S. ván den Wólf - -parameters; givenFirst; short; referring; formal - -expectedResult; ván den Wólf A. C. Ẹ́. S. - -parameters; surnameFirst; short; referring; formal - -expectedResult; Prọf. Dọk. ván den Wólf - -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; short; addressing; formal -parameters; surnameFirst; long; addressing; formal - -expectedResult; ván den Wólf, Néele - -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal - -expectedResult; Néele ván den Wólf - -parameters; givenFirst; long; referring; informal -parameters; givenFirst; medium; referring; informal - -expectedResult; ván den Wólf A. C. - -parameters; surnameFirst; short; referring; informal - -expectedResult; ván den Wólf Néele - -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; medium; referring; informal - -expectedResult; Néele v. d. W. - -parameters; givenFirst; short; referring; informal - -expectedResult; Néele - -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; addressing; informal - -expectedResult; AẸ́V - -parameters; givenFirst; long; monogram; formal - -expectedResult; VAẸ́ - -parameters; surnameFirst; long; monogram; formal - -expectedResult; NV - -parameters; givenFirst; long; monogram; informal - -expectedResult; VN - -parameters; surnameFirst; long; monogram; informal - -expectedResult; N - -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; informal - -expectedResult; V - -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; short; monogram; formal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; short; monogram; formal - -endName diff --git a/common/testData/personNameTest/sat.txt b/common/testData/personNameTest/sat.txt deleted file mode 100644 index 27248e01a77..00000000000 --- a/common/testData/personNameTest/sat.txt +++ /dev/null @@ -1,168 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: sat -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# foreignG -name ; given; ᱥᱤᱱᱵᱟᱫ -name ; locale; ko_AQ - -expectedResult; ᱥᱤᱱᱵᱟᱫ - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; ᱥ - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; given; ᱟᱰᱟ ᱪᱚᱨᱱᱮᱞᱤᱟ -name ; locale; ko_AQ - -expectedResult; ᱟᱰᱟ ᱪᱚᱨᱱᱮᱞᱤᱟ - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; ᱟ - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/tt.txt b/common/testData/personNameTest/tt.txt deleted file mode 100644 index 104074eed3d..00000000000 --- a/common/testData/personNameTest/tt.txt +++ /dev/null @@ -1,492 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: tt -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Зөхрә -name ; locale; tt_AQ - -expectedResult; Зөхрә - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; З - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Гөлчәчәк -name ; locale; tt_AQ - -expectedResult; Гөлчәчәк - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Г - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; Мәликә Сабирова -name ; locale; tt_AQ - -expectedResult; Мәликә Сабирова - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; М - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeFull -name ; given; Бертрам Уилберфорс -name ; locale; tt_AQ - -expectedResult; Бертрам Уилберфорс - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Б - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignG -name ; given; Синдбад -name ; locale; ja_AQ - -expectedResult; Синдбад - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; С - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; Катя -name ; locale; ja_AQ - -expectedResult; Катя - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; К - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGGS -name ; given; Зазилия -name ; locale; ja_AQ - -expectedResult; Зазилия - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; З - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; given; Аидә Закирова -name ; locale; ja_AQ - -expectedResult; Аидә Закирова - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; А - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/common/testData/personNameTest/xh.txt b/common/testData/personNameTest/xh.txt deleted file mode 100644 index 2ec4e6bd78c..00000000000 --- a/common/testData/personNameTest/xh.txt +++ /dev/null @@ -1,492 +0,0 @@ -# Test data for unit conversions -# Copyright © 1991-2023 Unicode, Inc. -# For terms of use, see http://www.unicode.org/copyright.html -# SPDX-License-Identifier: Unicode-DFS-2016 -# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -# -# CLDR person name formatting test data for: xh -# -# Test lines have the following structure: -# -# enum ; ; (', ' below, the possible choices that could appear in the file. -# For example, could be any of title, given, … credentials. -# Verify that all of these values work with the implementation. -# -# name ; ('-') ; -# A sequence of these is to be used to build a person name object with the given field values. -# If the is 'locale', then the value is the locale of the name. -# That will always be the last field in the name. -# NOTE: the locale for the name (where different than the test file's locale) will generally not match the text. -# It is chosen to exercise the person name formatting, by having a different given-surname order than the file's locale. -# -# expectedResult; -# This line follows a sequence of name lines, and indicates the that all the following parameter lines have this expected value. -# -# parameters; ; ; ; -# Each of these parameter lines should be tested to see that when formatting the current name with these parameters, -# the expected value is produced. -# -# endName -# Indicates the end of the values to be tested with the current name. -# -# ===== -# Example: -# enum ; field ; title, given, given2, surname, surname2, generation, credentials -# … -# -# name ; given; Iris -# name ; surname; Falke -# name ; locale; de -# -# expectedResult; Falke, Iris -# -# parameters; sorting; long; referring; formal -# parameters; sorting; medium; referring; informal -# -# endName -# -# name ; given; Max -# name ; given2; Ben -# name ; surname; Mustermann -# … -# ===== - -enum ; field ; title, given, given2, surname, surname2, generation, credentials -enum ; modifiers ; informal, allCaps, initialCap, initial, retain, monogram, prefix, core, vocative, genitive -enum ; order ; givenFirst, surnameFirst, sorting -enum ; length ; long, medium, short -enum ; usage ; referring, addressing, monogram -enum ; formality ; formal, informal - -# nativeG -name ; given; Zendaya -name ; locale; xh_AQ - -expectedResult; Zendaya - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Z - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGS -name ; given; Irene -name ; locale; xh_AQ - -expectedResult; Irene - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; I - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeGGS -name ; given; Mary Sue -name ; locale; xh_AQ - -expectedResult; Mary Sue - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; M - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# nativeFull -name ; given; Bertram Wilberforce -name ; locale; xh_AQ - -expectedResult; Bertram Wilberforce - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; B - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignG -name ; given; Sinbad -name ; locale; ko_AQ - -expectedResult; Sinbad - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; S - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGS -name ; given; Käthe -name ; locale; ko_AQ - -expectedResult; Käthe - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; K - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignGGS -name ; given; Zäzilia -name ; locale; ko_AQ - -expectedResult; Zäzilia - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; Z - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName - -# foreignFull -name ; given; Ada Cornelia -name ; locale; ko_AQ - -expectedResult; Ada Cornelia - -parameters; givenFirst; long; referring; formal -parameters; givenFirst; long; referring; informal -parameters; givenFirst; long; addressing; formal -parameters; givenFirst; long; addressing; informal -parameters; givenFirst; medium; referring; formal -parameters; givenFirst; medium; referring; informal -parameters; givenFirst; medium; addressing; formal -parameters; givenFirst; medium; addressing; informal -parameters; givenFirst; short; referring; formal -parameters; givenFirst; short; referring; informal -parameters; givenFirst; short; addressing; formal -parameters; givenFirst; short; addressing; informal -parameters; surnameFirst; long; referring; formal -parameters; surnameFirst; long; referring; informal -parameters; surnameFirst; long; addressing; formal -parameters; surnameFirst; long; addressing; informal -parameters; surnameFirst; medium; referring; formal -parameters; surnameFirst; medium; referring; informal -parameters; surnameFirst; medium; addressing; formal -parameters; surnameFirst; medium; addressing; informal -parameters; surnameFirst; short; referring; formal -parameters; surnameFirst; short; referring; informal -parameters; surnameFirst; short; addressing; formal -parameters; surnameFirst; short; addressing; informal -parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; formal -parameters; sorting; short; referring; informal - -expectedResult; A - -parameters; givenFirst; long; monogram; formal -parameters; givenFirst; long; monogram; informal -parameters; givenFirst; medium; monogram; formal -parameters; givenFirst; medium; monogram; informal -parameters; givenFirst; short; monogram; formal -parameters; givenFirst; short; monogram; informal -parameters; surnameFirst; long; monogram; formal -parameters; surnameFirst; long; monogram; informal -parameters; surnameFirst; medium; monogram; formal -parameters; surnameFirst; medium; monogram; informal -parameters; surnameFirst; short; monogram; formal -parameters; surnameFirst; short; monogram; informal - -endName diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java index 9fee8094b8a..741bab2e0e5 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java @@ -1,6 +1,7 @@ package org.unicode.cldr.tool; import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.TreeMultimap; @@ -13,6 +14,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.unicode.cldr.util.CLDRConfig; @@ -51,6 +53,23 @@ enum Options { static File dir = new File(CLDRPaths.TEST_DATA, "personNameTest"); + static final Set REQUIRED_PATHS = + ImmutableSet.of( + "//ldml/personNames/nameOrderLocales[@order=\"givenFirst\"]", + "//ldml/personNames/nameOrderLocales[@order=\"surnameFirst\"]", + "//ldml/personNames/parameterDefault[@parameter=\"formality\"]", + "//ldml/personNames/parameterDefault[@parameter=\"length\"]", + "//ldml/personNames/foreignSpaceReplacement", + "//ldml/personNames/nativeSpaceReplacement", + "//ldml/personNames/initialPattern[@type=\"initial\"]", + "//ldml/personNames/initialPattern[@type=\"initialSequence\"]", + "//ldml/personNames/sampleName[@item=\"nativeGGS\"]/nameField[@type=\"given\"]", + "//ldml/personNames/sampleName[@item=\"nativeGGS\"]/nameField[@type=\"given2\"]", + "//ldml/personNames/sampleName[@item=\"nativeGGS\"]/nameField[@type=\"surname\"]", + "//ldml/personNames/personName[@order=\"givenFirst\"][@length=\"long\"][@usage=\"referring\"][@formality=\"formal\"]/namePattern" + // + ); + public static void main(String[] args) { Factory factory = CLDR_CONFIG.getCldrFactory(); @@ -59,13 +78,10 @@ public static void main(String[] args) { localeMatcher = Pattern.compile(args[0]).matcher(""); } - FormatParameters testParameters = - FormatParameters.from( - "order=surnameFirst; length=long; usage=monogram; formality=informal"); - ULocale undLocale = new ULocale("und"); - for (String locale : factory.getAvailable()) { + main: + for (String locale : factory.getAvailableLanguages()) { if (localeMatcher != null && !localeMatcher.reset(locale).lookingAt()) { continue; } @@ -76,21 +92,20 @@ public static void main(String[] args) { // draft=unconfirmed/provisional CLDRFile unresolved = cldrFile.getUnresolved(); - // Check that we have person data - { - String givenOrder = - unresolved.getStringValue( - "//ldml/personNames/nameOrderLocales[@order=\"givenFirst\"]"); - if (givenOrder == null) { - continue; // skip unless we have person data - } - String surnameOrder = - unresolved.getStringValue( - "//ldml/personNames/nameOrderLocales[@order=\"surnameFirst\"]"); - if (surnameOrder == null) { - continue; // skip unless we have person data + // Check that we have sufficient person data + + if (!locale.equals("en")) { + for (String path : REQUIRED_PATHS) { + String value = unresolved.getStringValue(path); + if (value == null) { + removeTestFile(locale); + continue main; // skip unless we have person data + } } } + + // Load the samples, and exit if there is a problem + Map names; PersonNameFormatter formatter; try { @@ -299,7 +314,11 @@ public static void main(String[] args) { } private static void removeTestFile(String locale) { - new File(dir.toString(), locale + ".txt").delete(); + File file = new File(dir.toString(), locale + ".txt"); + if (file.exists()) { + System.out.println("Removing " + file); + file.delete(); + } } public static ULocale addRegionIfMissing(ULocale myLocale, String region) { From f5713d6f8ea8a63977645d9c050f62c10c07da0e Mon Sep 17 00:00:00 2001 From: macchiati Date: Tue, 12 Sep 2023 14:49:42 -0700 Subject: [PATCH 3/6] CLDR-17081 Make fixes to gd and gl --- common/main/gd.xml | 10 +--- common/main/gl.xml | 11 ++-- common/testData/personNameTest/gd.txt | 22 +++++--- common/testData/personNameTest/gl.txt | 76 ++++++++++++++++++--------- 4 files changed, 71 insertions(+), 48 deletions(-) diff --git a/common/main/gd.xml b/common/main/gd.xml index eb2a56590ac..08b0c011914 100644 --- a/common/main/gd.xml +++ b/common/main/gd.xml @@ -15148,27 +15148,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname-core}, {given} {given2} {surname-prefix} - ↑↑↑ {surname}, {given-informal} {given2} - ↑↑↑ {surname-core}, {given} {given2-initial} {surname-prefix} - ↑↑↑ - {surname}, {given-informal} {given2} - ↑↑↑ + {surname}, {given-informal} {given2-informal-initial} {surname-core}, {given-initial} {given2-initial} {surname-prefix} - ↑↑↑ - {surname}, {given-informal} {given2} - {surname-core}, {given-informal} {given2} {surname-prefix} + {surname}, {given-informal} {given2-informal-initial} Calum diff --git a/common/main/gl.xml b/common/main/gl.xml index 1af90c4d8b6..920984da53b 100644 --- a/common/main/gl.xml +++ b/common/main/gl.xml @@ -9797,27 +9797,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {surname-core} {surname2}, {given} {given2} {surname-prefix} {surname-core}, {given} {given2} {surname-prefix} - ↑↑↑ {surname-core} {surname2}, {given-informal} {surname-prefix} - ↑↑↑ + {surname-core}, {given-informal} {surname-prefix} {surname-core} {surname2}, {given} {given2-initial} {surname-prefix} - {surname-core} {surname2}, {given} {given2} {surname-prefix} + {surname-core}, {given} {given2} {surname-prefix} {surname-core} {surname2}, {given-informal} {surname-prefix} - ↑↑↑ + {surname-core}, {given-informal} {surname-prefix} {surname-core} {surname2}, {given-initial} {given2-initial} {surname-prefix} - {surname-core} {surname2}, {given-initial} {given2-initial} {surname-prefix} + {surname-core}, {given-initial} {given2-initial} {surname-prefix} {surname-core} {surname2}, {given-informal} {surname-prefix} - ↑↑↑ + {surname-core}, {given-informal} {surname-prefix} Uxía diff --git a/common/testData/personNameTest/gd.txt b/common/testData/personNameTest/gd.txt index 41283a63d7e..c20b602147a 100644 --- a/common/testData/personNameTest/gd.txt +++ b/common/testData/personNameTest/gd.txt @@ -208,8 +208,6 @@ expectedResult; Caimbeul, Dòmhnall Iain Tormod parameters; sorting; long; referring; formal parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Caimbeul Dòmhnall Iain Tormod @@ -226,6 +224,8 @@ parameters; givenFirst; medium; referring; informal expectedResult; Caimbeul, Dòmhnall Iain T. parameters; sorting; medium; referring; formal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal expectedResult; Caimbeul Dòmhnall Iain T. @@ -353,8 +353,6 @@ parameters; givenFirst; short; addressing; formal expectedResult; Mac a’ Ghobhainn, Donaidh Bàn parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Donaidh Bàn Mac a’ Ghobhainn @@ -365,6 +363,11 @@ expectedResult; Mac a’ Ghobhainn Donaidh Bàn parameters; surnameFirst; medium; referring; informal +expectedResult; Mac a’ Ghobhainn, Donaidh B. + +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal + expectedResult; Mac a’ Ghobhainn, D. I. B. parameters; sorting; short; referring; formal @@ -583,8 +586,6 @@ expectedResult; Smith, Cecilia Angela parameters; sorting; long; referring; formal parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Cecilia Angela Smith @@ -601,6 +602,8 @@ parameters; surnameFirst; medium; referring; informal expectedResult; Smith, Cecilia A. parameters; sorting; medium; referring; formal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal expectedResult; Cecilia A. Smith @@ -726,8 +729,6 @@ parameters; sorting; medium; referring; formal expectedResult; von Brühl, Neele César Martín parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Neele César Martín von Brühl @@ -746,6 +747,11 @@ expectedResult; Brühl, A. C. C. M. von parameters; sorting; short; referring; formal +expectedResult; von Brühl, Neele C. M. + +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal + expectedResult; A. C. C. M. von Brühl parameters; givenFirst; short; referring; formal diff --git a/common/testData/personNameTest/gl.txt b/common/testData/personNameTest/gl.txt index 88e82c81239..d4b5af7fd96 100644 --- a/common/testData/personNameTest/gl.txt +++ b/common/testData/personNameTest/gl.txt @@ -121,6 +121,10 @@ name ; locale; gl_AQ expectedResult; Freire, Xiana parameters; sorting; long; referring; formal +parameters; sorting; long; referring; informal +parameters; sorting; medium; referring; formal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal expectedResult; Freire Xiana @@ -128,10 +132,6 @@ parameters; surnameFirst; long; referring; formal parameters; surnameFirst; long; referring; informal parameters; surnameFirst; medium; referring; formal parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Xiana Freire @@ -140,11 +140,14 @@ parameters; givenFirst; long; referring; informal parameters; givenFirst; medium; referring; formal parameters; givenFirst; medium; referring; informal +expectedResult; Freire, X. + +parameters; sorting; short; referring; formal + expectedResult; Freire X. parameters; surnameFirst; short; referring; formal parameters; surnameFirst; short; referring; informal -parameters; sorting; short; referring; formal expectedResult; X. Freire @@ -207,9 +210,7 @@ name ; locale; gl_AQ expectedResult; Souto, Brais Manoel parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal +parameters; sorting; medium; referring; formal expectedResult; Brais Manoel Souto @@ -226,7 +227,16 @@ parameters; givenFirst; medium; referring; formal expectedResult; Souto Brais M. parameters; surnameFirst; medium; referring; formal -parameters; sorting; medium; referring; formal + +expectedResult; Souto, B. M. + +parameters; sorting; short; referring; formal + +expectedResult; Souto, Brais + +parameters; sorting; long; referring; informal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal expectedResult; B. M. Souto @@ -240,7 +250,6 @@ parameters; givenFirst; medium; referring; informal expectedResult; Souto B. M. parameters; surnameFirst; short; referring; formal -parameters; sorting; short; referring; formal expectedResult; Souto Brais @@ -319,9 +328,6 @@ parameters; givenFirst; long; referring; formal expectedResult; Castro Sáez, Xosé Carlos Francisco Xavier de parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; de Castro Xosé Carlos Francisco Xavier @@ -351,6 +357,12 @@ expectedResult; de Castro X. C. F. X. parameters; surnameFirst; short; referring; formal +expectedResult; Castro Sáez, Pepe de + +parameters; sorting; long; referring; informal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal + expectedResult; Pepe de Castro Sáez parameters; givenFirst; long; referring; informal @@ -487,6 +499,10 @@ name ; locale; ko_AQ expectedResult; Weber, Annelise parameters; sorting; long; referring; formal +parameters; sorting; long; referring; informal +parameters; sorting; medium; referring; formal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal expectedResult; Annelise Weber @@ -501,15 +517,15 @@ parameters; surnameFirst; long; referring; formal parameters; surnameFirst; long; referring; informal parameters; surnameFirst; medium; referring; formal parameters; surnameFirst; medium; referring; informal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; formal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Annelise W. parameters; givenFirst; short; referring; informal +expectedResult; Weber, A. + +parameters; sorting; short; referring; formal + expectedResult; A. Weber parameters; givenFirst; short; referring; formal @@ -527,7 +543,6 @@ expectedResult; Weber A. parameters; surnameFirst; short; referring; formal parameters; surnameFirst; short; referring; informal -parameters; sorting; short; referring; formal expectedResult; Weber @@ -573,9 +588,7 @@ name ; locale; ko_AQ expectedResult; Meyer, Benno Hans parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal +parameters; sorting; medium; referring; formal expectedResult; Benno Hans Meyer @@ -592,7 +605,16 @@ parameters; givenFirst; medium; referring; formal expectedResult; Meyer Benno H. parameters; surnameFirst; medium; referring; formal -parameters; sorting; medium; referring; formal + +expectedResult; Meyer, B. H. + +parameters; sorting; short; referring; formal + +expectedResult; Meyer, Benno + +parameters; sorting; long; referring; informal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal expectedResult; B. H. Meyer @@ -606,7 +628,6 @@ parameters; givenFirst; medium; referring; informal expectedResult; Meyer B. H. parameters; surnameFirst; short; referring; formal -parameters; sorting; short; referring; formal expectedResult; Meyer Benno @@ -687,9 +708,6 @@ parameters; givenFirst; long; referring; formal expectedResult; Brül Cabral de Melo, Erika Cornelia Anna Isabelle von parameters; sorting; long; referring; formal -parameters; sorting; long; referring; informal -parameters; sorting; medium; referring; informal -parameters; sorting; short; referring; informal expectedResult; Erika Cornelia A. I. von Brül Cabral de Melo II @@ -715,6 +733,12 @@ expectedResult; von Brül Erika Cornelia A. I. II parameters; surnameFirst; medium; referring; formal +expectedResult; Brül Cabral de Melo, Neele von + +parameters; sorting; long; referring; informal +parameters; sorting; medium; referring; informal +parameters; sorting; short; referring; informal + expectedResult; Neele von Brül Cabral de Melo parameters; givenFirst; long; referring; informal From 44481e956e34ba79b026fd60ac7e80ec0283c9a6 Mon Sep 17 00:00:00 2001 From: macchiati Date: Tue, 12 Sep 2023 15:17:06 -0700 Subject: [PATCH 4/6] CLDR-17081 Fix case hacks --- .../org/unicode/cldr/tool/GeneratePersonNameTestData.java | 5 +---- .../unicode/cldr/util/personname/PersonNameFormatter.java | 7 +++++++ .../test/java/org/unicode/cldr/unittest/TestDataTest.java | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java index 741bab2e0e5..32955055b10 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java @@ -211,10 +211,7 @@ public static void main(String[] args) { // } String formatted = - formatter - .format(nameObject, parameters) - .replace("ᵛ", "") // remove two special CLDR ST hacks - .replace("ᵍ", ""); + formatter.formatWithoutSuperscripts(nameObject, parameters); if (formatted.isEmpty()) { continue; diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/personname/PersonNameFormatter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/personname/PersonNameFormatter.java index a476b135195..ac77c3039b8 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/personname/PersonNameFormatter.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/personname/PersonNameFormatter.java @@ -2037,6 +2037,13 @@ public String format(NameObject nameObject, FormatParameters nameFormatParameter return bestPattern.format(nameObject, nameFormatParameters, fallbackFormatter); } + public String formatWithoutSuperscripts( + NameObject nameObject, FormatParameters nameFormatParameters) { + return format(nameObject, nameFormatParameters) + .replace("ᵛ", "") // remove two special CLDR ST hacks + .replace("ᵍ", ""); + } + /** * For testing * diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDataTest.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDataTest.java index a6028d99977..c339eaa262f 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDataTest.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDataTest.java @@ -183,7 +183,8 @@ void checkLine(String line) { int debug = 0; } - actual = pnf.format(sampleName, formatParameters).replace("ᵛ", ""); + actual = + pnf.formatWithoutSuperscripts(sampleName, formatParameters); } catch (Exception e) { actual = e.getMessage(); } From 5bc1158853abf853152bcaf8adba894f16b631be Mon Sep 17 00:00:00 2001 From: macchiati Date: Tue, 12 Sep 2023 16:46:49 -0700 Subject: [PATCH 5/6] CLDR-17081 Fix remaining gl issue --- common/main/gl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/main/gl.xml b/common/main/gl.xml index 920984da53b..095929b1fb7 100644 --- a/common/main/gl.xml +++ b/common/main/gl.xml @@ -9804,7 +9804,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {surname-core} {surname2}, {given} {given2-initial} {surname-prefix} - {surname-core}, {given} {given2} {surname-prefix} + {surname-core}, {given} {given2-initial} {surname-prefix} {surname-core} {surname2}, {given-informal} {surname-prefix} From b9d1815ff0a6864f96688a6122ab0eda4181eef0 Mon Sep 17 00:00:00 2001 From: macchiati Date: Tue, 12 Sep 2023 17:30:54 -0700 Subject: [PATCH 6/6] CLDR-17081 And run the testData generation --- common/testData/personNameTest/gl.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/testData/personNameTest/gl.txt b/common/testData/personNameTest/gl.txt index d4b5af7fd96..a05b02af47d 100644 --- a/common/testData/personNameTest/gl.txt +++ b/common/testData/personNameTest/gl.txt @@ -210,7 +210,6 @@ name ; locale; gl_AQ expectedResult; Souto, Brais Manoel parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal expectedResult; Brais Manoel Souto @@ -220,6 +219,10 @@ expectedResult; Souto Brais Manoel parameters; surnameFirst; long; referring; formal +expectedResult; Souto, Brais M. + +parameters; sorting; medium; referring; formal + expectedResult; Brais M. Souto parameters; givenFirst; medium; referring; formal @@ -588,7 +591,6 @@ name ; locale; ko_AQ expectedResult; Meyer, Benno Hans parameters; sorting; long; referring; formal -parameters; sorting; medium; referring; formal expectedResult; Benno Hans Meyer @@ -598,6 +600,10 @@ expectedResult; Meyer Benno Hans parameters; surnameFirst; long; referring; formal +expectedResult; Meyer, Benno H. + +parameters; sorting; medium; referring; formal + expectedResult; Benno H. Meyer parameters; givenFirst; medium; referring; formal