From 7510d87888e7e9b6587be865acb5f7659911a749 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 16 Dec 2002 19:51:39 +0000 Subject: [PATCH] ICU-2529 testClassID functions, fix subclasses X-SVN-Rev: 10684 --- icu4c/source/test/intltest/hxuntrts.cpp | 2 + icu4c/source/test/intltest/numrgts.cpp | 6 + icu4c/source/test/intltest/numrgts.h | 2 +- icu4c/source/test/intltest/transapi.cpp | 6 + icu4c/source/test/intltest/transtst.cpp | 3 + icu4c/source/test/intltest/ufltlgts.cpp | 5 +- icu4c/source/test/intltest/unhxtrts.cpp | 2 + icu4c/source/test/intltest/uobjtest.cpp | 185 ++++++++++++++++-------- 8 files changed, 151 insertions(+), 60 deletions(-) diff --git a/icu4c/source/test/intltest/hxuntrts.cpp b/icu4c/source/test/intltest/hxuntrts.cpp index 78157b2b4e9..6695186fd9c 100644 --- a/icu4c/source/test/intltest/hxuntrts.cpp +++ b/icu4c/source/test/intltest/hxuntrts.cpp @@ -58,7 +58,9 @@ void HexToUniTransliteratorTest::runIndexedTest( int32_t index, UBool exec, cons /** * Used by TestConstruction() and TestTransliterate. */ +uint32_t gTestHexFilterClassID = 0; class TestHexFilter : public UnicodeFilter { + virtual UClassID getDynamicClassID() const { return &gTestHexFilterClassID; } virtual UnicodeFunctor* clone() const { return new TestHexFilter(*this); } diff --git a/icu4c/source/test/intltest/numrgts.cpp b/icu4c/source/test/intltest/numrgts.cpp index 146ce6c396b..eed98a7b2e5 100644 --- a/icu4c/source/test/intltest/numrgts.cpp +++ b/icu4c/source/test/intltest/numrgts.cpp @@ -18,6 +18,12 @@ #include "unicode/resbund.h" #include "unicode/calendar.h" #include "unicode/datefmt.h" +int32_t gMyNumberFormatTestClassID; +UClassID MyNumberFormatTest::getDynamicClassID() const +{ + return (UClassID)&gMyNumberFormatTestClassID; +} + // ***************************************************************************** // class NumberFormatRegressionTest diff --git a/icu4c/source/test/intltest/numrgts.h b/icu4c/source/test/intltest/numrgts.h index 3b37ad829d1..4df2bb89923 100644 --- a/icu4c/source/test/intltest/numrgts.h +++ b/icu4c/source/test/intltest/numrgts.h @@ -99,6 +99,7 @@ class MyNumberFormatTest : public NumberFormat { public: + virtual UClassID getDynamicClassID(void) const; virtual UnicodeString& format( double number, UnicodeString& toAppendTo, @@ -147,7 +148,6 @@ public: } virtual Format* clone() const { return NULL; } - virtual UnicodeString& format(int32_t, UnicodeString& foo, FieldPosition&) const diff --git a/icu4c/source/test/intltest/transapi.cpp b/icu4c/source/test/intltest/transapi.cpp index befd714288a..e61d0ac0bc7 100644 --- a/icu4c/source/test/intltest/transapi.cpp +++ b/icu4c/source/test/intltest/transapi.cpp @@ -668,11 +668,15 @@ void TransliteratorAPITest::TestRegisterUnregister(){ } +int gTestFilter1ClassID = 0; +int gTestFilter2ClassID = 0; +int gTestFilter3ClassID = 0; /** * Used by TestFiltering(). */ class TestFilter1 : public UnicodeFilter { + UClassID getDynamicClassID()const { return &gTestFilter1ClassID; } virtual UnicodeFunctor* clone() const { return new TestFilter1(*this); } @@ -693,6 +697,7 @@ class TestFilter1 : public UnicodeFilter { virtual void addMatchSetTo(UnicodeSet& toUnionTo) const {} }; class TestFilter2 : public UnicodeFilter { + UClassID getDynamicClassID()const { return &gTestFilter2ClassID; } virtual UnicodeFunctor* clone() const { return new TestFilter2(*this); } @@ -713,6 +718,7 @@ class TestFilter2 : public UnicodeFilter { virtual void addMatchSetTo(UnicodeSet& toUnionTo) const {} }; class TestFilter3 : public UnicodeFilter { + UClassID getDynamicClassID()const { return &gTestFilter3ClassID; } virtual UnicodeFunctor* clone() const { return new TestFilter3(*this); } diff --git a/icu4c/source/test/intltest/transtst.cpp b/icu4c/source/test/intltest/transtst.cpp index e85eb2ad540..37fa3cbf2d8 100644 --- a/icu4c/source/test/intltest/transtst.cpp +++ b/icu4c/source/test/intltest/transtst.cpp @@ -606,6 +606,7 @@ void TransliteratorTest::TestCompoundHex(void) { delete b; } +int gTestFilterClassID = 0; /** * Used by TestFiltering(). */ @@ -625,6 +626,8 @@ class TestFilter : public UnicodeFilter { return FALSE; } virtual void addMatchSetTo(UnicodeSet& toUnionTo) const {} +public: + UClassID getDynamicClassID() const { return (UClassID)&gTestFilterClassID; } }; /** diff --git a/icu4c/source/test/intltest/ufltlgts.cpp b/icu4c/source/test/intltest/ufltlgts.cpp index 24c76074ce5..40e6ae13921 100644 --- a/icu4c/source/test/intltest/ufltlgts.cpp +++ b/icu4c/source/test/intltest/ufltlgts.cpp @@ -33,8 +33,9 @@ void UnicodeFilterLogicTest::runIndexedTest( int32_t index, UBool exec, const ch default: name = ""; break; /*needed to end loop*/ } } - +int32_t gFilter1ClassID; class Filter1: public UnicodeFilter{ + virtual UClassID getDynamicClassID() const { return (UClassID)&gFilter1ClassID; } virtual UnicodeFunctor* clone() const{ return new Filter1(*this); } @@ -54,7 +55,9 @@ class Filter1: public UnicodeFilter{ } virtual void addMatchSetTo(UnicodeSet& toUnionTo) const {} }; +uint32_t gFilter2ClassID = 0; class Filter2: public UnicodeFilter{ + virtual UClassID getDynamicClassID() const { return (UClassID)&gFilter2ClassID; } virtual UnicodeFunctor* clone() const{ return new Filter2(*this); } diff --git a/icu4c/source/test/intltest/unhxtrts.cpp b/icu4c/source/test/intltest/unhxtrts.cpp index 54ca770aa97..b3ce95d1430 100644 --- a/icu4c/source/test/intltest/unhxtrts.cpp +++ b/icu4c/source/test/intltest/unhxtrts.cpp @@ -71,7 +71,9 @@ static void pseudoHandleTransliterate(const Transliterator* t, /** * Used by TestConstruction() and TestTransliterate. */ +int32_t gTestUniFilterClassID; class TestUniFilter : public UnicodeFilter { + virtual UClassID getDynamicClassID() const { return &gTestUniFilterClassID; } virtual UnicodeFunctor* clone() const { return new TestUniFilter(*this); } diff --git a/icu4c/source/test/intltest/uobjtest.cpp b/icu4c/source/test/intltest/uobjtest.cpp index bb96909116f..b5c488f744b 100644 --- a/icu4c/source/test/intltest/uobjtest.cpp +++ b/icu4c/source/test/intltest/uobjtest.cpp @@ -7,11 +7,33 @@ #include "uobjtest.h" #include +/** + * + * Test for UObject, currently only the classID. + * + * Usage + * TESTCLASSID_ABSTRACT(Bar) + * -- Bar is expected to be abstract. Only the static ID will be tested. + * + * TESTCLASSID_DEFAULT(Foo) + * -- Foo will be default-constructed. + * + * TESTCLASSID_CTOR(Foo, (1, 2, 3, status)) + * -- Second argument is (parenthesized) constructor argument. + * Will be called as: new Foo ( 1, 2, 3, status) [status is tested] + * + * TESTCLASSID_FACTORY(Foo, fooCreateFunction(status) ) + * -- call fooCreateFunction. 'status' will be tested & reset + */ + + #define TESTCLASSID_FACTORY(c, f) { delete testClass(f, #c, #f, c ::getStaticClassID()); if(U_FAILURE(status)) { errln(UnicodeString(#c " - " #f " - got err status ") + UnicodeString(u_errorName(status))); status = U_ZERO_ERROR; } } +#define TESTCLASSID_TRANSLIT(c, t) { delete testClass(Transliterator::createInstance(UnicodeString(t), UTRANS_FORWARD,parseError,status), #c, "Transliterator: " #t, c ::getStaticClassID()); if(U_FAILURE(status)) { errln(UnicodeString(#c " - Transliterator: " #t " - got err status ") + UnicodeString(u_errorName(status))); status = U_ZERO_ERROR; } } +#define TESTCLASSID_CTOR(c, x) { delete testClass(new c x, #c, "new " #c #x, c ::getStaticClassID()); if(U_FAILURE(status)) { errln(UnicodeString(#c " - new " #x " - got err status ") + UnicodeString(u_errorName(status))); status = U_ZERO_ERROR; } } #define TESTCLASSID_DEFAULT(c) delete testClass(new c, #c, "new " #c , c::getStaticClassID()) #define TESTCLASSID_ABSTRACT(c) testClass(NULL, #c, NULL, c::getStaticClassID()) -#define MAX_CLASS_ID 100 +#define MAX_CLASS_ID 200 UClassID ids[MAX_CLASS_ID]; const char *ids_factory[MAX_CLASS_ID]; @@ -29,34 +51,36 @@ UObject *UObjectTest::testClass(UObject *obj, if(ids_count >= MAX_CLASS_ID) { char count[100]; sprintf(count, " (currently %d) ", MAX_CLASS_ID); - errln(what + "FAIL: Fatal: Ran out of IDs! Increase MAX_CLASS_ID." + UnicodeString(count)); + errln("FAIL: Fatal: Ran out of IDs! Increase MAX_CLASS_ID." + UnicodeString(count) + what); return obj; } + if(obj) { + dynamicID = obj->getDynamicClassID(); + } + { char tmp[500]; - sprintf(tmp, " [static=0x%p] ", staticID); + sprintf(tmp, " [static=%p, dynamic=%p] ", staticID, dynamicID); logln(what + tmp); } if(staticID == NULL) { - errln( what + "FAIL: staticID == NULL!"); + errln( "FAIL: staticID == NULL!" + what); } if(factory != NULL) { /* NULL factory means: abstract */ if(!obj) { - errln( what + "FAIL: ==NULL!"); + errln( "FAIL: ==NULL!" + what); return obj; } - - dynamicID = obj->getDynamicClassID(); - + if(dynamicID == NULL) { - errln(what + "FAIL: dynamicID == NULL!"); + errln("FAIL: dynamicID == NULL!" + what); } if(dynamicID != staticID) { - errln(what + "FAIL: dynamicID != staticID!"); + errln("FAIL: dynamicID != staticID!" + what ); } } @@ -68,10 +92,10 @@ UObject *UObjectTest::testClass(UObject *obj, for(i=0;ib;"), status)); + TESTCLASSID_TRANSLIT(TitlecaseTransliterator, "Title"); + TESTCLASSID_TRANSLIT(UnescapeTransliterator, "Hex-Any"); + TESTCLASSID_TRANSLIT(UnicodeNameTransliterator, "Any-Name"); + TESTCLASSID_TRANSLIT(UppercaseTransliterator, "Upper"); #endif - //TESTCLASSID_DEFAULT(ICUResourceBundleFactory); - - //TESTCLASSID_DEFAULT(Key); // does ont exist? - TESTCLASSID_FACTORY(Locale, new Locale("123")); - TESTCLASSID_ABSTRACT(LocaleKey); - //TESTCLASSID_DEFAULT(LocaleKeyFactory); - //TESTCLASSID_DEFAULT(LowercaseTransliterator); - //TESTCLASSID_DEFAULT(NFSubstitution); - //TESTCLASSID_DEFAULT(NameUnicodeTransliterator); - //TESTCLASSID_DEFAULT(NormalizationTransliterator); //TESTCLASSID_DEFAULT(Normalizer); - //TESTCLASSID_DEFAULT(NullTransliterator); -#if !UCONFIG_NO_FORMATTING - TESTCLASSID_ABSTRACT(NumberFormat); -#endif + //TESTCLASSID_DEFAULT(NumeratorSubstitution); #if !UCONFIG_NO_TRANSLITERATION TESTCLASSID_DEFAULT(ParsePosition); + //TESTCLASSID_DEFAULT(Quantifier); #endif - //TESTCLASSID_DEFAULT(Quantifier); - + +// NO_REG_EX //TESTCLASSID_DEFAULT(RegexCompile); //TESTCLASSID_DEFAULT(RegexMatcher); //TESTCLASSID_DEFAULT(RegexPattern); - //TESTCLASSID_DEFAULT(RemoveTransliterator); + //TESTCLASSID_DEFAULT(ReplaceableGlue); TESTCLASSID_FACTORY(ResourceBundle, new ResourceBundle(UnicodeString(), status) ); //TESTCLASSID_DEFAULT(RuleBasedTransliterator); - //TESTCLASSID_DEFAULT(SimpleFactory); //TESTCLASSID_DEFAULT(SimpleFwdCharIterator); - //TESTCLASSID_DEFAULT(SimpleLocaleKeyFactory); - //TESTCLASSID_DEFAULT(StringMatcher); //TESTCLASSID_DEFAULT(StringReplacer); //TESTCLASSID_DEFAULT(StringSearch); @@ -257,11 +308,29 @@ void UObjectTest::testIDs() #if !UCONFIG_NO_TRANSLITERATION TESTCLASSID_FACTORY(TitlecaseTransliterator, Transliterator::createInstance(UnicodeString("Any-Title"), UTRANS_FORWARD, parseError, status)); TESTCLASSID_ABSTRACT(Transliterator); + TESTCLASSID_CTOR(StringMatcher, (UnicodeString("x"), 0,0,0,TransliterationRuleData(status))); + TESTCLASSID_CTOR(StringReplacer,(UnicodeString(),new TransliterationRuleData(status))); + #endif TESTCLASSID_DEFAULT(UnicodeString); - //TESTCLASSID_DEFAULT(UStack); - //TESTCLASSID_DEFAULT(UVector); + TESTCLASSID_CTOR(UnicodeSet, (0, 1)); + TESTCLASSID_ABSTRACT(UnicodeFilter); + TESTCLASSID_ABSTRACT(UnicodeFunctor); + TESTCLASSID_CTOR(UnicodeSetIterator,(UnicodeSet(0,1))); + TESTCLASSID_CTOR(UStack, (status)); + TESTCLASSID_CTOR(UVector, (status)); + + +#if !UCONFIG_NO_SERVICE + TESTCLASSID_CTOR(SimpleFactory, (NULL, UnicodeString("foo"))); + TESTCLASSID_DEFAULT(EventListener); + TESTCLASSID_DEFAULT(ICUResourceBundleFactory); + //TESTCLASSID_DEFAULT(Key); // does ont exist? + TESTCLASSID_CTOR(LocaleKey, (UnicodeString("baz"), UnicodeString("bat"), NULL, 92)); + TESTCLASSID_CTOR(LocaleKeyFactory, (42)); + TESTCLASSID_CTOR(SimpleLocaleKeyFactory, (NULL, UnicodeString("bar"), 8, 12) ); +#endif #if 0 int i;