[Libreoffice-commits] .: testtools/source

[Gert Faller]

 testtools/source/bridgetest/multi.cxx |   44 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 515ca95095cd77694dfb9180a17758390f707bb4
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Thu Nov 25 23:50:06 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in testing

diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index 18a0488..f3d90db 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -132,32 +132,32 @@ rtl::OUString testMulti(
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn11(5));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString::createFromAscii("abc")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-2"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
             static_cast< test::testtools::bridgetest::XMultiBase2 * >(
-                multi.get())->fn12(rtl::OUString::createFromAscii("abc-2")));
+                multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-2"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString::createFromAscii("abc-2")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
             static_cast< test::testtools::bridgetest::XMultiBase5 * >(
-                multi.get())->fn12(rtl::OUString::createFromAscii("abc-5")));
+                multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString::createFromAscii("abc-5")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
         checkEqual< sal_Int32 >(21 * 2, multi->fn21(2));
         checkEqual(
-            rtl::OUString::createFromAscii("22" "de"),
-            multi->fn22(rtl::OUString::createFromAscii("de")));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22" "de")),
+            multi->fn22(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
         checkEqual< sal_Int32 >(
             31 * 3,
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -197,19 +197,19 @@ rtl::OUString testMulti(
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->getatt3());
         checkEqual(
-            rtl::OUString::createFromAscii("32" "f"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn32(
-                    rtl::OUString::createFromAscii("f")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f"))));
         checkEqual(
-            rtl::OUString::createFromAscii("32" "f-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
             static_cast< test::testtools::bridgetest::XMultiBase5 * >(
-                multi.get())->fn32(rtl::OUString::createFromAscii("f-5")));
+                multi.get())->fn32(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
         checkEqual(
-            rtl::OUString::createFromAscii("32" "f-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn32(
-                    rtl::OUString::createFromAscii("f-5")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
         checkEqual< sal_Int32 >(
             33,
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -225,12 +225,12 @@ rtl::OUString testMulti(
         checkEqual< sal_Int32 >(41 * 4, multi->fn41(4));
         checkEqual< sal_Int32 >(61 * 6, multi->fn61(6));
         checkEqual(
-            rtl::OUString::createFromAscii("62" ""),
-            multi->fn62(rtl::OUString::createFromAscii("")));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62" "")),
+            multi->fn62(rtl::OUString()));
         checkEqual< sal_Int32 >(71 * 7, multi->fn71(7));
         checkEqual(
-            rtl::OUString::createFromAscii("72" "g"),
-            multi->fn72(rtl::OUString::createFromAscii("g")));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72" "g")),
+            multi->fn72(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("g"))));
         checkEqual< sal_Int32 >(73, multi->fn73());
     } catch (CheckFailed const & f) {
         return f.message;