summaryrefslogtreecommitdiff
path: root/sal/qa/rtl/strings
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/rtl/strings')
-rw-r--r--sal/qa/rtl/strings/test_oustring_compare.cxx20
-rw-r--r--sal/qa/rtl/strings/test_oustring_convert.cxx18
-rw-r--r--sal/qa/rtl/strings/test_oustring_endswith.cxx10
-rw-r--r--sal/qa/rtl/strings/test_oustring_startswith.cxx6
-rw-r--r--sal/qa/rtl/strings/test_strings_replace.cxx170
-rw-r--r--sal/qa/rtl/strings/test_strings_toint.cxx4
-rw-r--r--sal/qa/rtl/strings/test_strings_valuex.cxx12
7 files changed, 120 insertions, 120 deletions
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 5e9bc0f73a5d..2f4172e51493 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -48,18 +48,18 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii()
const char* const abc = "abc";
const char* const abcd = "abcd";
const char* const empty = "";
- CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAscii(abc));
- CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAsciiL(abc,3));
- CPPUNIT_ASSERT(!rtl::OUString("abc").
+ CPPUNIT_ASSERT(!OUString().equalsIgnoreAsciiCaseAscii(abc));
+ CPPUNIT_ASSERT(!OUString().equalsIgnoreAsciiCaseAsciiL(abc,3));
+ CPPUNIT_ASSERT(!OUString("abc").
equalsIgnoreAsciiCaseAscii(empty));
- CPPUNIT_ASSERT(!rtl::OUString("abc").
+ CPPUNIT_ASSERT(!OUString("abc").
equalsIgnoreAsciiCaseAsciiL(empty,0));
- CPPUNIT_ASSERT(rtl::OUString("abc").
+ CPPUNIT_ASSERT(OUString("abc").
equalsIgnoreAsciiCaseAscii(abc));
- CPPUNIT_ASSERT(!rtl::OUString("abcd").
+ CPPUNIT_ASSERT(!OUString("abcd").
equalsIgnoreAsciiCaseAscii(abc));
- CPPUNIT_ASSERT(!rtl::OUString("abc").
+ CPPUNIT_ASSERT(!OUString("abc").
equalsIgnoreAsciiCaseAscii(abcd));
}
@@ -67,12 +67,12 @@ void test::oustring::Compare::compareToIgnoreAsciiCase()
{
CPPUNIT_ASSERT_EQUAL(
sal_Int32(0),
- rtl::OUString("abc").compareToIgnoreAsciiCase("ABC"));
+ OUString("abc").compareToIgnoreAsciiCase("ABC"));
CPPUNIT_ASSERT(
- rtl::OUString("ABC").compareToIgnoreAsciiCase("abcdef")
+ OUString("ABC").compareToIgnoreAsciiCase("abcdef")
< 0);
CPPUNIT_ASSERT(
- rtl::OUString("A").compareToIgnoreAsciiCase("_") > 0);
+ OUString("A").compareToIgnoreAsciiCase("_") > 0);
}
void test::oustring::Compare::compareTo()
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index b80c446936dd..cbf32ec13d52 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -55,14 +55,14 @@ struct TestConvertToString
void testConvertToString(TestConvertToString const & rTest)
{
- const rtl::OUString aSource(rTest.aSource, rTest.nLength);
- rtl::OString aStrict(RTL_CONSTASCII_STRINGPARAM("12345"));
+ const OUString aSource(rTest.aSource, rTest.nLength);
+ OString aStrict(RTL_CONSTASCII_STRINGPARAM("12345"));
bool bSuccess = aSource.convertToString(&aStrict, rTest.nEncoding,
rTest.nFlags);
- rtl::OString aRelaxed(rtl::OUStringToOString(aSource, rTest.nEncoding,
+ OString aRelaxed(OUStringToOString(aSource, rTest.nEncoding,
rTest.nFlags));
- rtl::OStringBuffer aPrefix;
+ OStringBuffer aPrefix;
aPrefix.append("{");
for (sal_Int32 i = 0; i < rTest.nLength; ++i)
{
@@ -81,7 +81,7 @@ void testConvertToString(TestConvertToString const & rTest)
{
if (rTest.pStrict == nullptr || aStrict != rTest.pStrict)
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("strict = \"");
aMessage.append(aStrict);
aMessage.append("\"");
@@ -90,22 +90,22 @@ void testConvertToString(TestConvertToString const & rTest)
}
else
{
- if (aStrict != rtl::OString(RTL_CONSTASCII_STRINGPARAM("12345")))
+ if (aStrict != OString(RTL_CONSTASCII_STRINGPARAM("12345")))
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("modified output");
CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false);
}
if (rTest.pStrict != nullptr)
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("failed");
CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false);
}
}
if (aRelaxed != rTest.pRelaxed)
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("relaxed = \"");
aMessage.append(aRelaxed);
aMessage.append("\"");
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 22c68abd1d2e..33858e12ae23 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -45,7 +45,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
namespace {
-void appendString(rtl::OStringBuffer & buffer, rtl::OString const & string)
+void appendString(OStringBuffer & buffer, OString const & string)
{
buffer.append('"');
for (int i = 0; i < string.getLength(); ++i) {
@@ -94,16 +94,16 @@ void test::oustring::EndsWith::endsWith()
{ RTL_CONSTASCII_STRINGPARAM("a\0b\0c"),
RTL_CONSTASCII_STRINGPARAM("b"), false } };
for (size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
- rtl::OStringBuffer msg;
- appendString(msg, rtl::OString(data[i].str1, data[i].str1Len));
+ OStringBuffer msg;
+ appendString(msg, OString(data[i].str1, data[i].str1Len));
msg.append(".endsWithIgnoreAsciiCaseAsciiL(");
- appendString(msg, rtl::OString(data[i].str2, data[i].str2Len));
+ appendString(msg, OString(data[i].str2, data[i].str2Len));
msg.append(") == ");
msg.append(data[i].endsWith);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
msg.getStr(),
data[i].endsWith,
- rtl::OUString(
+ OUString(
data[i].str1, data[i].str1Len,
RTL_TEXTENCODING_ASCII_US).endsWithIgnoreAsciiCaseAsciiL(
data[i].str2, data[i].str2Len));
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index 3a8a15a03377..43d4c9e921c4 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -30,9 +30,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StartsWith);
void test::oustring::StartsWith::startsWith()
{
- CPPUNIT_ASSERT( rtl::OUString( "foobar" ).startsWith( "foo" ));
- CPPUNIT_ASSERT( !rtl::OUString( "foo" ).startsWith( "foobar" ));
- CPPUNIT_ASSERT( !rtl::OUString( "foobar" ).startsWith( "oo" ));
+ CPPUNIT_ASSERT( OUString( "foobar" ).startsWith( "foo" ));
+ CPPUNIT_ASSERT( !OUString( "foo" ).startsWith( "foobar" ));
+ CPPUNIT_ASSERT( !OUString( "foobar" ).startsWith( "oo" ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx
index 40c0117e5c66..a27f5f14286b 100644
--- a/sal/qa/rtl/strings/test_strings_replace.cxx
+++ b/sal/qa/rtl/strings/test_strings_replace.cxx
@@ -66,175 +66,175 @@ private:
void Test::stringReplaceFirst() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("otherbarfoo"),
- rtl::OString("foobarfoo").replaceFirst("foo", "other"));
+ OString("otherbarfoo"),
+ OString("foobarfoo").replaceFirst("foo", "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarfoo"),
- rtl::OString("foobarfoo").replaceFirst("bars", "other"));
+ OString("foobarfoo"),
+ OString("foobarfoo").replaceFirst("bars", "other"));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("otherbarfoo"),
- rtl::OString("foobarfoo").replaceFirst("foo", "other", &n));
+ OString("otherbarfoo"),
+ OString("foobarfoo").replaceFirst("foo", "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarother"),
- rtl::OString("foobarfoo").replaceFirst("foo", "other", &n));
+ OString("foobarother"),
+ OString("foobarfoo").replaceFirst("foo", "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarfoo"),
- rtl::OString("foobarfoo").replaceFirst("bar", "other", &n));
+ OString("foobarfoo"),
+ OString("foobarfoo").replaceFirst("bar", "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
}
void Test::stringReplaceAll() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("otherbarother"),
- rtl::OString("foobarfoo").replaceAll("foo", "other"));
+ OString("otherbarother"),
+ OString("foobarfoo").replaceAll("foo", "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarfoo"),
- rtl::OString("foobarfoo").replaceAll("bars", "other"));
+ OString("foobarfoo"),
+ OString("foobarfoo").replaceAll("bars", "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("xxa"), rtl::OString("xaa").replaceAll("xa", "xx"));
+ OString("xxa"), OString("xaa").replaceAll("xa", "xx"));
}
void Test::ustringReplaceFirst() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bars, s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bars, s_other));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
+ OUString("foobarother"),
+ OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bar, s_other, &n));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bar, s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
}
void Test::ustringReplaceFirstAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("foo", s_other));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst("foo", s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("bars", s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst("bars", s_other));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("foo", s_other, &n));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst("foo", s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- rtl::OUString("foobarfoo").replaceFirst("foo", s_other, &n));
+ OUString("foobarother"),
+ OUString("foobarfoo").replaceFirst("foo", s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("bar", s_other, &n));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst("bar", s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", s_empty));
+ OUString(), OUString("xa").replaceFirst("xa", s_empty));
}
void Test::ustringReplaceFirstToAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, "other"));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bars, "other"));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bars, "other"));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
+ OUString("foobarother"),
+ OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bar, "other", &n));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bar, "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceFirst(s_xa, ""));
+ OUString(), OUString("xa").replaceFirst(s_xa, ""));
}
void Test::ustringReplaceFirstAsciiLAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("otherbarfoo"),
+ (OUString("foobarfoo").
replaceFirst("foo", "other")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarfoo"),
+ (OUString("foobarfoo").
replaceFirst("bars", "other")));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("otherbarfoo"),
+ (OUString("foobarfoo").
replaceFirst("foo", "other", &n)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
@@ -242,8 +242,8 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarother"),
+ (OUString("foobarfoo").
replaceFirst("foo", "other", &n)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
@@ -251,82 +251,82 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarfoo"),
+ (OUString("foobarfoo").
replaceFirst("bar", "other", &n)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", ""));
+ OUString(), OUString("xa").replaceFirst("xa", ""));
}
void Test::ustringReplaceAll() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- rtl::OUString("foobarfoo").replaceAll(s_foo, s_other));
+ OUString("otherbarother"),
+ OUString("foobarfoo").replaceAll(s_foo, s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceAll(s_bars, s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceAll(s_bars, s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- rtl::OUString("xaa").replaceAll(s_xa, s_xx));
+ OUString("xxa"),
+ OUString("xaa").replaceAll(s_xa, s_xx));
}
void Test::ustringReplaceAllAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- rtl::OUString("foobarfoo").replaceAll("foo", s_other));
+ OUString("otherbarother"),
+ OUString("foobarfoo").replaceAll("foo", s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceAll("bars", s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceAll("bars", s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- rtl::OUString("xaa").replaceAll("xa", s_xx));
+ OUString("xxa"),
+ OUString("xaa").replaceAll("xa", s_xx));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceAll("xa", s_empty));
+ OUString(), OUString("xa").replaceAll("xa", s_empty));
}
void Test::ustringReplaceAllToAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- rtl::OUString("foobarfoo").replaceAll(s_foo, "other"));
+ OUString("otherbarother"),
+ OUString("foobarfoo").replaceAll(s_foo, "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceAll(s_bars, "other"));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceAll(s_bars, "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- rtl::OUString("xaa").replaceAll(s_xa, "xx"));
+ OUString("xxa"),
+ OUString("xaa").replaceAll(s_xa, "xx"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceAll(s_xa, ""));
+ OUString(), OUString("xa").replaceAll(s_xa, ""));
}
void Test::ustringReplaceAllAsciiLAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- (rtl::OUString("foobarfoo").
+ OUString("otherbarother"),
+ (OUString("foobarfoo").
replaceAll("foo", "other")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarfoo"),
+ (OUString("foobarfoo").
replaceAll("bars", "other")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- (rtl::OUString("xaa").
+ OUString("xxa"),
+ (OUString("xaa").
replaceAll("xa", "xx")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceAll("xa", ""));
+ OUString(), OUString("xa").replaceAll("xa", ""));
}
}
diff --git a/sal/qa/rtl/strings/test_strings_toint.cxx b/sal/qa/rtl/strings/test_strings_toint.cxx
index 38b74bf651aa..d81525b94405 100644
--- a/sal/qa/rtl/strings/test_strings_toint.cxx
+++ b/sal/qa/rtl/strings/test_strings_toint.cxx
@@ -64,8 +64,8 @@ private:
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(Test< rtl::OString >);
-CPPUNIT_TEST_SUITE_REGISTRATION(Test< rtl::OUString >);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test< OString >);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test< OUString >);
}
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 5253a4b99ddb..b1102cce6fd1 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -49,11 +49,11 @@ void testBoolean() {
}
void test::strings::valueX::testOBoolean() {
- testBoolean<rtl::OString>();
+ testBoolean<OString>();
}
void test::strings::valueX::testOUBoolean() {
- testBoolean<rtl::OUString>();
+ testBoolean<OUString>();
}
template< typename T >
@@ -91,11 +91,11 @@ static void testInt() {
}
void test::strings::valueX::testOUInt() {
- testInt<rtl::OUString>();
+ testInt<OUString>();
}
void test::strings::valueX::testOInt() {
- testInt<rtl::OString>();
+ testInt<OString>();
}
template< typename T >
@@ -106,10 +106,10 @@ static void testFloat() {
}
void test::strings::valueX::testOUFloat() {
- testFloat<rtl::OUString>();
+ testFloat<OUString>();
}
void test::strings::valueX::testOFloat() {
- testFloat<rtl::OString>();
+ testFloat<OString>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */