From a91cb5c344e0f4698c097fe12cf47b4ee08b703d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 22 Feb 2021 11:55:32 +0100
Subject: [PATCH] Use CHECK_FALSE in wxNumberFormatter unit tests

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.
---
 tests/strings/numformatter.cpp | 41 +++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/tests/strings/numformatter.cpp b/tests/strings/numformatter.cpp
index b9445190dc..77c65c05e8 100644
--- a/tests/strings/numformatter.cpp
+++ b/tests/strings/numformatter.cpp
@@ -167,9 +167,13 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongFromString", "[numform
     );
 
     long l;
-    CHECK( !wxNumberFormatter::FromString("", &l) );
-    CHECK( !wxNumberFormatter::FromString("foo", &l) );
-    CHECK( !wxNumberFormatter::FromString("1.234", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("foo", &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( l == 123 );
@@ -188,6 +192,11 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongFromString", "[numform
 
     CHECK( wxNumberFormatter::FromString("1,234,567", &l) );
     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
@@ -203,10 +212,10 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongLongFromString", "[num
     );
 
     wxLongLong_t l;
-    CHECK( !wxNumberFormatter::FromString("", &l) );
-    CHECK( !wxNumberFormatter::FromString("foo", &l) );
-    CHECK( !wxNumberFormatter::FromString("1.234", &l) );
-    CHECK( !wxNumberFormatter::FromString("-", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("foo", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("1.234", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("-", &l) );
 
     CHECK( wxNumberFormatter::FromString("0", &l) );
     CHECK( l == 0 );
@@ -235,7 +244,7 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongLongFromString", "[num
     CHECK( wxNumberFormatter::FromString("9223372036854775807", &l) );
     CHECK( l == wxINT64_MAX );
 
-    CHECK( !wxNumberFormatter::FromString("9223372036854775808", &l) );
+    CHECK_FALSE( wxNumberFormatter::FromString("9223372036854775808", &l) );
 }
 
 #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
@@ -246,11 +255,11 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::ULongLongFromString", "[nu
         return;
 
     wxULongLong_t u;
-    CHECK( !wxNumberFormatter::FromString("", &u) );
-    CHECK( !wxNumberFormatter::FromString("bar", &u) );
-    CHECK( !wxNumberFormatter::FromString("1.234", &u) );
-    CHECK( !wxNumberFormatter::FromString("-2", &u) );
-    CHECK( !wxNumberFormatter::FromString("-", &u) );
+    CHECK_FALSE( wxNumberFormatter::FromString("", &u) );
+    CHECK_FALSE( wxNumberFormatter::FromString("bar", &u) );
+    CHECK_FALSE( wxNumberFormatter::FromString("1.234", &u) );
+    CHECK_FALSE( wxNumberFormatter::FromString("-2", &u) );
+    CHECK_FALSE( wxNumberFormatter::FromString("-", &u) );
 
     CHECK( wxNumberFormatter::FromString("0", &u) );
     CHECK( u == 0 );
@@ -282,7 +291,7 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::ULongLongFromString", "[nu
     CHECK( wxNumberFormatter::FromString("18446744073709551615", &u) );
     CHECK( u == wxUINT64_MAX );
 
-    CHECK( !wxNumberFormatter::FromString("18446744073709551616", &u) );
+    CHECK_FALSE( wxNumberFormatter::FromString("18446744073709551616", &u) );
 }
 
 TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleFromString", "[numformatter]")
@@ -296,8 +305,8 @@ TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleFromString", "[numfo
     );
 
     double d;
-    CHECK( !wxNumberFormatter::FromString("", &d) );
-    CHECK( !wxNumberFormatter::FromString("bar", &d) );
+    CHECK_FALSE( wxNumberFormatter::FromString("", &d) );
+    CHECK_FALSE( wxNumberFormatter::FromString("bar", &d) );
 
     CHECK( wxNumberFormatter::FromString("123", &d) );
     CHECK( d == 123. );