2 files changed, 50 insertions, 59 deletions
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index e164aec5ca67..b419ff4b2898 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -33,34 +33,31 @@ 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_OUStringBuffer2.obj
 
-SHL1TARGET= rtl_OUStringBuffer2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
+APP1TARGET= rtl_OUStringBuffer2
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 
-DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # auto generated Target:joblist
 # 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"
diff --git a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
index 93fb31c0598c..8af4b6078345 100644
--- a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
+++ b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
@@ -24,7 +24,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+#include "gtest/gtest.h"
 #include "stringhelper.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
@@ -33,65 +33,59 @@ namespace rtl_OUStringBuffer
 {
 
 
-class insertUtf32 : public CppUnit::TestFixture
+class insertUtf32 : public ::testing::Test
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void SetUp()
     {
     }
 
-    void tearDown()
+    void TearDown()
     {
     }
+}; // class getToken
 
-    void insertUtf32_001()
-        {
-            ::rtl::OUStringBuffer aUStrBuf(4);
-            aUStrBuf.insertUtf32(0,0x10ffff);
-
-            rtl::OUString suStr = aUStrBuf.makeStringAndClear();
-            rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
+// -----------------------------------------------------------------------------
 
-            rtl::OString sStr;
-            sStr <<= suStr2;
-            t_print("%s\n", sStr.getStr());
+TEST_F(insertUtf32, insertUtf32_001)
+{
+    ::rtl::OUStringBuffer aUStrBuf(4);
+    aUStrBuf.insertUtf32(0,0x10ffff);
 
-            CPPUNIT_ASSERT_MESSAGE("Strings must be '%F4%8F%BF%BF'", sStr.equals(rtl::OString("%F4%8F%BF%BF")) == sal_True);
-        }
+    rtl::OUString suStr = aUStrBuf.makeStringAndClear();
+    rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
 
-    void insertUtf32_002()
-        {
-            ::rtl::OUStringBuffer aUStrBuf(4);
-            aUStrBuf.insertUtf32(0,0x41);
-            aUStrBuf.insertUtf32(1,0x42);
-            aUStrBuf.insertUtf32(2,0x43);
+    rtl::OString sStr;
+    sStr <<= suStr2;
+    printf("%s\n", sStr.getStr());
 
-            rtl::OUString suStr = aUStrBuf.makeStringAndClear();
-            rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
+    ASSERT_TRUE(sStr.equals(rtl::OString("%F4%8F%BF%BF")) == sal_True)
+        << "Strings must be '%F4%8F%BF%BF'";
+}
 
-            rtl::OString sStr;
-            sStr <<= suStr2;
-            t_print("%s\n", sStr.getStr());
+TEST_F(insertUtf32, insertUtf32_002)
+{
+    ::rtl::OUStringBuffer aUStrBuf(4);
+    aUStrBuf.insertUtf32(0,0x41);
+    aUStrBuf.insertUtf32(1,0x42);
+    aUStrBuf.insertUtf32(2,0x43);
 
-            CPPUNIT_ASSERT_MESSAGE("Strings must be 'ABC'", sStr.equals(rtl::OString("ABC")) == sal_True);
-        }
+    rtl::OUString suStr = aUStrBuf.makeStringAndClear();
+    rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
 
-    CPPUNIT_TEST_SUITE(insertUtf32);
-    CPPUNIT_TEST(insertUtf32_001);
-    CPPUNIT_TEST(insertUtf32_002);
-    CPPUNIT_TEST_SUITE_END();
-}; // class getToken
+    rtl::OString sStr;
+    sStr <<= suStr2;
+    printf("%s\n", sStr.getStr());
 
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUStringBuffer::insertUtf32, "rtl_OUStringBuffer");
+    ASSERT_TRUE(sStr.equals(rtl::OString("ABC")) == sal_True)
+        << "Strings must be 'ABC'";
+}
 
 } // namespace rtl_OUStringBuffer
 
-
-// -----------------------------------------------------------------------------
-
-// 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();
+}