From 107b1a15d0879cb0e84475258a6ad1dbc1749f62 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 14 Jun 2007 19:03:30 +0000 Subject: [PATCH] ICU-5410 We shouldn't export functions just to do code coverage. X-SVN-Rev: 21734 --- icu4c/source/i18n/funcrepl.h | 7 ++----- icu4c/source/i18n/quant.h | 5 +++-- icu4c/source/test/intltest/uobjtest.cpp | 26 ++++++------------------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/icu4c/source/i18n/funcrepl.h b/icu4c/source/i18n/funcrepl.h index af6a3fc405f..f58d613bb5a 100644 --- a/icu4c/source/i18n/funcrepl.h +++ b/icu4c/source/i18n/funcrepl.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2002-2004, International Business Machines Corporation +* Copyright (c) 2002-2007, International Business Machines Corporation * and others. All Rights Reserved. ********************************************************************** * Date Name Description @@ -28,12 +28,9 @@ class Transliterator; * UnicodeReplacer object. That is, this replacer wraps another * replacer with a transliterator. * - * Added U_I18N_API to make the definition of a global operator delete work. - * See Jitterbug 2581. markus 2002dec17 - * * @author Alan Liu */ -class U_I18N_API FunctionReplacer : public UnicodeFunctor, public UnicodeReplacer { +class FunctionReplacer : public UnicodeFunctor, public UnicodeReplacer { private: diff --git a/icu4c/source/i18n/quant.h b/icu4c/source/i18n/quant.h index e10fb99e3c2..79388953172 100644 --- a/icu4c/source/i18n/quant.h +++ b/icu4c/source/i18n/quant.h @@ -1,5 +1,6 @@ /* - * Copyright (C) 2001-2006, International Business Machines Corporation + ********************************************************************** + * Copyright (C) 2001-2007, International Business Machines Corporation * and others. All Rights Reserved. ********************************************************************** * Date Name Description @@ -18,7 +19,7 @@ U_NAMESPACE_BEGIN -class U_I18N_API Quantifier : public UnicodeFunctor, public UnicodeMatcher { +class Quantifier : public UnicodeFunctor, public UnicodeMatcher { public: diff --git a/icu4c/source/test/intltest/uobjtest.cpp b/icu4c/source/test/intltest/uobjtest.cpp index 7bad9cb8c12..de092c0ea69 100644 --- a/icu4c/source/test/intltest/uobjtest.cpp +++ b/icu4c/source/test/intltest/uobjtest.cpp @@ -227,11 +227,6 @@ void UObjectTest::testIDs() #endif - - //TESTCLASSID_DEFAULT(AbbreviatedUnicodeSetIterator); - //TESTCLASSID_DEFAULT(AnonymousStringFactory); - - #if !UCONFIG_NO_NORMALIZATION TESTCLASSID_FACTORY(CanonicalIterator, new CanonicalIterator(UnicodeString("abc"), status)); #endif @@ -275,12 +270,9 @@ void UObjectTest::testIDs() //TESTCLASSID_FACTORY(DictionaryBasedBreakIterator, BreakIterator::createLineInstance("th",status)); #endif - //TESTCLASSID_DEFAULT(EscapeTransliterator); - //TESTCLASSID_DEFAULT(GregorianCalendar); #if !UCONFIG_NO_TRANSLITERATION - TESTCLASSID_TRANSLIT(AnyTransliterator, "Any-Latin"); TESTCLASSID_TRANSLIT(CompoundTransliterator, "Latin-Greek"); TESTCLASSID_TRANSLIT(EscapeTransliterator, "Any-Hex"); @@ -295,8 +287,14 @@ void UObjectTest::testIDs() TESTCLASSID_TRANSLIT(UnicodeNameTransliterator, "Any-Name"); TESTCLASSID_TRANSLIT(UppercaseTransliterator, "Upper"); TESTCLASSID_CTOR(CaseMapTransliterator, (UnicodeString(), NULL)); + TESTCLASSID_ABSTRACT(Transliterator); + +#if UOBJTEST_TEST_INTERNALS TESTCLASSID_CTOR(Quantifier, (NULL, 0, 0)); TESTCLASSID_CTOR(FunctionReplacer, (NULL,NULL)); + TESTCLASSID_CTOR(StringMatcher, (UnicodeString("x"), 0,0,0,TransliterationRuleData(status))); + TESTCLASSID_CTOR(StringReplacer,(UnicodeString(),new TransliterationRuleData(status))); +#endif #endif TESTCLASSID_FACTORY(Locale, new Locale("123")); @@ -307,7 +305,6 @@ void UObjectTest::testIDs() #if !UCONFIG_NO_TRANSLITERATION TESTCLASSID_DEFAULT(ParsePosition); - //TESTCLASSID_DEFAULT(Quantifier); #endif @@ -324,7 +321,6 @@ void UObjectTest::testIDs() //TESTCLASSID_DEFAULT(StringReplacer); //TESTCLASSID_DEFAULT(StringSearch); - //TESTCLASSID_DEFAULT(TempSearch); //TESTCLASSID_DEFAULT(TestMultipleKeyStringFactory); //TESTCLASSID_DEFAULT(TestReplaceable); @@ -332,16 +328,6 @@ void UObjectTest::testIDs() TESTCLASSID_ABSTRACT(TimeZone); TESTCLASSID_FACTORY(OlsonTimeZone, TimeZone::createTimeZone(UnicodeString("America/Los_Angeles"))); #endif - -#if !UCONFIG_NO_TRANSLITERATION - TESTCLASSID_FACTORY(TitlecaseTransliterator, Transliterator::createInstance(UnicodeString("Any-Title"), UTRANS_FORWARD, parseError, status)); - TESTCLASSID_ABSTRACT(Transliterator); - -#if UOBJTEST_TEST_INTERNALS - TESTCLASSID_CTOR(StringMatcher, (UnicodeString("x"), 0,0,0,TransliterationRuleData(status))); - TESTCLASSID_CTOR(StringReplacer,(UnicodeString(),new TransliterationRuleData(status))); -#endif -#endif TESTCLASSID_DEFAULT(UnicodeString); TESTCLASSID_CTOR(UnicodeSet, (0, 1));