CppunitTest_sal_rtl_ostring: fix loplugin:cppunitassertequals warnings

Change-Id: Ie5168b9844dadd042bcbd825e8f48030ac1ef91c
Reviewed-on: https://gerrit.libreoffice.org/27032
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

1 files changed, 26 insertions, 26 deletions

diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 00a7f6667579..84859d1a4789 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -529,7 +529,7 @@ public:
             // check if the _nExpectedResultPos occurs.
 
             sal_Int32 nPos = _suStr.lastIndexOf(_suSearchStr);
-            CPPUNIT_ASSERT_MESSAGE("expected position is wrong", nPos == _nExpectedResultPos);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
     void lastIndexOf_salunicode(rtl::OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos)
@@ -539,19 +539,19 @@ public:
             // check if the _nExpectedResultPos occurs.
 
             sal_Int32 nPos = _suStr.lastIndexOf(_cuSearchChar);
-            CPPUNIT_ASSERT_MESSAGE("expected position is wrong", nPos == _nExpectedResultPos);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
     void lastIndexOf_oustring_offset(rtl::OUString const& _suStr, rtl::OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
         {
             sal_Int32 nPos = _suStr.lastIndexOf(_suSearchStr, _nStartOffset);
-            CPPUNIT_ASSERT_MESSAGE("expected position is wrong", nPos == _nExpectedResultPos);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
     void lastIndexOf_salunicode_offset(rtl::OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
         {
             sal_Int32 nPos = _suStr.lastIndexOf(_cuSearchChar, _nStartOffset);
-            CPPUNIT_ASSERT_MESSAGE("expected position is wrong", nPos == _nExpectedResultPos);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
     void lastIndexOf_test_oustring_offset_001()
@@ -753,11 +753,11 @@ public:
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'a'", suToken == "a" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'b'", suToken == "b" );
-            CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_002()
@@ -767,14 +767,14 @@ public:
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'a'", suToken == "a" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken );
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'b'", suToken == "b" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken );
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'c'", suToken == "c" );
-            CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'c'", rtl::OUString("c"), suToken );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_003()
@@ -784,14 +784,14 @@ public:
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'a'", suToken == "a" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken );
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.isEmpty());
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be a 'b'", suToken == "b" );
-            CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_004()
@@ -801,26 +801,26 @@ public:
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be 'longer'", suToken == "longer" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'longer'", rtl::OUString("longer"), suToken );
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be 'then'", suToken == "then" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'then'", rtl::OUString("then"), suToken );
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE( "Token should be 'ever'", suToken == "ever" );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'ever'", rtl::OUString("ever"), suToken );
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.isEmpty());
 
-            CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_005() {
         rtl::OUString ab("ab");
         sal_Int32 n = 0;
-        CPPUNIT_ASSERT_MESSAGE(
-            "token should be 'ab'", ab.getToken(0, '-', n) == ab);
-        CPPUNIT_ASSERT_MESSAGE("n should be -1", n == -1);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(
+            "token should be 'ab'", ab, ab.getToken(0, '-', n));
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("n should be -1", static_cast<sal_Int32>(-1), n);
         CPPUNIT_ASSERT_MESSAGE(
             "token should be empty", ab.getToken(0, '-', n).isEmpty());
     }
@@ -885,8 +885,8 @@ public:
 
         ::rtl::OUString aFoo( "foo" );
         ::rtl::OUString aFooIntern = aFoo.intern();
-        CPPUNIT_ASSERT_MESSAGE( "string contents", aFooIntern == "foo" );
-        CPPUNIT_ASSERT_MESSAGE("string length", aFooIntern.getLength() == 3);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE( "string contents", rtl::OUString("foo"), aFooIntern);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("string length", static_cast<sal_Int32>(3), aFooIntern.getLength());
         // We have to dup due to no atomic 'intern' bit-set operation
         CPPUNIT_ASSERT_MESSAGE("intern dups", aFoo.pData != aFooIntern.pData);
 
@@ -903,8 +903,8 @@ public:
         for (i = 0; i < nSequence; i++)
         {
             rtl::OUString aNew = rtl::OUString::number( sqrt( static_cast<double>(i) ) ).intern();
-            CPPUNIT_ASSERT_MESSAGE("double intern failed",
-                                   aNew.pData == pStrs[i].pData);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("double intern failed",
+                                   pStrs[i].pData, aNew.pData);
         }
         delete [] pStrs;
     }
@@ -1077,7 +1077,7 @@ void convertFromString::test() {
             (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
              RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
              RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)));
-    CPPUNIT_ASSERT( t == "abc" );
+    CPPUNIT_ASSERT_EQUAL( OUString("abc"), t );
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OUString::number);