summaryrefslogtreecommitdiff
path: root/stoc/test
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 19:49:53 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 20:03:42 +0200
commitd6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (patch)
treeb5a12df1fcae025715633469b75ab4c9b6f6d279 /stoc/test
parent0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff)
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Diffstat (limited to 'stoc/test')
-rw-r--r--stoc/test/testcorefl.cxx6
-rw-r--r--stoc/test/testloader.cxx2
-rw-r--r--stoc/test/testproxyfac.cxx3
-rw-r--r--stoc/test/testregistry.cxx7
4 files changed, 7 insertions, 11 deletions
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 505fceb9bd35..416929364989 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -242,10 +242,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->createObject(aAny);
- TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]ModuleA.StructA")), "test_RegCoreReflection(): error 54");
+ TEST_ENSHURE( aAny.getValueTypeName() == "[]ModuleA.StructA", "test_RegCoreReflection(): error 54" );
xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")))->createObject(aAny);
- TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[][]ModuleA.StructA") ), "test_RegCoreReflection(): error 56");
+ TEST_ENSHURE( aAny.getValueTypeName() == "[][]ModuleA.StructA", "test_RegCoreReflection(): error 56" );
// xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") ));
@@ -254,7 +254,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
// TEST_ENSHURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("string")), "test_RegCoreReflection(): error 60");
// xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->createObject(aAny);
-// TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[]string") ), "test_RegCoreReflection(): error 61");
+// TEST_ENSHURE( aAny.getValueTypeName() == "[]string", "test_RegCoreReflection(): error 61" );
TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][][]unsigned long")))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62");
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index ba0897d629a9..490ac5b906c8 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -118,7 +118,7 @@ SAL_IMPLEMENT_MAIN()
TEST_ENSHURE( xServInfo.is(), "testloader error4");
- TEST_ENSHURE( xServInfo->getImplementationName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.stoc.DLLComponentLoader") ), "testloader error5");
+ TEST_ENSHURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.DLLComponentLoader", "testloader error5");
TEST_ENSHURE( xServInfo->supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")) ), "testloader error6");
TEST_ENSHURE( xServInfo->getSupportedServiceNames().getLength() == 1, "testloader error7");
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 40e8c60d97f4..e92fabecb130 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -227,8 +227,7 @@ static void test_proxyfac_(
}
catch (const lang::DisposedException & exc)
{
- if (! exc.Message.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("my test exception") ))
+ if ( exc.Message != "my test exception" )
throw;
}
}
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 5eddcf6aa7e3..df0cc7dec556 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -206,7 +206,7 @@ void test_SimpleRegistry(
TEST_ENSHURE( xServInfo.is(), "test_SimpleRegistry error2");
- TEST_ENSHURE( xServInfo->getImplementationName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.stoc.SimpleRegistry") ), "test_SimpleRegistry error3");
+ TEST_ENSHURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.SimpleRegistry", "test_SimpleRegistry error3");
TEST_ENSHURE( xServInfo->supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))), "test_SimpleRegistry error4");
TEST_ENSHURE( xServInfo->getSupportedServiceNames().getLength() == 1, "test_SimpleRegistry error5");
xServInfo.clear();
@@ -356,10 +356,7 @@ void test_SimpleRegistry(
xRootKey = xReg->getRootKey();
xKey = xRootKey->openKey( OUString( RTL_CONSTASCII_USTRINGPARAM("LinkTest") ) );
- TEST_ENSHURE(
- xKey.is() && xKey->isValid() &&
- xKey->getKeyName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("/ThirdKey/FirstSubKey/WithSubSubKey") ),
- "test_SimpleRegistry error 1213" );
+ TEST_ENSHURE( xKey.is() && xKey->isValid() && xKey->getKeyName() == "/ThirdKey/FirstSubKey/WithSubSubKey", "test_SimpleRegistry error 1213" );
xKey->closeKey();
TEST_ENSHURE(
xRootKey->getKeyType( OUString( RTL_CONSTASCII_USTRINGPARAM("LinkTest") ) ) ==