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

[Stephan Bergmann]

 chart2/qa/extras/chart2import.cxx |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 23085e3bec84f8d07a594f8c1bbbbdbbe18d8121
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 28 12:13:34 2013 +0100

    Make test more robust
    
    Change-Id: I699cd0b64a789f0529a47f9128267b65ae1d1165

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 7933001..251c8a1 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -82,22 +82,30 @@ void Chart2ImportTest::Fdo60083()
     CPPUNIT_ASSERT(xErrorBarYProps.is());
     {
         sal_Int32 nErrorBarStyle;
-        xErrorBarYProps->getPropertyValue("ErrorBarStyle") >>= nErrorBarStyle;
-        CPPUNIT_ASSERT_EQUAL(nErrorBarStyle, static_cast<sal_Int32>(chart::ErrorBarStyle::RELATIVE));
+        CPPUNIT_ASSERT(
+            xErrorBarYProps->getPropertyValue("ErrorBarStyle")
+            >>= nErrorBarStyle);
+        CPPUNIT_ASSERT_EQUAL(
+            static_cast<sal_Int32>(chart::ErrorBarStyle::RELATIVE),
+            nErrorBarStyle);
 
         double nVal;
-        xErrorBarYProps->getPropertyValue("PositiveError") >>= nVal;
+        CPPUNIT_ASSERT(
+            xErrorBarYProps->getPropertyValue("PositiveError") >>= nVal);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, nVal, 1e-8);
 
-        xErrorBarYProps->getPropertyValue("NegativeError") >>= nVal;
+        CPPUNIT_ASSERT(
+            xErrorBarYProps->getPropertyValue("NegativeError") >>= nVal);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, nVal, 1e-8);
 
-        sal_Bool bVal;
-        xErrorBarYProps->getPropertyValue("ShowPositiveError") >>= bVal;
-        CPPUNIT_ASSERT_EQUAL(static_cast<bool>(bVal), true);
+        bool bVal;
+        CPPUNIT_ASSERT(
+            xErrorBarYProps->getPropertyValue("ShowPositiveError") >>= bVal);
+        CPPUNIT_ASSERT_EQUAL(bVal, true);
 
-        xErrorBarYProps->getPropertyValue("ShowNegativeError") >>= bVal;
-        CPPUNIT_ASSERT_EQUAL(static_cast<bool>(bVal), true);
+        CPPUNIT_ASSERT(
+            xErrorBarYProps->getPropertyValue("ShowNegativeError") >>= bVal);
+        CPPUNIT_ASSERT_EQUAL(bVal, true);
     }
 
     // test that x error bars are not imported