1 files changed, 20 insertions, 0 deletions
diff --git a/sal/qa/rtl/strings/test_ostring.cxx b/sal/qa/rtl/strings/test_ostring.cxx
index 2929b78c5b3f..ffdd46821b38 100644
--- a/sal/qa/rtl/strings/test_ostring.cxx
+++ b/sal/qa/rtl/strings/test_ostring.cxx
@@ -19,9 +19,11 @@ namespace {
 class Test: public CppUnit::TestFixture {
 private:
     void testStartsWithIgnoreAsciiCase();
+    void testCompareTo();
 
     CPPUNIT_TEST_SUITE(Test);
     CPPUNIT_TEST(testStartsWithIgnoreAsciiCase);
+    CPPUNIT_TEST(testCompareTo);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -85,6 +87,24 @@ void Test::testStartsWithIgnoreAsciiCase() {
     }
 }
 
+void Test::testCompareTo()
+{
+    // test that embedded NUL does not stop the compare
+    sal_Char str1[2] = { '\0', 'x' };
+    sal_Char str2[2] = { '\0', 'y' };
+
+    OString s1(str1, 2);
+    OString s2(str2, 2);
+    CPPUNIT_ASSERT(s1.compareTo(s1) == 0);
+    CPPUNIT_ASSERT(s2.compareTo(s2) == 0);
+    CPPUNIT_ASSERT(s1.compareTo(s2) < 0);
+    CPPUNIT_ASSERT(s2.compareTo(s1) > 0);
+    CPPUNIT_ASSERT(s1.compareTo(OString(s2 + "y")) < 0);
+    CPPUNIT_ASSERT(s2.compareTo(OString(s1 + "x")) > 0);
+    CPPUNIT_ASSERT(OString(s1 + "x").compareTo(s2) < 0);
+    CPPUNIT_ASSERT(OString(s2 + "y").compareTo(s1) > 0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }