diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-09-09 12:49:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-10 07:27:09 +0000 |
| commit | f4dad76732328dfaa0ff16f810d6ee0a3bfd0d8c (patch) | |
| tree | 0dcdca03a594a8e9535c264b91512ea7eac01111 /sw/qa/extras/htmlexport | |
| parent | a41d72333d15c609f0441bd7df1722b31297756d (diff) | |
Improve border equal check in filter tests 2.
Change the order of words BORDER and EQUAL in the
macro name to become consistent with other macro names.
e.g. CPPUNIT_ASSERT_DOUBLES_EQUAL
Use a function inside the macro to make it type safe.
Add additional message to make clear why the test failed.
Change-Id: I9fc7a5813adf2cac36ae831d438cec498232b06c
Reviewed-on: https://gerrit.libreoffice.org/5885
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras/htmlexport')
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index b2dfcf012dd4..6ebaad50d3d7 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -57,18 +57,10 @@ void Test::testCharacterBorder() uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1),1), uno::UNO_QUERY); // Different Border { - CPPUNIT_ASSERT_EQUAL_BORDER( - table::BorderLine2(0x6666FF,12,12,12,3,37), - getProperty<table::BorderLine2>(xRun,"CharTopBorder")); - CPPUNIT_ASSERT_EQUAL_BORDER( - table::BorderLine2(0xFF9900,0,99,0,2,99), - getProperty<table::BorderLine2>(xRun,"CharLeftBorder")); - CPPUNIT_ASSERT_EQUAL_BORDER( - table::BorderLine2(0xFF0000,0,169,0,1,169), - getProperty<table::BorderLine2>(xRun,"CharBottomBorder")); - CPPUNIT_ASSERT_EQUAL_BORDER( - table::BorderLine2(0x0000FF,0,169,0,0,169), - getProperty<table::BorderLine2>(xRun,"CharRightBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x6666FF,12,12,12,3,37), getProperty<table::BorderLine2>(xRun,"CharTopBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF9900,0,99,0,2,99), getProperty<table::BorderLine2>(xRun,"CharLeftBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF0000,0,169,0,1,169), getProperty<table::BorderLine2>(xRun,"CharBottomBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x0000FF,0,169,0,0,169), getProperty<table::BorderLine2>(xRun,"CharRightBorder")); } // Different Padding |