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

Stephan Bergmann sbergman at redhat.com
Wed Oct 16 05:43:48 PDT 2013


 vcl/qa/cppunit/canvasbitmaptest.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ca216af0fae6fa178c8d1debaabdeb2246bc8e63
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 16 14:43:18 2013 +0200

    Improve test
    
    Change-Id: If0983696bf9a44bda6edeb746c121446106a95c5

diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index ebbedb0..c3e8cac 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -177,10 +177,15 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
     if( nOriginalDepth > 8 )
     {
         const Color aCol(COL_GREEN);
-        CPPUNIT_ASSERT_MESSAGE( "Sixth pixel is not green",
-                                pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) &&
-                                pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) &&
-                                pRGBStart[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()));
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(
+            "Sixth pixel is not green (red component)",
+            vcl::unotools::toDoubleColor(aCol.GetRed()), pRGBStart[5].Red);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(
+            "Sixth pixel is not green (green component)",
+            vcl::unotools::toDoubleColor(aCol.GetGreen()), pRGBStart[5].Green);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(
+            "Sixth pixel is not green (blue component)",
+            vcl::unotools::toDoubleColor(aCol.GetBlue()), pRGBStart[5].Blue);
     }
     else if( nDepth <= 8 )
     {


More information about the Libreoffice-commits mailing list