[Libreoffice-commits] .: 2 commits - basegfx/source comphelper/prj comphelper/qa
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Feb 16 03:06:55 PST 2011
basegfx/source/tools/b2dclipstate.cxx | 2
comphelper/prj/build.lst | 3
comphelper/qa/makefile.mk | 53 ---
comphelper/qa/string/makefile.mk | 53 +++
comphelper/qa/string/test_string.cxx | 287 ++++++++++++++++++++
comphelper/qa/string/test_string_noadditional.cxx | 33 ++
comphelper/qa/test_string.cxx | 287 --------------------
comphelper/qa/test_weakbag.cxx | 76 -----
comphelper/qa/weakbag/makefile.mk | 53 +++
comphelper/qa/weakbag/test_weakbag.cxx | 74 +++++
comphelper/qa/weakbag/test_weakbag_noadditional.cxx | 33 ++
11 files changed, 536 insertions(+), 418 deletions(-)
New commits:
commit cc2e1cf9bbf3e793abec2e10be05e350ae8364d8
Author: Sébastien Le Ray <sebastien-libreoffice at orniz.org>
Date: Wed Feb 16 09:54:58 2011 +0100
Cleanup in comphelper unit tests.
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index 25aa17f..8a4f18a 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -11,4 +11,5 @@ ph comphelper\source\compare nmake - all ph_compare ph_inc NULL
ph comphelper\source\officeinstdir nmake - all ph_officeinstdir ph_inc NULL
ph comphelper\source\xml nmake - all ph_xml NULL
ph comphelper\util nmake - all ph_util ph_container ph_evtatmgr ph_misc ph_procfact ph_property ph_streaming ph_compare ph_officeinstdir ph_xml NULL
-ph comphelper\qa nmake - all ph_complex ph_util NULL
+ph comphelper\qa\weakbag nmake - all qa_weakbag ph_util NULL
+ph comphelper\qa\string nmake - all qa_string ph_util NULL
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
deleted file mode 100644
index e8c1d52..0000000
--- a/comphelper/qa/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..
-PRJNAME := comphelper
-TARGET := qa
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-DLLPRE = # no leading "lib" on .so files
-
-INCPRE += $(MISC)$/$(TARGET)$/inc
-
-SHL1TARGET = $(TARGET)_weakbag
-SHL1OBJS = $(SLO)$/test_weakbag.obj $(SLO)$/test_string.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(COMPHELPERLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
diff --git a/comphelper/qa/string/makefile.mk b/comphelper/qa/string/makefile.mk
new file mode 100644
index 0000000..7a74454
--- /dev/null
+++ b/comphelper/qa/string/makefile.mk
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ := ..$/..
+PRJNAME := comphelper
+TARGET := qa
+
+ENABLE_EXCEPTIONS := TRUE
+
+.INCLUDE: settings.mk
+.INCLUDE : $(PRJ)$/version.mk
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+DLLPRE = # no leading "lib" on .so files
+
+INCPRE += $(MISC)$/$(TARGET)$/inc
+
+SHL1TARGET = $(TARGET)_string
+SHL1OBJS = $(SLO)$/test_string.obj $(SLO)$/test_string_noadditional.obj
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(COMPHELPERLIB)
+SHL1VERSIONMAP = ..$/version.map
+SHL1IMPLIB = i$(SHL1TARGET)
+DEF1NAME = $(SHL1TARGET)
+
+SLOFILES = $(SHL1OBJS)
+
+.INCLUDE: target.mk
+.INCLUDE: _cppunit.mk
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
new file mode 100644
index 0000000..aa733cf
--- /dev/null
+++ b/comphelper/qa/string/test_string.cxx
@@ -0,0 +1,287 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_comphelper.hxx"
+#include "sal/config.h"
+
+#include "comphelper/string.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/i18n/CharType.hpp>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+namespace {
+
+class TestString: public CppUnit::TestFixture
+{
+public:
+ void test();
+ void testNatural();
+
+ CPPUNIT_TEST_SUITE(TestString);
+ CPPUNIT_TEST(test);
+ CPPUNIT_TEST(testNatural);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+void TestString::test()
+{
+ rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("foobarbar"));
+ sal_Int32 n1;
+ rtl::OUString s2(
+ comphelper::string::searchAndReplaceAsciiL(
+ s1, RTL_CONSTASCII_STRINGPARAM("bar"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baaz")), 0, &n1));
+ CPPUNIT_ASSERT(
+ s2 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbar")));
+ CPPUNIT_ASSERT(n1 == 3);
+ sal_Int32 n2;
+ rtl::OUString s3(
+ comphelper::string::searchAndReplaceAsciiL(
+ s2, RTL_CONSTASCII_STRINGPARAM("bar"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bz")),
+ n1 + RTL_CONSTASCII_LENGTH("baaz"), &n2));
+ CPPUNIT_ASSERT(
+ s3 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbz")));
+ CPPUNIT_ASSERT(n2 == 7);
+ sal_Int32 n3;
+ rtl::OUString s4(
+ comphelper::string::searchAndReplaceAsciiL(
+ s3, RTL_CONSTASCII_STRINGPARAM("bar"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baz")),
+ n2 + RTL_CONSTASCII_LENGTH("bz"), &n3));
+ CPPUNIT_ASSERT(s4 == s3);
+ CPPUNIT_ASSERT(n3 == -1);
+}
+
+using namespace ::com::sun::star;
+
+class testCollator : public cppu::WeakImplHelper1< i18n::XCollator >
+{
+public:
+ virtual sal_Int32 SAL_CALL compareSubstring(
+ const rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
+ const rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException)
+ {
+ return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
+ }
+ virtual sal_Int32 SAL_CALL compareString(
+ const rtl::OUString& str1,
+ const rtl::OUString& str2) throw(uno::RuntimeException)
+ {
+ return str1.compareTo(str2);
+ }
+ virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
+ throw(uno::RuntimeException) {return 0;}
+ virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const rtl::OUString&,
+ const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;}
+ virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const rtl::OUString&,
+ const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {}
+ virtual uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
+ throw(uno::RuntimeException)
+ {
+ return uno::Sequence< rtl::OUString >();
+ }
+ virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const rtl::OUString&)
+ throw(uno::RuntimeException)
+ {
+ return uno::Sequence< sal_Int32 >();
+ }
+};
+
+#define IS_DIGIT(CHAR) (((CHAR) >= 48) && ((CHAR <= 57)))
+
+class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator >
+{
+public:
+ virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
+ throw(uno::RuntimeException) {return -1;}
+ virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
+ throw(uno::RuntimeException) {return -1;}
+
+ virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
+ { return i18n::Boundary(); }
+ virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
+ { return i18n::Boundary(); }
+ virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16, sal_Bool )
+ throw(uno::RuntimeException)
+ { return i18n::Boundary(); }
+
+ virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException)
+ { return false; }
+ virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32,
+ const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException)
+ { return false; }
+ virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32,
+ const lang::Locale& ) throw(uno::RuntimeException)
+ { return 0; }
+
+ virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString&, sal_Int32,
+ const lang::Locale& ) throw(uno::RuntimeException)
+ { return 0; }
+ virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32,
+ const lang::Locale& ) throw(uno::RuntimeException)
+ { return rText.getLength(); }
+
+ virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int32,
+ const i18n::LineBreakHyphenationOptions&,
+ const i18n::LineBreakUserOptions&)
+ throw(uno::RuntimeException)
+ {
+ return i18n::LineBreakResults();
+ }
+
+ virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 )
+ throw(uno::RuntimeException) { return -1; }
+ virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+ virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+ virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+ virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32,
+ sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+
+ virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+ virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+ const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
+ {
+ const sal_Unicode *pStr = rText.getStr()+nStartPos;
+ for (sal_Int16 nI = nStartPos; nI < rText.getLength(); ++nI)
+ {
+ if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
+ return nI;
+ else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
+ return nI;
+ ++pStr;
+ }
+ return -1;
+ }
+ virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32,
+ const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+ virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+ const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
+ {
+ const sal_Unicode *pStr = rText.getStr()+nStartPos;
+ for (sal_Int16 nI = nStartPos; nI < rText.getLength(); ++nI)
+ {
+ if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
+ return nI;
+ else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
+ return nI;
+ ++pStr;
+ }
+ return -1;
+ }
+};
+
+void TestString::testNatural()
+{
+ using namespace comphelper::string;
+
+ uno::Reference< i18n::XCollator > xCollator(new testCollator);
+ uno::Reference< i18n::XBreakIterator > xBI(new testBreakIterator);
+
+// --- Some generic tests to ensure we do not alter original behavior
+// outside what we want
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), xCollator, xBI, lang::Locale()) == 0
+ );
+ // Case sensitivity
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc"))), xCollator, xBI, lang::Locale()) < 0
+ );
+ // Reverse
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), xCollator, xBI, lang::Locale()) > 0
+ );
+ // First shorter
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongstring"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongerstring"))), xCollator, xBI, lang::Locale()) > 0
+ );
+ // Second shorter
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongerstring"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongstring"))), xCollator, xBI, lang::Locale()) < 0
+ );
+// -- Here we go on natural order, each one is followed by classic compare and the reverse comparison
+ // That's why we originally made the patch
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10"))), xCollator, xBI, lang::Locale()) < 0
+ );
+ // Original behavior
+ CPPUNIT_ASSERT(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10")))) > 0
+ );
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))), xCollator, xBI, lang::Locale()) > 0
+ );
+ // Harder
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th"))), xCollator, xBI, lang::Locale()) < 0
+ );
+ CPPUNIT_ASSERT(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th")))) > 0
+ );
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))), xCollator, xBI, lang::Locale()) > 0
+ );
+ // Hardest
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010"))), xCollator, xBI, lang::Locale()) < 0
+ );
+ CPPUNIT_ASSERT(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010")))) > 0
+ );
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))), xCollator, xBI, lang::Locale()) > 0
+ );
+ CPPUNIT_ASSERT(
+ compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("apple10apple"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("apple10apple"))), xCollator, xBI, lang::Locale()) == 0
+ );
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/string/test_string_noadditional.cxx b/comphelper/qa/string/test_string_noadditional.cxx
new file mode 100644
index 0000000..1abcc82
--- /dev/null
+++ b/comphelper/qa/string/test_string_noadditional.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <cppunit/plugin/TestPlugIn.h>
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
deleted file mode 100644
index aa733cf..0000000
--- a/comphelper/qa/test_string.cxx
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "precompiled_comphelper.hxx"
-#include "sal/config.h"
-
-#include "comphelper/string.hxx"
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/i18n/CharType.hpp>
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-
-namespace {
-
-class TestString: public CppUnit::TestFixture
-{
-public:
- void test();
- void testNatural();
-
- CPPUNIT_TEST_SUITE(TestString);
- CPPUNIT_TEST(test);
- CPPUNIT_TEST(testNatural);
- CPPUNIT_TEST_SUITE_END();
-};
-
-void TestString::test()
-{
- rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("foobarbar"));
- sal_Int32 n1;
- rtl::OUString s2(
- comphelper::string::searchAndReplaceAsciiL(
- s1, RTL_CONSTASCII_STRINGPARAM("bar"),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baaz")), 0, &n1));
- CPPUNIT_ASSERT(
- s2 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbar")));
- CPPUNIT_ASSERT(n1 == 3);
- sal_Int32 n2;
- rtl::OUString s3(
- comphelper::string::searchAndReplaceAsciiL(
- s2, RTL_CONSTASCII_STRINGPARAM("bar"),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bz")),
- n1 + RTL_CONSTASCII_LENGTH("baaz"), &n2));
- CPPUNIT_ASSERT(
- s3 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbz")));
- CPPUNIT_ASSERT(n2 == 7);
- sal_Int32 n3;
- rtl::OUString s4(
- comphelper::string::searchAndReplaceAsciiL(
- s3, RTL_CONSTASCII_STRINGPARAM("bar"),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baz")),
- n2 + RTL_CONSTASCII_LENGTH("bz"), &n3));
- CPPUNIT_ASSERT(s4 == s3);
- CPPUNIT_ASSERT(n3 == -1);
-}
-
-using namespace ::com::sun::star;
-
-class testCollator : public cppu::WeakImplHelper1< i18n::XCollator >
-{
-public:
- virtual sal_Int32 SAL_CALL compareSubstring(
- const rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
- const rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException)
- {
- return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
- }
- virtual sal_Int32 SAL_CALL compareString(
- const rtl::OUString& str1,
- const rtl::OUString& str2) throw(uno::RuntimeException)
- {
- return str1.compareTo(str2);
- }
- virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
- throw(uno::RuntimeException) {return 0;}
- virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const rtl::OUString&,
- const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;}
- virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const rtl::OUString&,
- const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {}
- virtual uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
- throw(uno::RuntimeException)
- {
- return uno::Sequence< rtl::OUString >();
- }
- virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const rtl::OUString&)
- throw(uno::RuntimeException)
- {
- return uno::Sequence< sal_Int32 >();
- }
-};
-
-#define IS_DIGIT(CHAR) (((CHAR) >= 48) && ((CHAR <= 57)))
-
-class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator >
-{
-public:
- virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
- throw(uno::RuntimeException) {return -1;}
- virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
- throw(uno::RuntimeException) {return -1;}
-
- virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
- { return i18n::Boundary(); }
- virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
- { return i18n::Boundary(); }
- virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Bool )
- throw(uno::RuntimeException)
- { return i18n::Boundary(); }
-
- virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException)
- { return false; }
- virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32,
- const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException)
- { return false; }
- virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32,
- const lang::Locale& ) throw(uno::RuntimeException)
- { return 0; }
-
- virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString&, sal_Int32,
- const lang::Locale& ) throw(uno::RuntimeException)
- { return 0; }
- virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32,
- const lang::Locale& ) throw(uno::RuntimeException)
- { return rText.getLength(); }
-
- virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int32,
- const i18n::LineBreakHyphenationOptions&,
- const i18n::LineBreakUserOptions&)
- throw(uno::RuntimeException)
- {
- return i18n::LineBreakResults();
- }
-
- virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 )
- throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException) { return -1; }
-
- virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
- const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
- {
- const sal_Unicode *pStr = rText.getStr()+nStartPos;
- for (sal_Int16 nI = nStartPos; nI < rText.getLength(); ++nI)
- {
- if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
- return nI;
- else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
- return nI;
- ++pStr;
- }
- return -1;
- }
- virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32,
- const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
- virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
- const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
- {
- const sal_Unicode *pStr = rText.getStr()+nStartPos;
- for (sal_Int16 nI = nStartPos; nI < rText.getLength(); ++nI)
- {
- if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
- return nI;
- else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
- return nI;
- ++pStr;
- }
- return -1;
- }
-};
-
-void TestString::testNatural()
-{
- using namespace comphelper::string;
-
- uno::Reference< i18n::XCollator > xCollator(new testCollator);
- uno::Reference< i18n::XBreakIterator > xBI(new testBreakIterator);
-
-// --- Some generic tests to ensure we do not alter original behavior
-// outside what we want
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), xCollator, xBI, lang::Locale()) == 0
- );
- // Case sensitivity
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc"))), xCollator, xBI, lang::Locale()) < 0
- );
- // Reverse
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), xCollator, xBI, lang::Locale()) > 0
- );
- // First shorter
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongstring"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongerstring"))), xCollator, xBI, lang::Locale()) > 0
- );
- // Second shorter
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongerstring"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongstring"))), xCollator, xBI, lang::Locale()) < 0
- );
-// -- Here we go on natural order, each one is followed by classic compare and the reverse comparison
- // That's why we originally made the patch
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10"))), xCollator, xBI, lang::Locale()) < 0
- );
- // Original behavior
- CPPUNIT_ASSERT(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10")))) > 0
- );
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))), xCollator, xBI, lang::Locale()) > 0
- );
- // Harder
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th"))), xCollator, xBI, lang::Locale()) < 0
- );
- CPPUNIT_ASSERT(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th")))) > 0
- );
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))), xCollator, xBI, lang::Locale()) > 0
- );
- // Hardest
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010"))), xCollator, xBI, lang::Locale()) < 0
- );
- CPPUNIT_ASSERT(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010")))) > 0
- );
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))), xCollator, xBI, lang::Locale()) > 0
- );
- CPPUNIT_ASSERT(
- compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("apple10apple"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("apple10apple"))), xCollator, xBI, lang::Locale()) == 0
- );
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
deleted file mode 100644
index cc5373d..0000000
--- a/comphelper/qa/test_weakbag.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "precompiled_comphelper.hxx"
-#include "sal/config.h"
-
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "comphelper/weakbag.hxx"
-#include "cppuhelper/weak.hxx"
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-namespace {
-
-namespace css = com::sun::star;
-
-class Test: public CppUnit::TestFixture {
-public:
- void test() {
- css::uno::Reference< css::uno::XInterface > ref1(new cppu::OWeakObject);
- css::uno::Reference< css::uno::XInterface > ref2(new cppu::OWeakObject);
- css::uno::Reference< css::uno::XInterface > ref3(new cppu::OWeakObject);
- comphelper::WeakBag< css::uno::XInterface > bag;
- bag.add(ref1);
- bag.add(ref1);
- bag.add(ref2);
- bag.add(ref2);
- ref1.clear();
- bag.add(ref3);
- ref3.clear();
- CPPUNIT_ASSERT_MESSAGE("remove first ref2", bag.remove() == ref2);
- CPPUNIT_ASSERT_MESSAGE("remove second ref2", bag.remove() == ref2);
- CPPUNIT_ASSERT_MESSAGE("remove first null", !bag.remove().is());
- CPPUNIT_ASSERT_MESSAGE("remove second null", !bag.remove().is());
- }
-
- CPPUNIT_TEST_SUITE(Test);
- CPPUNIT_TEST(test);
- CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(Test);
-
-}
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/weakbag/makefile.mk b/comphelper/qa/weakbag/makefile.mk
new file mode 100644
index 0000000..606373c
--- /dev/null
+++ b/comphelper/qa/weakbag/makefile.mk
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ := ..$/..
+PRJNAME := comphelper
+TARGET := qa
+
+ENABLE_EXCEPTIONS := TRUE
+
+.INCLUDE: settings.mk
+.INCLUDE : $(PRJ)$/version.mk
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+DLLPRE = # no leading "lib" on .so files
+
+INCPRE += $(MISC)$/$(TARGET)$/inc
+
+SHL1TARGET = $(TARGET)_weakbag
+SHL1OBJS = $(SLO)$/test_weakbag.obj $(SLO)$/test_weakbag_noadditional.obj
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(COMPHELPERLIB)
+SHL1VERSIONMAP = ..$/version.map
+SHL1IMPLIB = i$(SHL1TARGET)
+DEF1NAME = $(SHL1TARGET)
+
+SLOFILES = $(SHL1OBJS)
+
+.INCLUDE: target.mk
+.INCLUDE: _cppunit.mk
diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx
new file mode 100644
index 0000000..84767f0
--- /dev/null
+++ b/comphelper/qa/weakbag/test_weakbag.cxx
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_comphelper.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "comphelper/weakbag.hxx"
+#include "cppuhelper/weak.hxx"
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Test: public CppUnit::TestFixture {
+public:
+ void test() {
+ css::uno::Reference< css::uno::XInterface > ref1(new cppu::OWeakObject);
+ css::uno::Reference< css::uno::XInterface > ref2(new cppu::OWeakObject);
+ css::uno::Reference< css::uno::XInterface > ref3(new cppu::OWeakObject);
+ comphelper::WeakBag< css::uno::XInterface > bag;
+ bag.add(ref1);
+ bag.add(ref1);
+ bag.add(ref2);
+ bag.add(ref2);
+ ref1.clear();
+ bag.add(ref3);
+ ref3.clear();
+ CPPUNIT_ASSERT_MESSAGE("remove first ref2", bag.remove() == ref2);
+ CPPUNIT_ASSERT_MESSAGE("remove second ref2", bag.remove() == ref2);
+ CPPUNIT_ASSERT_MESSAGE("remove first null", !bag.remove().is());
+ CPPUNIT_ASSERT_MESSAGE("remove second null", !bag.remove().is());
+ }
+
+ CPPUNIT_TEST_SUITE(Test);
+ CPPUNIT_TEST(test);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
new file mode 100644
index 0000000..1abcc82
--- /dev/null
+++ b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <cppunit/plugin/TestPlugIn.h>
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 899df094017c479a32e19e751ccb7b1058c032a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 16 08:50:51 2011 +0000
clear windows warning, struct vs class
diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx
index 24f5178..c015d6b 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -43,7 +43,7 @@ namespace basegfx
{
namespace tools
{
- struct ImplB2DClipState
+ class ImplB2DClipState
{
public:
enum Operation {UNION, INTERSECT, XOR, SUBTRACT};
More information about the Libreoffice-commits
mailing list