solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Simplify wxSize unit test further by comparing wxSizes directly

Browse source 
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.
This commit is contained in:
Vadim Zeitlin 2021-11-20 22:01:31 +01:00
parent a18e00379e
commit 9941531efc
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/geometry/size.cpp
View file

@ -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 );
}