diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-27 08:23:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-27 07:41:30 +0000 |
| commit | 23172fc9337c7f0928de0d938de31a0341c32e89 (patch) | |
| tree | b93a07a86a714b65c28e301764cc3db6509f4495 /o3tl/qa/test-cow_wrapper.cxx | |
| parent | 9eb2e683ab051edd0bce18841f0ac05df5038854 (diff) | |
CppunitTest_o3tl_tests: fix loplugin:cppunitassertequals warnings in ...
... cow_wrapper and vector_pool
Change-Id: I1f224a6bd933592dcb34defd5ad5c480d82346cb
Reviewed-on: https://gerrit.libreoffice.org/25531
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'o3tl/qa/test-cow_wrapper.cxx')
| -rw-r--r-- | o3tl/qa/test-cow_wrapper.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index 7c61da673482..1ec5f71ee603 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -170,8 +170,8 @@ public: // will occur cow_wrapper_client5 aTestObj1(1); cow_wrapper_client5 aTestObj2( std::move( aTestObj1 ) ); - CPPUNIT_ASSERT_MESSAGE("aTestObj2.use_count() == 1", - aTestObj2.use_count() == 1 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj2.use_count()", + static_cast<sal_uInt32>(1), aTestObj2.use_count() ); // the following should increment BogusRefCountPolicy::s_bShouldIncrement = true; @@ -179,8 +179,8 @@ public: CPPUNIT_ASSERT_MESSAGE("s_bShouldIncrement == 0", !BogusRefCountPolicy::s_bShouldIncrement ); - CPPUNIT_ASSERT_MESSAGE("aTestObj3.use_count() == 2", - aTestObj3.use_count() == 2 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj3.use_count()", + static_cast<sal_uInt32>(2), aTestObj3.use_count() ); { cow_wrapper_client5 aTestObj4; // the following should decrement the lvalue and then increment the rvalue @@ -192,18 +192,18 @@ public: CPPUNIT_ASSERT_MESSAGE("s_bShouldDecrement == 0", !BogusRefCountPolicy::s_bShouldDecrement ); - CPPUNIT_ASSERT_MESSAGE("aTestObj2.use_count() == 3", - aTestObj2.use_count() == 3 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj3.use_count() == 3", - aTestObj3.use_count() == 3 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj4.use_count() == 3", - aTestObj4.use_count() == 3 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj2 == aTestObj3", - aTestObj2 == aTestObj3 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj3 == aTestObj4", - aTestObj3 == aTestObj4 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj2 == aTestObj4", - aTestObj2 == aTestObj4 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj2.use_count()", + static_cast<sal_uInt32>(3), aTestObj2.use_count() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj3.use_count()", + static_cast<sal_uInt32>(3), aTestObj3.use_count() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj4.use_count()", + static_cast<sal_uInt32>(3), aTestObj4.use_count() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj2 == aTestObj3", + aTestObj3, aTestObj2 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj3 == aTestObj4", + aTestObj4, aTestObj3 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj2 == aTestObj4", + aTestObj4, aTestObj2 ); // only decrement the lvalue before assignment BogusRefCountPolicy::s_bShouldDecrement = true; @@ -222,10 +222,10 @@ public: // aTestObj2 is defunct afterwards, one decrement happens BogusRefCountPolicy::s_bShouldDecrement = true; aTestObj3 = std::move( aTestObj2 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj2.use_count() == 0", - aTestObj2.use_count() == 0 ); - CPPUNIT_ASSERT_MESSAGE("aTestObj3.use_count() == 1", - aTestObj3.use_count() == 1 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj2.use_count()", + static_cast<sal_uInt32>(0), aTestObj2.use_count() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("aTestObj3.use_count()", + static_cast<sal_uInt32>(1), aTestObj3.use_count() ); cow_wrapper_client5 aTestObj5; @@ -240,8 +240,8 @@ public: // aTestObj3 still holds a valid instance BogusRefCountPolicy::s_nEndOfScope = 1; } - CPPUNIT_ASSERT_MESSAGE("s_EndOfScope == 0", - BogusRefCountPolicy::s_nEndOfScope == 0 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("s_EndOfScope", + static_cast<sal_uInt32>(0), BogusRefCountPolicy::s_nEndOfScope ); } // Change the following lines only, if you add, remove or rename |