From 12be3c60973fac57236957bd98f548b56f0df2f2 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Fri, 1 Jul 2005 23:01:25 +0000 Subject: [PATCH] ICU-4452 code coverage for utrie.c/defaultGetFoldedValue() X-SVN-Rev: 18130 --- icu4c/source/test/cintltst/trietest.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/icu4c/source/test/cintltst/trietest.c b/icu4c/source/test/cintltst/trietest.c index 0242d08323c..37a98c85920 100644 --- a/icu4c/source/test/cintltst/trietest.c +++ b/icu4c/source/test/cintltst/trietest.c @@ -449,6 +449,7 @@ testTrieRanges(const char *testName, const CheckRange checkRanges[], int32_t countCheckRanges, UBool dataIs32, UBool latin1Linear) { UTrieGetFoldingOffset *getFoldingOffset; + UNewTrieGetFoldedValue *getFoldedValue; const CheckRange *enumRanges; UNewTrie *newTrie; UTrie trie={ 0 }; @@ -498,13 +499,24 @@ testTrieRanges(const char *testName, if(dataIs32) { getFoldingOffset=_testFoldingOffset32; + getFoldedValue=_testFoldedValue32; } else { getFoldingOffset=_testFoldingOffset16; + getFoldedValue=_testFoldedValue16; + } + + /* + * code coverage for utrie.c/defaultGetFoldedValue(), + * pick some combination of parameters for selecting the UTrie defaults + */ + if(!dataIs32 && latin1Linear) { + getFoldingOffset=NULL; + getFoldedValue=NULL; } errorCode=U_ZERO_ERROR; length=utrie_serialize(newTrie, storageHolder.storage, sizeof(storageHolder.storage), - dataIs32 ? _testFoldedValue32 : _testFoldedValue16, + getFoldedValue, (UBool)!dataIs32, &errorCode); if(U_FAILURE(errorCode)) { @@ -541,7 +553,9 @@ testTrieRanges(const char *testName, log_err("error: utrie_unserialize() failed, %s\n", u_errorName(errorCode)); return; } - trie.getFoldingOffset=getFoldingOffset; + if(getFoldingOffset!=NULL) { + trie.getFoldingOffset=getFoldingOffset; + } if(dataIs32!=(trie.data32!=NULL)) { log_err("error: trie serialization (%s) did not preserve 32-bitness\n", testName);