diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 12:43:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 15:20:58 +0200 |
| commit | 3697b87b70c69e17e1d0398e0192a11dab179fe3 (patch) | |
| tree | a498cce1f1351e6f92385aa9245c66c0724b6430 /sal/qa | |
| parent | 9bc95521aaa35b533894b3934519acdbd7a47815 (diff) | |
use more OUString::operator== in forms..sal
Change-Id: I70d7e50f8c1e019524ccad915f0cca912c5035dc
Reviewed-on: https://gerrit.libreoffice.org/39899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/qa')
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 3 | ||||
| -rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/rtl/uri/rtl_Uri.cxx | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 4a52bc8a7df9..4a3b014b095c 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -464,8 +464,7 @@ namespace osl_FileBase if (nError == osl::FileBase::E_None) { - bool bStrAreEqual = _suAssumeResultStr.equals(suResultURL); - CPPUNIT_ASSERT_MESSAGE("Assumption is wrong: ResultURL is not equal to expected URL ", bStrAreEqual); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong: ResultURL is not equal to expected URL ", _suAssumeResultStr, suResultURL); } } diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 4c699ab18d6e..1595377ac25d 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -133,7 +133,7 @@ namespace osl_Security aMessage.append(", bRes: "); aMessage.append(bRes); - CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), strUserID.equals(strID) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( aMessage.getStr(), strUserID, strID ); CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), bRes ); } diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index a328b4f0fffb..c8173831f757 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -111,7 +111,7 @@ protected: while(schedule()) { rtl::OUString aStr = Gregorian::get(); - if (aStr.equals(m_sConstStr)) + if (aStr == m_sConstStr) { m_nOK++; } diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index eb024402b49b..79d232f42355 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -58,13 +58,13 @@ namespace Stringtest rtl::OString sStr("h\xE4llo", strlen("h\xE4llo")); rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15); - CPPUNIT_ASSERT_MESSAGE("Strings must be equal", suString.equals(suStr_UriDecodeToIuri)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suString, suStr_UriDecodeToIuri); // ustring --> ustring (UTF8) rtl::OUString suStr2 = rtl::Uri::encode(suStr_UriDecodeToIuri, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8); showContent(suStr2); - CPPUNIT_ASSERT_MESSAGE("Strings must be equal", suStr2.equals(suStrUTF8)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suStr2, suStrUTF8); // suStr should be equal to suStr2 } |