diff --git a/icu4c/source/test/intltest/itspoof.cpp b/icu4c/source/test/intltest/itspoof.cpp index 7e317374b27..d4c6f50b8a2 100644 --- a/icu4c/source/test/intltest/itspoof.cpp +++ b/icu4c/source/test/intltest/itspoof.cpp @@ -639,7 +639,7 @@ void IntlTestSpoof::testMixedNumbers() { TEST_ASSERT_MSG((expectedSet.size() > 1) == mixedNumberFailure, msgBuf); const UnicodeSet* actualSet = UnicodeSet::fromUSet(uspoof_getCheckResultNumerics(checkResult, &status)); TEST_ASSERT_MSG(expectedSet == *actualSet, msgBuf); - TEST_TEARDOWN + TEST_TEARDOWN; } } diff --git a/icu4c/source/test/intltest/msfmrgts.cpp b/icu4c/source/test/intltest/msfmrgts.cpp index c35e85d4816..1b83b10876d 100644 --- a/icu4c/source/test/intltest/msfmrgts.cpp +++ b/icu4c/source/test/intltest/msfmrgts.cpp @@ -32,29 +32,29 @@ void MessageFormatRegressionTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ ) { TESTCASE_AUTO_BEGIN; - TESTCASE_AUTO(Test4074764) + TESTCASE_AUTO(Test4074764); //TESTCASE_AUTO(Test4058973) -- disabled/obsolete in ICU 4.8 - TESTCASE_AUTO(Test4031438) - TESTCASE_AUTO(Test4052223) - TESTCASE_AUTO(Test4104976) - TESTCASE_AUTO(Test4106659) - TESTCASE_AUTO(Test4106660) - TESTCASE_AUTO(Test4111739) - TESTCASE_AUTO(Test4114743) - TESTCASE_AUTO(Test4116444) - TESTCASE_AUTO(Test4114739) - TESTCASE_AUTO(Test4113018) - TESTCASE_AUTO(Test4106661) - TESTCASE_AUTO(Test4094906) - TESTCASE_AUTO(Test4118592) - TESTCASE_AUTO(Test4118594) - TESTCASE_AUTO(Test4105380) - TESTCASE_AUTO(Test4120552) - TESTCASE_AUTO(Test4142938) - TESTCASE_AUTO(TestChoicePatternQuote) - TESTCASE_AUTO(Test4112104) - TESTCASE_AUTO(TestICU12584) - TESTCASE_AUTO(TestAPI) + TESTCASE_AUTO(Test4031438); + TESTCASE_AUTO(Test4052223); + TESTCASE_AUTO(Test4104976); + TESTCASE_AUTO(Test4106659); + TESTCASE_AUTO(Test4106660); + TESTCASE_AUTO(Test4111739); + TESTCASE_AUTO(Test4114743); + TESTCASE_AUTO(Test4116444); + TESTCASE_AUTO(Test4114739); + TESTCASE_AUTO(Test4113018); + TESTCASE_AUTO(Test4106661); + TESTCASE_AUTO(Test4094906); + TESTCASE_AUTO(Test4118592); + TESTCASE_AUTO(Test4118594); + TESTCASE_AUTO(Test4105380); + TESTCASE_AUTO(Test4120552); + TESTCASE_AUTO(Test4142938); + TESTCASE_AUTO(TestChoicePatternQuote); + TESTCASE_AUTO(Test4112104); + TESTCASE_AUTO(TestICU12584); + TESTCASE_AUTO(TestAPI); TESTCASE_AUTO_END; } diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index 9c6e0840a7d..5ae7c3de80e 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -7004,7 +7004,7 @@ void NumberFormatTest::TestExplicitParents() { void NumberFormatTest::TestAvailableNumberingSystems() { IcuTestErrorCode status(*this, "TestAvailableNumberingSystems"); StringEnumeration *availableNumberingSystems = NumberingSystem::getAvailableNames(status); - CHECK_DATA(status, "NumberingSystem::getAvailableNames()") + CHECK_DATA(status, "NumberingSystem::getAvailableNames()"); int32_t nsCount = availableNumberingSystems->count(status); if ( nsCount < 74 ) { @@ -7474,7 +7474,7 @@ void NumberFormatTest::TestSignificantDigits(void) { Locale locale("en_US"); LocalPointer numberFormat(static_cast( NumberFormat::createInstance(locale, status))); - CHECK_DATA(status,"NumberFormat::createInstance") + CHECK_DATA(status,"NumberFormat::createInstance"); numberFormat->setSignificantDigitsUsed(TRUE); numberFormat->setMinimumSignificantDigits(3); @@ -7527,7 +7527,7 @@ void NumberFormatTest::TestShowZero() { Locale locale("en_US"); LocalPointer numberFormat(static_cast( NumberFormat::createInstance(locale, status))); - CHECK_DATA(status, "NumberFormat::createInstance") + CHECK_DATA(status, "NumberFormat::createInstance"); numberFormat->setSignificantDigitsUsed(TRUE); numberFormat->setMaximumSignificantDigits(3); @@ -7578,7 +7578,7 @@ void NumberFormatTest::TestBug9936() { void NumberFormatTest::TestParseNegativeWithFaLocale() { UErrorCode status = U_ZERO_ERROR; DecimalFormat *test = (DecimalFormat *) NumberFormat::createInstance("fa", status); - CHECK_DATA(status, "NumberFormat::createInstance") + CHECK_DATA(status, "NumberFormat::createInstance"); test->setLenient(TRUE); Formattable af; ParsePosition ppos; @@ -7594,7 +7594,7 @@ void NumberFormatTest::TestParseNegativeWithFaLocale() { void NumberFormatTest::TestParseNegativeWithAlternateMinusSign() { UErrorCode status = U_ZERO_ERROR; DecimalFormat *test = (DecimalFormat *) NumberFormat::createInstance("en", status); - CHECK_DATA(status, "NumberFormat::createInstance") + CHECK_DATA(status, "NumberFormat::createInstance"); test->setLenient(TRUE); Formattable af; ParsePosition ppos; diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp index 7cdea8a7ccf..8b5ecd6f8ec 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -173,7 +173,7 @@ void SSearchTest::searchTest() // This assert is a little deceiving in that strength can be // any of the allowed values, not just TERTIARY, but it will // do the job of getting the error output. - TEST_ASSERT(*strength=="TERTIARY") + TEST_ASSERT(*strength=="TERTIARY"); } // diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp index 0f4145b1d36..98e04869d85 100644 --- a/icu4c/source/test/intltest/tsmthred.cpp +++ b/icu4c/source/test/intltest/tsmthred.cpp @@ -79,7 +79,7 @@ void MultithreadTest::runIndexedTest( int32_t index, UBool exec, TESTCASE_AUTO(Test20104); #endif /* #if !UCONFIG_NO_FORMATTING */ #endif /* #if !UCONFIG_NO_TRANSLITERATION */ - TESTCASE_AUTO_END + TESTCASE_AUTO_END; }