organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-11689 add assertEquals(double..)

Browse source 
X-SVN-Rev: 37705
This commit is contained in:
Steven R. Loomis 2015-07-30 22:45:39 +00:00
parent f70eb29726
commit 5816851466
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4c/source/test/intltest/intltest.cpp
View file

@ -1931,6 +1931,24 @@ UBool IntlTest::assertEquals(const char* message,
return TRUE;
}
UBool IntlTest::assertEquals(const char* message,
double expected,
double actual) {
if (expected != actual) {
errln((UnicodeString)"FAIL: " + message + "; got " +
actual +
"; expected " + expected);
return FALSE;
}
#ifdef VERBOSE_ASSERTIONS
else {
logln((UnicodeString)"Ok: " + message + "; got " + actual);
}
#endif
return TRUE;
}
UBool IntlTest::assertEquals(const char* message,
UBool expected,
UBool actual) {

1
icu4c/source/test/intltest/intltest.h
View file

@ -275,6 +275,7 @@ protected:
UBool actual);
UBool assertEquals(const char* message, int32_t expected, int32_t actual);
UBool assertEquals(const char* message, int64_t expected, int64_t actual);
UBool assertEquals(const char* message, double expected, double actual);
#if !UCONFIG_NO_FORMATTING
UBool assertEquals(const char* message, const Formattable& expected,
const Formattable& actual, UBool possibleDataError=FALSE);

12
icu4c/source/test/intltest/numrgts.cpp
View file

@ -1,5 +1,5 @@
/***********************************************************************
* Copyright (c) 1997-2014, International Business Machines Corporation
* Copyright (c) 1997-2015, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
@ -2710,6 +2710,12 @@ void NumberFormatRegressionTest::TestJ691(void) {
if ((expr)==FALSE) {\
errln("File %s, line %d: Assertion Failed: " #expr "\n", __FILE__, __LINE__);\
}
#define TEST_ASSERT_EQUALS(x,y) \
{ \
char _msg[100]; \
sprintf (_msg,"File %s, line %d: Assertion Failed: " #x "==" #y "\n", __FILE__, __LINE__); \
assertEquals((const char*)_msg, x,y); \
}
// Ticket 8199: Parse failure for numbers in the range of 1E10 - 1E18
@ -2827,8 +2833,8 @@ void NumberFormatRegressionTest::Test8199(void) {
nf->parse(numStr, val, status); // the ones digit, putting it up to ...994
TEST_CHECK_STATUS(status);
TEST_ASSERT(Formattable::kDouble == val.getType());
TEST_ASSERT(9007199254740993LL == val.getInt64(status));
TEST_ASSERT(9007199254740994.0 == val.getDouble(status));
TEST_ASSERT_EQUALS((int64_t)9007199254740993LL,val.getInt64(status));
TEST_ASSERT_EQUALS((double)9007199254740994.0,(double)val.getDouble(status));
TEST_CHECK_STATUS(status);
delete nf;