summaryrefslogtreecommitdiff
path: root/sal/qa/rtl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/rtl')
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx6
-rw-r--r--sal/qa/rtl/strings/test_ostring_concat.cxx2
-rw-r--r--sal/qa/rtl/strings/test_oustring_concat.cxx8
-rw-r--r--sal/qa/rtl/strings/test_oustring_stringliterals.cxx78
4 files changed, 47 insertions, 47 deletions
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
index 0d9cd2b82083..dc09f2a0da08 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
@@ -55,13 +55,13 @@ private:
CPPUNIT_ASSERT_EQUAL(s3, b3.toString());
CPPUNIT_ASSERT_EQUAL(sal_Int32(32), b3.getCapacity());
OUStringBuffer b4;
- b4 = OUStringLiteral("1") + "23456789012345";
+ b4 = OUStringLiteral(u"1") + "23456789012345";
CPPUNIT_ASSERT_EQUAL(s1, b4.toString());
CPPUNIT_ASSERT_EQUAL(sal_Int32(16), b4.getCapacity());
- b4 = OUStringLiteral("a") + "bc";
+ b4 = OUStringLiteral(u"a") + "bc";
CPPUNIT_ASSERT_EQUAL(s2, b4.toString());
CPPUNIT_ASSERT_EQUAL(sal_Int32(16), b4.getCapacity());
- b4 = OUStringLiteral("1") + "234567890123456";
+ b4 = OUStringLiteral(u"1") + "234567890123456";
CPPUNIT_ASSERT_EQUAL(s3, b4.toString());
CPPUNIT_ASSERT_EQUAL(sal_Int32(32), b4.getCapacity());
}
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx
index bcb4a3e3bb23..1e7ae6da25e4 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -158,7 +158,7 @@ void test::ostring::StringConcat::checkInvalid()
CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OStringBuffer( "b" )));
CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUString( "b" )));
CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringBuffer( "b" )));
- CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringLiteral( "b" )));
+ CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringLiteral( u"b" )));
CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + rtl::OUStringView( u"b" )));
CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + 1 ));
rtl_String* rs = nullptr;
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx
index 0e10257ea7e5..4ffe20966a09 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -66,8 +66,8 @@ void test::oustring::StringConcat::checkConcat()
CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUString, const char[ 4 ] > )), typeid( OUString( "foo" ) + "bar" ));
CPPUNIT_ASSERT_EQUAL( OUString( "foobarbaz" ), OUString( OUString( "foo" ) + "bar" + "baz" ));
CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringConcat< OUString, const char[ 4 ] >, const char[ 4 ] > )), typeid( OUString( "foo" ) + "bar" + "baz" ));
- CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringLiteral( "foo" ) + "bar" ));
- CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral, const char[ 4 ] > )), typeid( OUStringLiteral( "foo" ) + "bar" ));
+ CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringLiteral( u"foo" ) + "bar" ));
+ CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral, const char[ 4 ] > )), typeid( OUStringLiteral( u"foo" ) + "bar" ));
const char d1[] = "xyz";
CPPUNIT_ASSERT_EQUAL( OUString( "fooxyz" ), OUString( OUString( "foo" ) + d1 ));
CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUString, const char[ 4 ] > )), typeid( OUString( "foo" ) + d1 ));
@@ -148,10 +148,10 @@ void test::oustring::StringConcat::checkEnsureCapacity()
void test::oustring::StringConcat::checkAppend()
{
OUString str( "foo" );
- str += OUStringLiteral( "bar" ) + "baz";
+ str += OUStringLiteral( u"bar" ) + "baz";
CPPUNIT_ASSERT_EQUAL( OUString( "foobarbaz" ), str );
OUStringBuffer buf( "foo" );
- buf.append( OUStringLiteral( "bar" ) + "baz" );
+ buf.append( OUStringLiteral( u"bar" ) + "baz" );
CPPUNIT_ASSERT_EQUAL( OUString( "foobarbaz" ), buf.makeStringAndClear());
}
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 9a014557ff59..ea470136c823 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -43,7 +43,7 @@ private:
void testcall( const char str[] );
// Check that OUStringLiteral ctor is actually constexpr:
- static constexpr rtlunittest::OUStringLiteral dummy{"dummy"};
+ static constexpr rtlunittest::OUStringLiteral dummy{u"dummy"};
CPPUNIT_TEST_SUITE(StringLiterals);
CPPUNIT_TEST(checkCtors);
@@ -209,8 +209,8 @@ namespace {
rtl::OUString conditional(bool flag) {
return flag
- ? rtlunittest::OUStringLiteral("a")
- : rtlunittest::OUStringLiteral("bb");
+ ? rtlunittest::OUStringLiteral(u"a")
+ : rtlunittest::OUStringLiteral(u"bb");
}
}
@@ -220,102 +220,102 @@ void test::oustring::StringLiterals::checkOUStringLiteral()
CPPUNIT_ASSERT(bool(conditional(true) == "a"));
CPPUNIT_ASSERT(bool(conditional(false) == "bb"));
- rtl::OUString s1(rtlunittest::OUStringLiteral("abc"));
+ rtl::OUString s1(rtlunittest::OUStringLiteral(u"abc"));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("abc"), s1);
- s1 = rtlunittest::OUStringLiteral("de");
+ s1 = rtlunittest::OUStringLiteral(u"de");
CPPUNIT_ASSERT_EQUAL(rtl::OUString("de"), s1);
- s1 += rtlunittest::OUStringLiteral("fde");
+ s1 += rtlunittest::OUStringLiteral(u"fde");
CPPUNIT_ASSERT_EQUAL(rtl::OUString("defde"), s1);
CPPUNIT_ASSERT_EQUAL(
sal_Int32(0),
- s1.reverseCompareTo(rtlunittest::OUStringLiteral("defde")));
+ s1.reverseCompareTo(rtlunittest::OUStringLiteral(u"defde")));
CPPUNIT_ASSERT(
- s1.equalsIgnoreAsciiCase(rtlunittest::OUStringLiteral("DEFDE")));
- CPPUNIT_ASSERT(s1.match(rtlunittest::OUStringLiteral("fde"), 2));
+ s1.equalsIgnoreAsciiCase(rtlunittest::OUStringLiteral(u"DEFDE")));
+ CPPUNIT_ASSERT(s1.match(rtlunittest::OUStringLiteral(u"fde"), 2));
CPPUNIT_ASSERT(
- s1.matchIgnoreAsciiCase(rtlunittest::OUStringLiteral("FDE"), 2));
+ s1.matchIgnoreAsciiCase(rtlunittest::OUStringLiteral(u"FDE"), 2));
rtl::OUString s2;
- CPPUNIT_ASSERT(s1.startsWith(rtlunittest::OUStringLiteral("de"), &s2));
+ CPPUNIT_ASSERT(s1.startsWith(rtlunittest::OUStringLiteral(u"de"), &s2));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("fde"), s2);
CPPUNIT_ASSERT(
s1.startsWithIgnoreAsciiCase(
- rtlunittest::OUStringLiteral("DEFD"), &s2));
+ rtlunittest::OUStringLiteral(u"DEFD"), &s2));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("e"), s2);
- CPPUNIT_ASSERT(s1.endsWith(rtlunittest::OUStringLiteral("de"), &s2));
+ CPPUNIT_ASSERT(s1.endsWith(rtlunittest::OUStringLiteral(u"de"), &s2));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("def"), s2);
CPPUNIT_ASSERT(
- s1.endsWithIgnoreAsciiCase(rtlunittest::OUStringLiteral("EFDE"), &s2));
+ s1.endsWithIgnoreAsciiCase(rtlunittest::OUStringLiteral(u"EFDE"), &s2));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("d"), s2);
- CPPUNIT_ASSERT(bool(s1 == rtlunittest::OUStringLiteral("defde")));
- CPPUNIT_ASSERT(bool(rtlunittest::OUStringLiteral("defde") == s1));
- CPPUNIT_ASSERT(s1 != rtlunittest::OUStringLiteral("abc"));
- CPPUNIT_ASSERT(rtlunittest::OUStringLiteral("abc") != s1);
+ CPPUNIT_ASSERT(bool(s1 == rtlunittest::OUStringLiteral(u"defde")));
+ CPPUNIT_ASSERT(bool(rtlunittest::OUStringLiteral(u"defde") == s1));
+ CPPUNIT_ASSERT(s1 != rtlunittest::OUStringLiteral(u"abc"));
+ CPPUNIT_ASSERT(rtlunittest::OUStringLiteral(u"abc") != s1);
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(3), s1.indexOf(rtlunittest::OUStringLiteral("de"), 1));
+ sal_Int32(3), s1.indexOf(rtlunittest::OUStringLiteral(u"de"), 1));
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(3), s1.lastIndexOf(rtlunittest::OUStringLiteral("de")));
+ sal_Int32(3), s1.lastIndexOf(rtlunittest::OUStringLiteral(u"de")));
sal_Int32 i = 0;
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfde"),
s1.replaceFirst(
- rtlunittest::OUStringLiteral("de"), rtl::OUString("abc"), &i));
+ rtlunittest::OUStringLiteral(u"de"), rtl::OUString("abc"), &i));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfde"),
s1.replaceFirst(
- rtl::OUString("de"), rtlunittest::OUStringLiteral("abc"), &i));
+ rtl::OUString("de"), rtlunittest::OUStringLiteral(u"abc"), &i));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfde"),
s1.replaceFirst(
- rtlunittest::OUStringLiteral("de"),
- rtlunittest::OUStringLiteral("abc"), &i));
+ rtlunittest::OUStringLiteral(u"de"),
+ rtlunittest::OUStringLiteral(u"abc"), &i));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfde"),
- s1.replaceFirst(rtlunittest::OUStringLiteral("de"), "abc", &i));
+ s1.replaceFirst(rtlunittest::OUStringLiteral(u"de"), "abc", &i));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfde"),
- s1.replaceFirst("de", rtlunittest::OUStringLiteral("abc"), &i));
+ s1.replaceFirst("de", rtlunittest::OUStringLiteral(u"abc"), &i));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfabc"),
s1.replaceAll(
- rtlunittest::OUStringLiteral("de"), rtl::OUString("abc")));
+ rtlunittest::OUStringLiteral(u"de"), rtl::OUString("abc")));
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfabc"),
s1.replaceAll(
- rtl::OUString("de"), rtlunittest::OUStringLiteral("abc")));
+ rtl::OUString("de"), rtlunittest::OUStringLiteral(u"abc")));
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfabc"),
s1.replaceAll(
- rtlunittest::OUStringLiteral("de"),
- rtlunittest::OUStringLiteral("abc")));
+ rtlunittest::OUStringLiteral(u"de"),
+ rtlunittest::OUStringLiteral(u"abc")));
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfabc"),
- s1.replaceAll(rtlunittest::OUStringLiteral("de"), "abc"));
+ s1.replaceAll(rtlunittest::OUStringLiteral(u"de"), "abc"));
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcfabc"),
- s1.replaceAll("de", rtlunittest::OUStringLiteral("abc")));
+ s1.replaceAll("de", rtlunittest::OUStringLiteral(u"abc")));
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcdef"),
rtl::OUString(
- rtl::OUString("abc") + rtlunittest::OUStringLiteral("def")));
+ rtl::OUString("abc") + rtlunittest::OUStringLiteral(u"def")));
CPPUNIT_ASSERT_EQUAL(
rtl::OUString("abcdef"),
rtl::OUString(
- rtlunittest::OUStringLiteral("abc") + rtl::OUString("def")));
- rtl::OUStringBuffer b(rtlunittest::OUStringLiteral("abc"));
+ rtlunittest::OUStringLiteral(u"abc") + rtl::OUString("def")));
+ rtl::OUStringBuffer b(rtlunittest::OUStringLiteral(u"abc"));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("abc"), b.toString());
- b.append(rtlunittest::OUStringLiteral("def"));
+ b.append(rtlunittest::OUStringLiteral(u"def"));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("abcdef"), b.toString());
- b.insert(2, rtlunittest::OUStringLiteral("gabab"));
+ b.insert(2, rtlunittest::OUStringLiteral(u"gabab"));
CPPUNIT_ASSERT_EQUAL(rtl::OUString("abgababcdef"), b.toString());
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(3), b.indexOf(rtlunittest::OUStringLiteral("ab"), 1));
+ sal_Int32(3), b.indexOf(rtlunittest::OUStringLiteral(u"ab"), 1));
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(5), b.lastIndexOf(rtlunittest::OUStringLiteral("ab")));
+ sal_Int32(5), b.lastIndexOf(rtlunittest::OUStringLiteral(u"ab")));
}
void test::oustring::StringLiterals::checkOUStringChar()
generated by cgit (git 2.34.1) at 2025-02-22 21:44:07 +0000