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

Miklos Vajna vmiklos at collabora.co.uk
Wed May 11 09:09:35 UTC 2016


 sw/qa/core/macros-test.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 307ab87fecb702b3aa72525ce4556b9c49fa5515
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed May 11 09:35:16 2016 +0200

    CppunitTest_sw_macros_test: fix loplugin:cppunitassertequals errors
    
    Change-Id: I1cb5f51a4dda9b2a38f4de84e4e69b0f1a7e623b
    Reviewed-on: https://gerrit.libreoffice.org/24873
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index d1bcbaf..1cfdf50 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -223,8 +223,8 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     for (IDocumentMarkAccess::const_iterator_t i = rIDMA.getAllMarksBegin(); i != rIDMA.getAllMarksEnd(); ++i)
     {
         // problem was that the nContent was pointing at deleted node
-        CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetContentNode() ==
-            static_cast<const SwContentNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
+        CPPUNIT_ASSERT_EQUAL(static_cast<const SwContentNode*>((*i)->GetMarkStart().nContent.GetIdxReg()),
+            static_cast<const SwContentNode*>((*i)->GetMarkStart().nNode.GetNode().GetContentNode()));
     }
 }
 
@@ -253,8 +253,8 @@ void SwMacrosTest::testBookmarkDeleteTdf90816()
     auto iter = rIDMA.getAllMarksBegin();
     CPPUNIT_ASSERT_MESSAGE("the bookmark was deleted",
             iter != rIDMA.getAllMarksEnd());
-    CPPUNIT_ASSERT(*aPaM.Start() == (*iter)->GetMarkPos());
-    CPPUNIT_ASSERT(*aPaM.End() == (*iter)->GetOtherMarkPos());
+    CPPUNIT_ASSERT_EQUAL((*iter)->GetMarkPos(), *aPaM.Start());
+    CPPUNIT_ASSERT_EQUAL((*iter)->GetOtherMarkPos(), *aPaM.End());
 }
 
 #if 0


More information about the Libreoffice-commits mailing list