From 9941531efcf20477bbd4ccf6f82bf9a377b8171e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Nov 2021 22:01:31 +0100
Subject: [PATCH] Simplify wxSize unit test further by comparing wxSizes
 directly

This is shorter and more clear than comparing width and height
independently and results in just as informative messages in case of
test failure if asserthelper.h is included.
---
 tests/geometry/size.cpp | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/tests/geometry/size.cpp b/tests/geometry/size.cpp
index d29b4b19b9..a84514bb2c 100644
--- a/tests/geometry/size.cpp
+++ b/tests/geometry/size.cpp
@@ -17,6 +17,8 @@
     #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
+#include "asserthelper.h"
+
 TEST_CASE("wxSize::Operators", "[size]")
 {
     wxSize s1(1,2);
@@ -24,33 +26,26 @@ TEST_CASE("wxSize::Operators", "[size]")
     wxSize s3;
 
     s3 = s1 + s2;
-    CHECK( s3.GetWidth()==4 );
-    CHECK( s3.GetHeight()==6 );
+    CHECK( s3 == wxSize(4, 6) );
     s3 = s2 - s1;
-    CHECK( s3.GetWidth()==2 );
-    CHECK( s3.GetHeight()==2 );
+    CHECK( s3 == wxSize(2, 2) );
     s3 = s1 * 2;
-    CHECK( s3.GetWidth()==2 );
-    CHECK( s3.GetHeight()==4 );
+    CHECK( s3 == wxSize(2, 4) );
     s3 = 2 * s1;
-    CHECK( s3.GetWidth()==2 );
-    CHECK( s3.GetHeight()==4 );
+    CHECK( s3 == wxSize(2, 4) );
     s3 = s3 / 2;
-    CHECK( s3.GetWidth()==1 );
-    CHECK( s3.GetHeight()==2 );
+    CHECK( s3 == wxSize(1, 2) );
 
     s3 = s2;
     CHECK( s3 != s1 );
     s3 = s1;
     CHECK( s3 == s1 );
     s3 += s2;
-    CHECK( s3.GetWidth()==4 );
-    CHECK( s3.GetHeight()==6 );
+    CHECK( s3 == wxSize(4, 6) );
     s3 -= s2;
     CHECK( s3 == s1 );
     s3 *= 2;
-    CHECK( s3.GetWidth()==2 );
-    CHECK( s3.GetHeight()==4 );
+    CHECK( s3 == wxSize(2, 4) );
     s3 /= 2;
     CHECK( s3 == s1 );
 }