summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-28 12:13:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-28 12:13:45 +0100
commit23085e3bec84f8d07a594f8c1bbbbdbbe18d8121 (patch)
treeead72e74c2ebc45d7eeaea2bb7f8f6b527573814
parent692a5dca10c017c577cc54e08768808e82807f33 (diff)
Make test more robust
Change-Id: I699cd0b64a789f0529a47f9128267b65ae1d1165
-rw-r--r--chart2/qa/extras/chart2import.cxx26
1 files changed, 17 insertions, 9 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 7933001f6b32..251c8a188833 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