X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/232fdc630c42eb165f7659981043e794be03b3b7..830c06655b226cfe9fe55d57da8c948d1744107c:/tests/graphics/colour.cpp diff --git a/tests/graphics/colour.cpp b/tests/graphics/colour.cpp index 2f06919409..ae603a701d 100644 --- a/tests/graphics/colour.cpp +++ b/tests/graphics/colour.cpp @@ -20,6 +20,23 @@ #include "wx/colour.h" #include "asserthelper.h" +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +// Check the colour components, with and without alpha. +// +// NB: These are macros and not functions to have correct line numbers in case +// of failure. +#define ASSERT_EQUAL_RGB(c, r, g, b) \ + CPPUNIT_ASSERT_EQUAL( r, (int)c.Red() ); \ + CPPUNIT_ASSERT_EQUAL( g, (int)c.Green() ); \ + CPPUNIT_ASSERT_EQUAL( b, (int)c.Blue() ) + +#define ASSERT_EQUAL_RGBA(c, r, g, b, a) \ + ASSERT_EQUAL_RGB(c, r, g, b); \ + CPPUNIT_ASSERT_EQUAL( a, (int)c.Alpha() ) + // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -32,9 +49,11 @@ public: private: CPPUNIT_TEST_SUITE( ColourTestCase ); CPPUNIT_TEST( GetSetRGB ); + CPPUNIT_TEST( FromString ); CPPUNIT_TEST_SUITE_END(); void GetSetRGB(); + void FromString(); DECLARE_NO_COPY_CLASS(ColourTestCase) }; @@ -42,7 +61,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( ColourTestCase ); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ColourTestCase, "ColourTestCase" ); void ColourTestCase::GetSetRGB() @@ -63,12 +82,34 @@ void ColourTestCase::GetSetRGB() CPPUNIT_ASSERT_EQUAL( 0xdd, (int)c.Red() ); CPPUNIT_ASSERT_EQUAL( 0xcc, (int)c.Green() ); CPPUNIT_ASSERT_EQUAL( 0xbb, (int)c.Blue() ); + + // wxX11 doesn't support alpha at all currently. +#ifndef __WXX11__ CPPUNIT_ASSERT_EQUAL( 0xaa, (int)c.Alpha() ); +#endif // __WXX11__ // FIXME: at least under wxGTK wxColour ctor doesn't take alpha channel // into account: bug or feature? //CPPUNIT_ASSERT_EQUAL( wxColour(0xaabbccdd), c ); CPPUNIT_ASSERT_EQUAL( 0xbbccdd, c.GetRGB() ); +#ifndef __WXX11__ CPPUNIT_ASSERT_EQUAL( 0xaabbccdd, c.GetRGBA() ); +#endif // __WXX11__ +} + +void ColourTestCase::FromString() +{ + ASSERT_EQUAL_RGB( wxColour("rgb(11, 22, 33)"), 11, 22, 33 ); + ASSERT_EQUAL_RGBA( wxColour("rgba(11, 22, 33, 0.5)"), 11, 22, 33, 128 ); + ASSERT_EQUAL_RGBA( wxColour("rgba( 11, 22, 33, 0.5 )"), 11, 22, 33, 128 ); + + ASSERT_EQUAL_RGB( wxColour("#aabbcc"), 0xaa, 0xbb, 0xcc ); + + ASSERT_EQUAL_RGB( wxColour("red"), 0xff, 0, 0 ); + + wxColour col; + CPPUNIT_ASSERT( !wxFromString("rgb(1, 2)", &col) ); + CPPUNIT_ASSERT( !wxFromString("rgba(1, 2, 3.456)", &col) ); + CPPUNIT_ASSERT( !wxFromString("rgba(1, 2, 3.456, foo)", &col) ); }