Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CHECK_FALSE in wxNumberFormatter unit tests

Browse Source 
Just replace CHECK(!condition) with CHECK_FALSE(condition), this should
result in slightly more clear error messages.

Also make tests for long and long long more consistent.
This commit is contained in:
Vadim Zeitlin
2021-02-22 11:55:32 +01:00
parent cddc657505
commit a91cb5c344
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/strings/numformatter.cpp
View File

@@ -167,9 +167,13 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongFromString", "[numform
); );
long l; long l;
CHECK( !wxNumberFormatter::FromString("", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("", &l) );
CHECK( !wxNumberFormatter::FromString("foo", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("foo", &l) );
CHECK( !wxNumberFormatter::FromString("1.234", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("1.234", &l) );
CHECK_FALSE( wxNumberFormatter::FromString("-", &l) );
CHECK( wxNumberFormatter::FromString("0", &l) );
CHECK( l == 0 );
CHECK( wxNumberFormatter::FromString("123", &l) ); CHECK( wxNumberFormatter::FromString("123", &l) );
CHECK( l == 123 ); CHECK( l == 123 );
@@ -188,6 +192,11 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongFromString", "[numform
CHECK( wxNumberFormatter::FromString("1,234,567", &l) ); CHECK( wxNumberFormatter::FromString("1,234,567", &l) );
CHECK( l == 1234567 ); CHECK( l == 1234567 );
CHECK( wxNumberFormatter::FromString("-123", &l) );
CHECK( l == -123 );
CHECK_FALSE( wxNumberFormatter::FromString("9223372036854775808", &l) );
} }
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
@@ -203,10 +212,10 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongLongFromString", "[num
); );
wxLongLong_t l; wxLongLong_t l;
CHECK( !wxNumberFormatter::FromString("", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("", &l) );
CHECK( !wxNumberFormatter::FromString("foo", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("foo", &l) );
CHECK( !wxNumberFormatter::FromString("1.234", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("1.234", &l) );
CHECK( !wxNumberFormatter::FromString("-", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("-", &l) );
CHECK( wxNumberFormatter::FromString("0", &l) ); CHECK( wxNumberFormatter::FromString("0", &l) );
CHECK( l == 0 ); CHECK( l == 0 );
@@ -235,7 +244,7 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongLongFromString", "[num
CHECK( wxNumberFormatter::FromString("9223372036854775807", &l) ); CHECK( wxNumberFormatter::FromString("9223372036854775807", &l) );
CHECK( l == wxINT64_MAX ); CHECK( l == wxINT64_MAX );
CHECK( !wxNumberFormatter::FromString("9223372036854775808", &l) ); CHECK_FALSE( wxNumberFormatter::FromString("9223372036854775808", &l) );
} }
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
@@ -246,11 +255,11 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::ULongLongFromString", "[nu
return; return;
wxULongLong_t u; wxULongLong_t u;
CHECK( !wxNumberFormatter::FromString("", &u) ); CHECK_FALSE( wxNumberFormatter::FromString("", &u) );
CHECK( !wxNumberFormatter::FromString("bar", &u) ); CHECK_FALSE( wxNumberFormatter::FromString("bar", &u) );
CHECK( !wxNumberFormatter::FromString("1.234", &u) ); CHECK_FALSE( wxNumberFormatter::FromString("1.234", &u) );
CHECK( !wxNumberFormatter::FromString("-2", &u) ); CHECK_FALSE( wxNumberFormatter::FromString("-2", &u) );
CHECK( !wxNumberFormatter::FromString("-", &u) ); CHECK_FALSE( wxNumberFormatter::FromString("-", &u) );
CHECK( wxNumberFormatter::FromString("0", &u) ); CHECK( wxNumberFormatter::FromString("0", &u) );
CHECK( u == 0 ); CHECK( u == 0 );
@@ -282,7 +291,7 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::ULongLongFromString", "[nu
CHECK( wxNumberFormatter::FromString("18446744073709551615", &u) ); CHECK( wxNumberFormatter::FromString("18446744073709551615", &u) );
CHECK( u == wxUINT64_MAX ); CHECK( u == wxUINT64_MAX );
CHECK( !wxNumberFormatter::FromString("18446744073709551616", &u) ); CHECK_FALSE( wxNumberFormatter::FromString("18446744073709551616", &u) );
} }
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleFromString", "[numformatter]") TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleFromString", "[numformatter]")
@@ -296,8 +305,8 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleFromString", "[numfo
); );
double d; double d;
CHECK( !wxNumberFormatter::FromString("", &d) ); CHECK_FALSE( wxNumberFormatter::FromString("", &d) );
CHECK( !wxNumberFormatter::FromString("bar", &d) ); CHECK_FALSE( wxNumberFormatter::FromString("bar", &d) );
CHECK( wxNumberFormatter::FromString("123", &d) ); CHECK( wxNumberFormatter::FromString("123", &d) );
CHECK( d == 123. ); CHECK( d == 123. );