Migrate wxBitmap tests to Catch

This commit is contained in:
Artur Wieczorek
2019-09-19 00:37:47 +02:00
parent 919a4ec702
commit 5aac5ae562

View File

@@ -26,81 +26,57 @@
#endif // wxUSE_GRAPHICS_CONTEXT #endif // wxUSE_GRAPHICS_CONTEXT
#define ASSERT_EQUAL_RGB(c, r, g, b) \ #define ASSERT_EQUAL_RGB(c, r, g, b) \
CPPUNIT_ASSERT_EQUAL( r, (int)c.Red() ); \ REQUIRE( r == (int)c.Red() ); \
CPPUNIT_ASSERT_EQUAL( g, (int)c.Green() ); \ REQUIRE( g == (int)c.Green() ); \
CPPUNIT_ASSERT_EQUAL( b, (int)c.Blue() ) REQUIRE( b == (int)c.Blue() )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// test class // test class
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class BitmapTestCase : public CppUnit::TestCase TEST_CASE("BitmapTestCase::Mask", "[bitmap][mask]")
{ {
public: wxBitmap bmp(10, 10);
BitmapTestCase() { }
virtual void setUp() wxOVERRIDE;
virtual void tearDown() wxOVERRIDE;
private:
CPPUNIT_TEST_SUITE( BitmapTestCase );
CPPUNIT_TEST( Mask );
CPPUNIT_TEST( OverlappingBlit );
CPPUNIT_TEST_SUITE_END();
void Mask();
void OverlappingBlit();
wxBitmap m_bmp;
wxDECLARE_NO_COPY_CLASS(BitmapTestCase);
};
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( BitmapTestCase );
// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BitmapTestCase, "BitmapTestCase" );
void BitmapTestCase::setUp()
{ {
m_bmp.Create(10, 10); wxMemoryDC dc(bmp);
wxMemoryDC dc(m_bmp);;
dc.SetBackground(*wxWHITE); dc.SetBackground(*wxWHITE);
dc.Clear(); dc.Clear();
dc.SetBrush(*wxBLACK_BRUSH); dc.SetBrush(*wxBLACK_BRUSH);
dc.DrawRectangle(4, 4, 2, 2); dc.DrawRectangle(4, 4, 2, 2);
dc.SetPen(*wxRED_PEN); dc.SetPen(*wxRED_PEN);
dc.DrawLine(0, 0, 10, 10); dc.DrawLine(0, 0, 10, 10);
dc.DrawLine(10, 0, 0, 10); dc.DrawLine(10, 0, 0, 10);
} }
void BitmapTestCase::tearDown() wxMask *mask = new wxMask(bmp, *wxBLACK);
{ bmp.SetMask(mask);
m_bmp = wxNullBitmap; REQUIRE(bmp.GetMask() == mask);
}
void BitmapTestCase::Mask()
{
wxMask *mask = new wxMask(m_bmp, *wxBLACK);
m_bmp.SetMask(mask);
// copying masks should work // copying masks should work
wxMask *mask2 = NULL; wxMask *mask2 = NULL;
REQUIRE_NOTHROW(mask2 = new wxMask(*mask)); REQUIRE_NOTHROW(mask2 = new wxMask(*mask));
m_bmp.SetMask(mask2); bmp.SetMask(mask2);
REQUIRE(bmp.GetMask() == mask2);
} }
void BitmapTestCase::OverlappingBlit() TEST_CASE("BitmapTestCase::OverlappingBlit", "[bitmap][blit]")
{ {
m_bmp.SetMask( NULL ); wxBitmap bmp(10, 10);
{
wxMemoryDC dc(bmp);
dc.SetBackground(*wxWHITE);
dc.Clear();
dc.SetBrush(*wxBLACK_BRUSH);
dc.DrawRectangle(4, 4, 2, 2);
dc.SetPen(*wxRED_PEN);
dc.DrawLine(0, 0, 10, 10);
dc.DrawLine(10, 0, 0, 10);
}
REQUIRE(bmp.GetMask() == NULL);
// Clear to white. // Clear to white.
{ {
wxMemoryDC dc(m_bmp); wxMemoryDC dc(bmp);
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
wxGraphicsContext* gc = dc.GetGraphicsContext(); wxGraphicsContext* gc = dc.GetGraphicsContext();
if ( gc ) if ( gc )
@@ -123,10 +99,10 @@ void BitmapTestCase::OverlappingBlit()
} // Select the bitmap out of the memory DC before using it directly. } // Select the bitmap out of the memory DC before using it directly.
// Now, lines 0 and 1 should be red, lines 2++ should still be white. // Now, lines 0 and 1 should be red, lines 2++ should still be white.
if ( m_bmp.GetDepth() == 32 ) if ( bmp.GetDepth() == 32 )
{ {
wxAlphaPixelData npd( m_bmp ); wxAlphaPixelData npd( bmp );
CPPUNIT_ASSERT_MESSAGE( "Expected raw pixels to not be NULL", npd ); REQUIRE( npd );
wxAlphaPixelData::Iterator it( npd ); wxAlphaPixelData::Iterator it( npd );
ASSERT_EQUAL_RGB( it, 255, 0, 0 ); ASSERT_EQUAL_RGB( it, 255, 0, 0 );
@@ -139,14 +115,10 @@ void BitmapTestCase::OverlappingBlit()
} }
else else
{ {
wxNativePixelData npd( m_bmp ); wxNativePixelData npd( bmp );
REQUIRE( npd );
wxNativePixelData::Iterator it( npd ); wxNativePixelData::Iterator it( npd );
if ( !npd )
{
CPPUNIT_FAIL( "Raw access to bitmap data unavailable" );
}
else
{
ASSERT_EQUAL_RGB( it, 255, 0, 0 ); ASSERT_EQUAL_RGB( it, 255, 0, 0 );
it.OffsetY( npd, 1 ); it.OffsetY( npd, 1 );
ASSERT_EQUAL_RGB( it, 255, 0, 0 ); ASSERT_EQUAL_RGB( it, 255, 0, 0 );
@@ -156,6 +128,5 @@ void BitmapTestCase::OverlappingBlit()
ASSERT_EQUAL_RGB( it, 255, 255, 255 ); ASSERT_EQUAL_RGB( it, 255, 255, 255 );
} }
} }
}
#endif //wxHAS_RAW_BITMAP #endif //wxHAS_RAW_BITMAP