organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-3938 Related to cldrbug 235.

Browse source 
Separate cldr tests from cloctst, and depend on testLocale instead of root for testing

X-SVN-Rev: 16253
This commit is contained in:
George Rhoten 2004-09-03 20:51:11 +00:00
parent 7c166871b7
commit 08382a4b07
10 changed files with 4065 additions and 1170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/test/cintltst/Makefile.in
View file

@ -42,7 +42,7 @@ OBJECTS = callcoll.o calltest.o colutil.o capitst.o cbiapts.o cbkittst.o \
ccaltst.o cctest.o ccapitst.o ccolltst.o cconvtst.o ccurrtst.o cdantst.o \
cdattst.o cdetst.o cdtdptst.o cdtrgtst.o cestst.o cfintst.o cformtst.o \
cfrtst.o cg7coll.o chashtst.o cintltst.o citertst.o cjaptst.o cloctst.o \
cmsccoll.o cmsgtst.o cposxtst.o \
cmsccoll.o cmsgtst.o cposxtst.o cldrtest.o \
cnmdptst.o cnormtst.o cnumtst.o cregrtst.o crestst.o creststn.o cturtst.o \
cucdapi.o cucdtst.o custrtst.o cstrcase.o cutiltst.o encoll.o nucnvtst.o nccbtst.o bocu1tst.o \
cbiditst.o cbididat.o eurocreg.o udatatst.o utf16tst.o utransts.o \

4
icu4c/source/test/cintltst/cintltst.dsp
View file

@ -482,6 +482,10 @@ SOURCE=.\cnumtst.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\cldrtest.c
# End Source File
# Begin Source File
SOURCE=.\cloctst.c
# End Source File
# Begin Source File

3
icu4c/source/test/cintltst/cintltst.vcproj
View file

@ -412,6 +412,9 @@
<Filter
Name="locales &amp; resources"
Filter="">
<File
RelativePath=".\cldrtest.c">
</File>
<File
RelativePath=".\cloctst.c">
</File>

1140
icu4c/source/test/cintltst/cldrtest.c Normal file
View file

File diff suppressed because it is too large Load diff

1162
icu4c/source/test/cintltst/cloctst.c
View file

File diff suppressed because it is too large Load diff

6
icu4c/source/test/cintltst/cloctst.h
View file

@ -61,12 +61,6 @@ static void TestDisplayNames(void);
**/
static void TestVariantParsing(void);
/* Make sure that the locale data is good. */
static void TestLocaleStructure(void);
/* Make sure that Country information is the same across locales, within reason. */
static void TestConsistentCountryInfo(void);
/* Make sure we can pass "de_DE@Collation=PHONEBOOK" */
static void MoreVariants(void);

2
icu4c/source/test/cintltst/cutiltst.c
View file

@ -15,6 +15,7 @@
#include "cintltst.h"
void addLocaleTest(TestNode**);
void addCLDRTest(TestNode**);
void addUnicodeTest(TestNode**);
void addUStringTest(TestNode**);
void addResourceBundleTest(TestNode**);
@ -34,6 +35,7 @@ void addUtility(TestNode** root)
addCStringTest(root);
addTrieTest(root);
addLocaleTest(root);
addCLDRTest(root);
addUnicodeTest(root);
addUStringTest(root);
addResourceBundleTest(root);

2
icu4c/source/test/testdata/Makefile.in vendored
View file

@ -106,7 +106,7 @@ TEST_UCM_SOURCE= test1.ucm test3.ucm test4.ucm test4x.ucm ibm9027.ucm
TEST_UCM_FILES=$(TEST_UCM_SOURCE:%=$(TESTSRCDATADIR)/data/%)
TEST_CNV_FILES=$(TEST_UCM_SOURCE:%.ucm=$(TESTBUILDDIR)/$(TESTDT)%.cnv)
TEST_RES = casing.txt mc.txt root.txt te.txt te_IN.txt testtypes.txt testaliases.txt testempty.txt DataDrivenCollationTest.txt idna_rules.txt conversion.txt icuio.txt testtable32.txt
TEST_RES = casing.txt mc.txt root.txt te.txt te_IN.txt testtypes.txt testaliases.txt testempty.txt structLocale.txt DataDrivenCollationTest.txt idna_rules.txt conversion.txt icuio.txt testtable32.txt
TEST_RES_FILES=$(TEST_RES:%.txt=$(TESTBUILDDIR)/$(TESTDT)%.res) $(TESTBUILDDIR)/$(TESTDT)iscii.res $(TESTSRCDATADIR)/$(TESTDT)icu26_testtypes.res $(TESTSRCDATADIR)/$(TESTDT)icu26e_testtypes.res
ALL_TEST_FILES = $(TEST_DAT_FILES) $(TEST_BRK_FILES) $(TEST_CNV_FILES) $(TEST_RES_FILES) $(TESTOUTDIR)/$(TESTDT)nam.typ

2911
icu4c/source/test/testdata/structLocale.txt vendored Normal file
View file

File diff suppressed because it is too large Load diff

3
icu4c/source/test/testdata/testdata.mak vendored
View file

@ -23,7 +23,7 @@ ALL : "$(TESTDATAOUT)\testdata.dat"
# icu26e_testtypes.res is the same, but icuswapped to big-endian EBCDIC
# markus 2003nov21
"$(TESTDATAOUT)\testdata.dat" : "$(TESTDATABLD)\casing.res" "$(TESTDATABLD)\conversion.res" "$(TESTDATABLD)\icuio.res" "$(TESTDATABLD)\mc.res" "$(TESTDATABLD)\root.res" "$(TESTDATABLD)\te.res" "$(TESTDATABLD)\te_IN.res" "$(TESTDATABLD)\testaliases.res" "$(TESTDATABLD)\testtypes.res" "$(TESTDATABLD)\testempty.res" "$(TESTDATABLD)\$(TESTDT)iscii.res" "$(TESTDATABLD)\$(TESTDT)idna_rules.res" "$(TESTDATABLD)\DataDrivenCollationTest.res" "$(TESTDATABLD)\$(TESTDT)test.icu" "$(TESTDATABLD)\$(TESTDT)testtable32.res" "$(TESTDATABLD)\$(TESTDT)test1.cnv" "$(TESTDATABLD)\$(TESTDT)test3.cnv" "$(TESTDATABLD)\$(TESTDT)test4.cnv" "$(TESTDATABLD)\$(TESTDT)test4x.cnv" "$(TESTDATABLD)\$(TESTDT)ibm9027.cnv" "$(TESTDATABLD)\$(TESTDT)nfscsi.spp" "$(TESTDATABLD)\$(TESTDT)nfscss.spp" "$(TESTDATABLD)\$(TESTDT)nfscis.spp" "$(TESTDATABLD)\$(TESTDT)nfsmxs.spp" "$(TESTDATABLD)\$(TESTDT)nfsmxp.spp"
"$(TESTDATAOUT)\testdata.dat" : "$(TESTDATABLD)\casing.res" "$(TESTDATABLD)\conversion.res" "$(TESTDATABLD)\icuio.res" "$(TESTDATABLD)\mc.res" "$(TESTDATABLD)\structLocale.res" "$(TESTDATABLD)\root.res" "$(TESTDATABLD)\te.res" "$(TESTDATABLD)\te_IN.res" "$(TESTDATABLD)\testaliases.res" "$(TESTDATABLD)\testtypes.res" "$(TESTDATABLD)\testempty.res" "$(TESTDATABLD)\$(TESTDT)iscii.res" "$(TESTDATABLD)\$(TESTDT)idna_rules.res" "$(TESTDATABLD)\DataDrivenCollationTest.res" "$(TESTDATABLD)\$(TESTDT)test.icu" "$(TESTDATABLD)\$(TESTDT)testtable32.res" "$(TESTDATABLD)\$(TESTDT)test1.cnv" "$(TESTDATABLD)\$(TESTDT)test3.cnv" "$(TESTDATABLD)\$(TESTDT)test4.cnv" "$(TESTDATABLD)\$(TESTDT)test4x.cnv" "$(TESTDATABLD)\$(TESTDT)ibm9027.cnv" "$(TESTDATABLD)\$(TESTDT)nfscsi.spp" "$(TESTDATABLD)\$(TESTDT)nfscss.spp" "$(TESTDATABLD)\$(TESTDT)nfscis.spp" "$(TESTDATABLD)\$(TESTDT)nfsmxs.spp" "$(TESTDATABLD)\$(TESTDT)nfsmxp.spp"
@echo Building test data
@copy "$(TESTDATABLD)\$(TESTDT)te.res" "$(TESTDATAOUT)\$(TESTDT)nam.typ"
@copy "$(TESTDATA)\$(TESTDT)icu26_testtypes.res" "$(TESTDATABLD)"
@ -41,6 +41,7 @@ $(TESTDT)icu26_testtypes.res
$(TESTDT)icu26e_testtypes.res
$(TESTDT)testempty.res
$(TESTDT)testaliases.res
$(TESTDT)structLocale.res
$(TESTDT)icuio.res
$(TESTDT)iscii.res
$(TESTDT)DataDrivenCollationTest.res