#i125003# migrate main/sal/qa/rtl/ostring from cppunit to Google Test.

sal/qa/rtl/ostring/makefile.mk

@@ -33,57 +33,47 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+    @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
-SHL1OBJS=  \
+APP1OBJS=  \
     $(SLO)$/rtl_OString2.obj
-
-SHL1TARGET= rtl_OString2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-# DEF2EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+APP1TARGET= rtl_OString2
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 # auto generated Target:joblist
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-SHL2OBJS=  \
+APP2OBJS=  \
     $(SLO)$/rtl_str.obj
-
-SHL2TARGET= rtl_str
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME    =$(SHL2TARGET)
-SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
+APP2TARGET= rtl_str
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-SHL3OBJS=  \
+APP3OBJS=  \
     $(SLO)$/rtl_string.obj
-
-SHL3TARGET= rtl_string
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL3IMPLIB= i$(SHL3TARGET)
-DEF3NAME    =$(SHL3TARGET)
-SHL3VERSIONMAP= $(PRJ)$/qa$/export.map
+APP3TARGET= rtl_string
+APP3STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP3RPATH = NONE
+APP3TEST = enabled
 # END ------------------------------------------------------------------
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
 

sal/qa/rtl/ostring/rtl_string.cxx

@@ -24,56 +24,48 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+#include "gtest/gtest.h"
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 
 namespace rtl_string
 {
 
-    class getLength : public CppUnit::TestFixture
+    class getLength : public ::testing::Test
     {
     public:
+    }; // class getLength
 
-        void getLength_000()
+    TEST_F(getLength, getLength_000)
     {
         rtl_string_getLength( NULL );
         // should not GPF
     }
 
-        void getLength_001()
+    TEST_F(getLength, getLength_001)
     {
         rtl::OString aStr("Test Length.");
         sal_Int32 nValue = rtl_string_getLength( aStr.pData );
 
-                CPPUNIT_ASSERT_MESSAGE("Length must equal getLength()", aStr.getLength() == nValue);
-                CPPUNIT_ASSERT_MESSAGE(
-                    "Length must equal strlen()",
-                    nValue >= 0
+        ASSERT_TRUE(aStr.getLength() == nValue) << "Length must equal getLength()";
+        ASSERT_TRUE(nValue >= 0
             && (strlen(aStr.getStr())
-                        == sal::static_int_cast< sal_uInt32 >(nValue)));
+                == sal::static_int_cast< sal_uInt32 >(nValue))) << "Length must equal strlen()";
     }
-        // Change the following lines only, if you add, remove or rename
-        // member functions of the current class,
-        // because these macros are need by auto register mechanism.
-
-        CPPUNIT_TEST_SUITE(getLength);
-        CPPUNIT_TEST(getLength_000);
-        CPPUNIT_TEST(getLength_001);
-        CPPUNIT_TEST_SUITE_END();
-    }; // class getLength
-
 // -----------------------------------------------------------------------------
 
-    class newFromString : public CppUnit::TestFixture
+    class newFromString : public ::testing::Test
     {
     public:
+    }; // class newFromString
 
-        // void newFromString_000()
+    // TEST_F(newFromString, newFromString_000)
     // {
     //     sal_Int32 nValue = rtl_string_newFromString( NULL, NULL );
     //     // should not GPF
     // }
 
-        void newFromString_001()
+    TEST_F(newFromString, newFromString_001)
     {
         rtl::OString aStr("Test Length.");
         rtl_String *pStr = NULL;
@@ -81,42 +73,35 @@ namespace rtl_string
         rtl_string_newFromString( &pStr, aStr.pData );
 
         rtl::OString aNewStr(pStr);
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", aStr.equals(aNewStr) == sal_True);
+        ASSERT_TRUE(aStr.equals(aNewStr) == sal_True) << "Strings must be equal";
 
         rtl_string_release(pStr);
     }
-        // Change the following lines only, if you add, remove or rename
-        // member functions of the current class,
-        // because these macros are need by auto register mechanism.
-
-        CPPUNIT_TEST_SUITE(newFromString);
-        // CPPUNIT_TEST(newFromString_000);
-        CPPUNIT_TEST(newFromString_001);
-        CPPUNIT_TEST_SUITE_END();
-    }; // class newFromString
 
     // -----------------------------------------------------------------------------
 
-    class convertUStringToString : public CppUnit::TestFixture
+    class convertUStringToString : public ::testing::Test
     {
     public:
+    }; // class convertUStringToString
+
 
-        // void newFromString_000()
+    // TEST_F(convertUStringToString, newFromString_000)
     // {
     //     sal_Int32 nValue = rtl_string_newFromString( NULL, NULL );
     //     // should not GPF
     // }
 
-        void convertUStringToString_001()
+    TEST_F(convertUStringToString, convertUStringToString_001)
     {
         rtl::OUString suString = rtl::OUString::createFromAscii("Hello");
         rtl::OString sString;
         sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Hello")) == sal_True);
+        ASSERT_TRUE(bRet == sal_True && sString.equals(rtl::OString("Hello")) == sal_True) << "Strings must be equal";
     }
 
-        void convertUStringToString_002()
+    TEST_F(convertUStringToString, convertUStringToString_002)
     {
         rtl::OString sStr("H\xE4llo");
         rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
@@ -124,10 +109,10 @@ namespace rtl_string
         rtl::OString sString;
         sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True);
+        ASSERT_TRUE(bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True) << "Strings must be equal";
     }
 
-        void convertUStringToString_003()
+    TEST_F(convertUStringToString, convertUStringToString_003)
     {
         rtl::OString sStr("H\xC3\xA4llo");
         rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_UTF8);
@@ -135,10 +120,10 @@ namespace rtl_string
         rtl::OString sString;
         sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True);
+        ASSERT_TRUE(bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True) << "Strings must be equal";
     }
 
-        void convertUStringToString_004()
+    TEST_F(convertUStringToString, convertUStringToString_004)
     {
         rtl::OString sStr("Tsch\xFC\xDF");
         rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
@@ -146,34 +131,14 @@ namespace rtl_string
 
         sal_Bool       bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
         /* sal_Bool */ bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True);
+        ASSERT_TRUE(bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True) << "Strings must be equal";
     }
 
-
-
-        // Change the following lines only, if you add, remove or rename
-        // member functions of the current class,
-        // because these macros are need by auto register mechanism.
-
-        CPPUNIT_TEST_SUITE(convertUStringToString);
-        CPPUNIT_TEST(convertUStringToString_001);
-        CPPUNIT_TEST(convertUStringToString_002);
-        CPPUNIT_TEST(convertUStringToString_003);
-        CPPUNIT_TEST(convertUStringToString_004);
-        CPPUNIT_TEST_SUITE_END();
-    }; // class convertUStringToString
-
-
-
 } // namespace rtl_string
 
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_string::getLength, "rtl_string");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_string::newFromString, "rtl_string");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_string::convertUStringToString, "rtl_string");
-
-// -----------------------------------------------------------------------------
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}