From c64fb14d6342fc2f12e87762295844211633049c Mon Sep 17 00:00:00 2001 From: Ram Viswanadha Date: Wed, 27 Nov 2002 02:40:34 +0000 Subject: [PATCH] ICU-2118 improve API coverage X-SVN-Rev: 10394 --- icu4c/source/test/intltest/canittst.cpp | 6 +- icu4c/source/test/intltest/citrtest.cpp | 156 +++++++++++++++++++++++- icu4c/source/test/intltest/citrtest.h | 2 +- icu4c/source/test/intltest/rbbiapts.cpp | 14 +++ icu4c/source/test/intltest/rbbiapts.h | 2 + icu4c/source/test/intltest/tstnorm.cpp | 5 +- 6 files changed, 178 insertions(+), 7 deletions(-) diff --git a/icu4c/source/test/intltest/canittst.cpp b/icu4c/source/test/intltest/canittst.cpp index ac6189947ab..ad930a92e76 100644 --- a/icu4c/source/test/intltest/canittst.cpp +++ b/icu4c/source/test/intltest/canittst.cpp @@ -299,7 +299,11 @@ void CanonicalIteratorTest::TestAPI() { if(next != afterReset) { errln("Next after instantiation ("+next+") is different from next after reset ("+afterReset+")."); } - + + logln("Testing getStaticClassID and getDynamicClassID"); + if(can.getDynamicClassID() != CanonicalIterator::getStaticClassID()){ + errln("RTTI failed for CanonicalIterator getDynamicClassID != getStaticClassID"); + } } diff --git a/icu4c/source/test/intltest/citrtest.cpp b/icu4c/source/test/intltest/citrtest.cpp index d8c03c7d91b..3712ee45754 100644 --- a/icu4c/source/test/intltest/citrtest.cpp +++ b/icu4c/source/test/intltest/citrtest.cpp @@ -17,12 +17,129 @@ #include "unicode/uiter.h" #include "citrtest.h" + +class SCharacterIterator : public CharacterIterator { +public: + SCharacterIterator(const UnicodeString& textStr){ + text = textStr; + pos=0; + textLength = textStr.length(); + begin = 0; + end=textLength; + + } + + virtual ~SCharacterIterator(){}; + + + void setText(const UnicodeString& newText){ + text = newText; + } + + virtual void getText(UnicodeString& result){ + text.extract(0,text.length(),result); + } + virtual UClassID getDynamicClassID(void) const{ + return getStaticClassID(); + } + + static UClassID getStaticClassID(void){ + return (UClassID)(&fgClassID); + } + virtual UBool operator==(const ForwardCharacterIterator& that) const{ + return TRUE; + } + + virtual CharacterIterator* clone(void) const { + return NULL; + } + virtual int32_t hashCode(void) const{ + return DONE; + } + virtual UChar nextPostInc(void){ return text.charAt(pos++);} + virtual UChar32 next32PostInc(void){return text.char32At(pos++);} + virtual UBool hasNext(){ return TRUE;}; + virtual UChar first(){return DONE;}; + virtual UChar32 first32(){return DONE;}; + virtual UChar last(){return DONE;}; + virtual UChar32 last32(){return DONE;}; + virtual UChar setIndex(int32_t pos){return DONE;}; + virtual UChar32 setIndex32(int32_t pos){return DONE;}; + virtual UChar current() const{return DONE;}; + virtual UChar32 current32() const{return DONE;}; + virtual UChar next(){return DONE;}; + virtual UChar32 next32(){return DONE;}; + virtual UChar previous(){return DONE;}; + virtual UChar32 previous32(){return DONE;}; + virtual int32_t move(int32_t delta,CharacterIterator::EOrigin origin){ + switch(origin) { + case kStart: + pos = begin + delta; + break; + case kCurrent: + pos += delta; + break; + case kEnd: + pos = end + delta; + break; + default: + break; + } + + if(pos < begin) { + pos = begin; + } else if(pos > end) { + pos = end; + } + + return pos; + }; + virtual int32_t move32(int32_t delta, CharacterIterator::EOrigin origin){ + switch(origin) { + case kStart: + pos = begin; + if(delta > 0) { + UTF_FWD_N(text, pos, end, delta); + } + break; + case kCurrent: + if(delta > 0) { + UTF_FWD_N(text, pos, end, delta); + } else { + UTF_BACK_N(text, begin, pos, -delta); + } + break; + case kEnd: + pos = end; + if(delta < 0) { + UTF_BACK_N(text, begin, pos, -delta); + } + break; + default: + break; + } + + return pos; + }; + virtual UBool hasPrevious(){return TRUE;}; + + SCharacterIterator& operator=(const SCharacterIterator& that){ + text = that.text; + return *this; + } + + +private: + UnicodeString text; + static const char fgClassID; +}; +const char SCharacterIterator::fgClassID=0; + #define LENGTHOF(array) (sizeof(array)/sizeof((array)[0])) CharIterTest::CharIterTest() { } - void CharIterTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ ) { if (exec) logln("TestSuite LocaleTest: "); @@ -32,12 +149,45 @@ void CharIterTest::runIndexedTest( int32_t index, UBool exec, const char* &name, case 2: name = "TestIteration"; if (exec) TestIteration(); break; case 3: name = "TestIterationUChar32"; if (exec) TestIterationUChar32(); break; case 4: name = "TestUCharIterator"; if (exec) TestUCharIterator(); break; - case 5: name = "TestCharIteratorSubClasses"; if (exec) TestCharIteratorSubClasses(); break; - + case 5: name = "TestCoverage"; if(exec) TestCoverage(); break; + case 6: name = "TestCharIteratorSubClasses"; if (exec) TestCharIteratorSubClasses(); break; default: name = ""; break; //needed to end loop } } +void CharIterTest::TestCoverage(){ + UnicodeString testText("Now is the time for all good men to come to the aid of their country."); + UnicodeString testText2("\\ud800\\udc01deadbeef"); + testText2 = testText2.unescape(); + SCharacterIterator* test = new SCharacterIterator(testText); + if(test->firstPostInc()!= 0x004E){ + errln("Failed: firstPostInc() failed"); + } + if(test->getIndex()!=1){ + errln("Failed: getIndex()."); + } + if(test->getLength()!=testText.length()){ + errln("Failed: getLength()"); + } + test->setToStart(); + if(test->getIndex()!=0){ + errln("Failed: setToStart()."); + } + test->setToEnd(); + if(test->getIndex()!=testText.length()){ + errln("Failed: setToEnd()."); + } + if(test->startIndex() != 0){ + errln("Failed: startIndex()"); + } + test->setText(testText2); + if(test->first32PostInc()!= testText2.char32At(0)){ + errln("Failed: first32PostInc() failed"); + } + + delete test; + +} void CharIterTest::TestConstructionAndEquality() { UnicodeString testText("Now is the time for all good men to come to the aid of their country."); UnicodeString testText2("Don't bother using this string."); diff --git a/icu4c/source/test/intltest/citrtest.h b/icu4c/source/test/intltest/citrtest.h index 4faf2bf2004..09521c76605 100644 --- a/icu4c/source/test/intltest/citrtest.h +++ b/icu4c/source/test/intltest/citrtest.h @@ -38,7 +38,7 @@ public: void TestUCharIterator(); void TestUCharIterator(UCharIterator *iter, CharacterIterator &ci, const char *moves, const char *which); - + void TestCoverage(); void TestCharIteratorSubClasses(); }; diff --git a/icu4c/source/test/intltest/rbbiapts.cpp b/icu4c/source/test/intltest/rbbiapts.cpp index 8031612d431..efd2eb18243 100644 --- a/icu4c/source/test/intltest/rbbiapts.cpp +++ b/icu4c/source/test/intltest/rbbiapts.cpp @@ -137,6 +137,20 @@ void RBBIAPITest::TestCloneEquals() delete biequal; } +void RBBIAPITest::TestBoilerPlate() +{ + UErrorCode status = U_ZERO_ERROR; + BreakIterator* a = BreakIterator::createLineInstance(Locale("hi"), status); + BreakIterator* b = BreakIterator::createLineInstance(Locale("hi_IN"),status); + if(*a!=*b){ + errln("Failed: boilerplate method operator!= does not return correct results"); + } + BreakIterator* c = BreakIterator::createLineInstance(Locale("th"),status); + if(*c==*a){ + errln("Failed: boilerplate method opertator== does not return correct results"); + } +} + void RBBIAPITest::TestgetRules() { UErrorCode status=U_ZERO_ERROR; diff --git a/icu4c/source/test/intltest/rbbiapts.h b/icu4c/source/test/intltest/rbbiapts.h index 526c4b8834e..249084b2e7e 100644 --- a/icu4c/source/test/intltest/rbbiapts.h +++ b/icu4c/source/test/intltest/rbbiapts.h @@ -78,6 +78,8 @@ public: void TestBug2190(); + void TestBoilerPlate(); + void TestRegistration(); /** diff --git a/icu4c/source/test/intltest/tstnorm.cpp b/icu4c/source/test/intltest/tstnorm.cpp index 693cc510f62..39e7070308e 100644 --- a/icu4c/source/test/intltest/tstnorm.cpp +++ b/icu4c/source/test/intltest/tstnorm.cpp @@ -1108,9 +1108,10 @@ BasicNormalizerTest::TestCompare() { "\\u00cc", "\\u0069\\u0300", - + "a\\u0360\\u0345\\u0360\\u0345b", + "a\\u0345\\u0360\\u0345\\u0360b", // empty string - // 42 + // 44 "" };