[Libreoffice-commits] core.git: vcl/qa

Stephan Bergmann sbergman at redhat.com
Tue Dec 2 04:57:26 PST 2014


 vcl/qa/cppunit/outdev.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 005748cb83554d4459b0f2d93bb39aa87c96c53d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 2 13:56:56 2014 +0100

    CPPUNIT_ASSERT_EQUAL
    
    Change-Id: I42f9d5532da031d6d979b874a3efc49529418d4c

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 4ae3470..992ceea 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -63,10 +63,10 @@ void VclOutdevTest::testVirtualDevice()
 
     // Gotcha: y and x swap for BitmapReadAccess: deep joy.
     Bitmap::ScopedReadAccess pAcc(aBmp);
-    CPPUNIT_ASSERT(pAcc->GetPixel(0,0) == Color(COL_WHITE));
-    CPPUNIT_ASSERT(pAcc->GetPixel(2,1) == Color(COL_GREEN));
-    CPPUNIT_ASSERT(pAcc->GetPixel(30,31) == Color(COL_RED));
-    CPPUNIT_ASSERT(pAcc->GetPixel(31,30) == Color(COL_WHITE));
+    CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(0,0)).GetColor());
+    CPPUNIT_ASSERT_EQUAL(COL_GREEN, Color(pAcc->GetPixel(2,1)).GetColor());
+    CPPUNIT_ASSERT_EQUAL(COL_RED, Color(pAcc->GetPixel(30,31)).GetColor());
+    CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(31,30)).GetColor());
 
 #if 0
     vcl::Window* pWin = new WorkWindow( (vcl::Window *)NULL );


More information about the Libreoffice-commits mailing list