Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: source/test/cintltst/trie2test.c

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/test/cintltst/spreptst.c ('k') | source/test/cintltst/ucnvseltst.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/test/cintltst/trie2test.c
diff --git a/source/test/cintltst/trie2test.c b/source/test/cintltst/trie2test.c
index ccd9c48e8eb04959163748781dc326d9b7091848..f32e690f93475f969b2a45afef73b545c3ecfe15 100644
--- a/source/test/cintltst/trie2test.c
+++ b/source/test/cintltst/trie2test.c
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2001-2008, International Business Machines
+* Copyright (C) 2001-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -23,8 +23,6 @@
#include "udataswp.h"
#include "cintltst.h"
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
void addTrie2Test(TestNode** root);
/* Values for setting possibly overlapping, out-of-order ranges of values */
@@ -1034,32 +1032,32 @@ checkRangesSingleValue[]={
static void
TrieTest(void) {
testTrieRanges("set1", FALSE,
- setRanges1, LENGTHOF(setRanges1),
- checkRanges1, LENGTHOF(checkRanges1));
+ setRanges1, UPRV_LENGTHOF(setRanges1),
+ checkRanges1, UPRV_LENGTHOF(checkRanges1));
testTrieRanges("set2-overlap", FALSE,
- setRanges2, LENGTHOF(setRanges2),
- checkRanges2, LENGTHOF(checkRanges2));
+ setRanges2, UPRV_LENGTHOF(setRanges2),
+ checkRanges2, UPRV_LENGTHOF(checkRanges2));
testTrieRanges("set3-initial-9", FALSE,
- setRanges3, LENGTHOF(setRanges3),
- checkRanges3, LENGTHOF(checkRanges3));
+ setRanges3, UPRV_LENGTHOF(setRanges3),
+ checkRanges3, UPRV_LENGTHOF(checkRanges3));
testTrieRanges("set-empty", FALSE,
setRangesEmpty, 0,
- checkRangesEmpty, LENGTHOF(checkRangesEmpty));
+ checkRangesEmpty, UPRV_LENGTHOF(checkRangesEmpty));
testTrieRanges("set-single-value", FALSE,
- setRangesSingleValue, LENGTHOF(setRangesSingleValue),
- checkRangesSingleValue, LENGTHOF(checkRangesSingleValue));
+ setRangesSingleValue, UPRV_LENGTHOF(setRangesSingleValue),
+ checkRangesSingleValue, UPRV_LENGTHOF(checkRangesSingleValue));
testTrieRanges("set2-overlap.withClone", TRUE,
- setRanges2, LENGTHOF(setRanges2),
- checkRanges2, LENGTHOF(checkRanges2));
+ setRanges2, UPRV_LENGTHOF(setRanges2),
+ checkRanges2, UPRV_LENGTHOF(checkRanges2));
}
static void
EnumNewTrieForLeadSurrogateTest(void) {
static const char *const testName="enum-for-lead";
UTrie2 *trie=makeTrieWithRanges(testName, FALSE,
- setRanges2, LENGTHOF(setRanges2),
- checkRanges2, LENGTHOF(checkRanges2));
+ setRanges2, UPRV_LENGTHOF(setRanges2),
+ checkRanges2, UPRV_LENGTHOF(checkRanges2));
while(trie!=NULL) {
const CheckRange *checkRanges;
@@ -1130,7 +1128,7 @@ dummyTest(UTrie2ValueBits valueBits) {
return;
}
- testFrozenTrie(testName, trie, valueBits, checkRanges, LENGTHOF(checkRanges));
+ testFrozenTrie(testName, trie, valueBits, checkRanges, UPRV_LENGTHOF(checkRanges));
utrie2_close(trie);
}
@@ -1191,7 +1189,7 @@ FreeBlocksTest(void) {
}
trie=testTrieSerializeAllValueBits(testName, trie, FALSE,
- checkRanges, LENGTHOF(checkRanges));
+ checkRanges, UPRV_LENGTHOF(checkRanges));
utrie2_close(trie);
}
@@ -1249,7 +1247,7 @@ GrowDataArrayTest(void) {
}
trie=testTrieSerializeAllValueBits(testName, trie, FALSE,
- checkRanges, LENGTHOF(checkRanges));
+ checkRanges, UPRV_LENGTHOF(checkRanges));
utrie2_close(trie);
}
@@ -1411,8 +1409,8 @@ testTrie2FromTrie1(const char *testName,
static void
Trie12ConversionTest(void) {
testTrie2FromTrie1("trie1->trie2",
- setRanges2, LENGTHOF(setRanges2),
- checkRanges2, LENGTHOF(checkRanges2));
+ setRanges2, UPRV_LENGTHOF(setRanges2),
+ checkRanges2, UPRV_LENGTHOF(checkRanges2));
}
void
« no previous file with comments | « source/test/cintltst/spreptst.c ('k') | source/test/cintltst/ucnvseltst.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698