From e1af930c6ad54100767c21a883f88f529336c4ad Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 2 Oct 2023 21:57:17 -0700 Subject: [PATCH] ICU-22325 BRS 74rc move cldr testdata to consistent place, adjust test & tools to match --- docs/processes/cldr-icu.md | 13 ++----------- icu4c/source/test/intltest/loctest.cpp | 4 ++-- .../{ => cldr/localeIdentifiers}/likelySubtags.txt | 0 .../localeIdentifiers}/localeCanonicalization.txt | 0 .../java/com/ibm/icu/dev/test/util/ULocaleTest.java | 4 ++-- .../{ => cldr/localeIdentifiers}/likelySubtags.txt | 0 .../localeIdentifiers}/localeCanonicalization.txt | 0 tools/cldr/build.xml | 5 +++-- 8 files changed, 9 insertions(+), 17 deletions(-) rename icu4c/source/test/testdata/{ => cldr/localeIdentifiers}/likelySubtags.txt (100%) rename icu4c/source/test/testdata/{ => cldr/localeIdentifiers}/localeCanonicalization.txt (100%) rename icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/{ => cldr/localeIdentifiers}/likelySubtags.txt (100%) rename icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/{unicode => cldr/localeIdentifiers}/localeCanonicalization.txt (100%) diff --git a/docs/processes/cldr-icu.md b/docs/processes/cldr-icu.md index 8202280d633..14832fe7ca7 100644 --- a/docs/processes/cldr-icu.md +++ b/docs/processes/cldr-icu.md @@ -270,17 +270,8 @@ cd $TOOLS_ROOT/cldr ant copy-cldr-testdata ``` -5d. Copy localeCanonicalization.txt from CLDR testData and add a source reference line: -``` -cp -p $CLDR_DIR/common/testData/localeIdentifiers/localeCanonicalization.txt $ICU4C_DIR/source/test/testdata/ -cp -p $CLDR_DIR/common/testData/localeIdentifiers/localeCanonicalization.txt $ICU4J_ROOT/main/core/src/test/resources/com/ibm/icu/dev/data/unicode/ -open $ICU4C_DIR/source/test/testdata/localeCanonicalization.txt -open $ICU4J_ROOT/main/core/src/test/resources/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt -``` -At the beginning of each file add the following line:\ -``` -# File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt -``` +5d. NOP +(This step has been subsumed into 5c above) 5e. For now, manually re-add the `lstm` entries in `data/brkitr/root.txt` ``` diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index ac39a9c994b..9fe056fe0e7 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -5527,7 +5527,7 @@ void LocaleTest::TestLocaleCanonicalizationFromFile() char testPath[400]; char line[256]; strcpy(testPath, sourceTestDataPath); - strcat(testPath, "localeCanonicalization.txt"); + strcat(testPath, "cldr/localeIdentifiers/localeCanonicalization.txt"); LocalStdioFilePointer testFile(fopen(testPath, "r")); if(testFile.isNull()) { errln("unable to open %s", testPath); @@ -5707,7 +5707,7 @@ LocaleTest::TestDataDrivenLikelySubtags() { return; } IcuTestErrorCode errorCode(*this, "TestDataDrivenLikelySubtags()"); - const char* name = "likelySubtags.txt"; + const char* name = "cldr/localeIdentifiers/likelySubtags.txt"; const char *sourceTestDataPath = getSourceTestData(errorCode); if (errorCode.errIfFailureAndReset("unable to find the source/test/testdata " "folder (getSourceTestData())")) { diff --git a/icu4c/source/test/testdata/likelySubtags.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt similarity index 100% rename from icu4c/source/test/testdata/likelySubtags.txt rename to icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt diff --git a/icu4c/source/test/testdata/localeCanonicalization.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt similarity index 100% rename from icu4c/source/test/testdata/localeCanonicalization.txt rename to icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java index 5f75bf64792..da2b4707f35 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -5396,7 +5396,7 @@ public class ULocaleTest extends TestFmwk { @Test public void TestLocaleCanonicalizationFromFile() throws IOException { - BufferedReader testFile = TestUtil.getDataReader("unicode/localeCanonicalization.txt"); + BufferedReader testFile = TestUtil.getDataReader("cldr/localeIdentifiers/localeCanonicalization.txt"); try { String line; while ((line = testFile.readLine()) != null) { @@ -5460,7 +5460,7 @@ public class ULocaleTest extends TestFmwk { static List readLikelySubtagsTestCases() throws Exception { List tests = new ArrayList<>(); TestCase test = new TestCase(); - BufferedReader testFile = TestUtil.getDataReader("likelySubtags.txt"); + BufferedReader testFile = TestUtil.getDataReader("cldr/localeIdentifiers/likelySubtags.txt"); try { String line; while ((line = testFile.readLine()) != null) { diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/likelySubtags.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt similarity index 100% rename from icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/likelySubtags.txt rename to icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeCanonicalization.txt similarity index 100% rename from icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt rename to icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeCanonicalization.txt diff --git a/tools/cldr/build.xml b/tools/cldr/build.xml index 8f58dc9f834..53f815d91e3 100644 --- a/tools/cldr/build.xml +++ b/tools/cldr/build.xml @@ -40,9 +40,10 @@ - + - + +