Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 475 insertions, 0 deletions

diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx
new file mode 100644
index 000000000..db904e2fb
--- /dev/null
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -0,0 +1,144 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/types.h>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <comphelper/interfacecontainer2.hxx>
+#include <cppuhelper/implbase.hxx>
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+
+namespace {
+
+struct ContainerStats {
+    int m_nAlive;
+    int m_nDisposed;
+    ContainerStats() : m_nAlive(0), m_nDisposed(0) {}
+};
+
+class ContainerListener : public cppu::WeakImplHelper< XEventListener >
+{
+    ContainerStats * const m_pStats;
+public:
+    explicit ContainerListener(ContainerStats *pStats)
+        : m_pStats(pStats) { m_pStats->m_nAlive++; }
+    virtual ~ContainerListener() override { m_pStats->m_nAlive--; }
+    virtual void SAL_CALL disposing( const EventObject& ) override
+    {
+        m_pStats->m_nDisposed++;
+    }
+};
+
+}
+
+namespace comphelper_ifcontainer
+{
+    const int nTests = 10;
+    class IfTest : public CppUnit::TestFixture
+    {
+        osl::Mutex m_aGuard;
+    public:
+        void testCreateDispose()
+        {
+            ContainerStats aStats;
+            comphelper::OInterfaceContainerHelper2 *pContainer;
+
+            pContainer = new comphelper::OInterfaceContainerHelper2(m_aGuard);
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty container not empty",
+                                   static_cast<sal_Int32>(0), pContainer->getLength());
+
+            int i;
+            for (i = 0; i < nTests; i++)
+            {
+                Reference<XEventListener> xRef = new ContainerListener(&aStats);
+                int nNewLen = pContainer->addInterface(xRef);
+
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("addition length mismatch",
+                                       i + 1, nNewLen);
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("addition length mismatch",
+                                       static_cast<sal_Int32>(i + 1), pContainer->getLength());
+            }
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("alive count mismatch",
+                                   nTests, aStats.m_nAlive);
+
+            EventObject aObj;
+            pContainer->disposeAndClear(aObj);
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("dispose count mismatch",
+                                   nTests, aStats.m_nDisposed);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("leaked container left alive",
+                                   0, aStats.m_nAlive);
+
+            delete pContainer;
+        }
+
+        void testEnumerate()
+        {
+            int i;
+            ContainerStats aStats;
+            comphelper::OInterfaceContainerHelper2 *pContainer;
+            pContainer = new comphelper::OInterfaceContainerHelper2(m_aGuard);
+
+            std::vector< Reference< XEventListener > > aListeners;
+            for (i = 0; i < nTests; i++)
+            {
+                Reference<XEventListener> xRef = new ContainerListener(&aStats);
+                pContainer->addInterface(xRef);
+                aListeners.push_back(xRef);
+            }
+            std::vector< Reference< XInterface > > aElements = pContainer->getElements();
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("query contents",
+                                   nTests, static_cast<int>(aElements.size()));
+            if (aElements.size() == nTests)
+            {
+                for (i = 0; i < nTests; i++)
+                {
+                    CPPUNIT_ASSERT_MESSAGE("mismatching elements",
+                                           bool(aElements[i] == aListeners[i]));
+                }
+            }
+            pContainer->clear();
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("non-empty container post clear",
+                                   static_cast<sal_Int32>(0), pContainer->getLength());
+            delete pContainer;
+        }
+
+        // Automatic registration code
+        CPPUNIT_TEST_SUITE(IfTest);
+        CPPUNIT_TEST(testCreateDispose);
+        CPPUNIT_TEST(testEnumerate);
+        CPPUNIT_TEST_SUITE_END();
+    };
+} // namespace cppu_ifcontainer
+
+CPPUNIT_TEST_SUITE_REGISTRATION(comphelper_ifcontainer::IfTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/container/testifcontainer.cxx b/comphelper/qa/container/testifcontainer.cxx
new file mode 100644
index 000000000..d096b8fd8
--- /dev/null
+++ b/comphelper/qa/container/testifcontainer.cxx
@@ -0,0 +1,161 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <osl/mutex.hxx>
+#include <comphelper/interfacecontainer2.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <com/sun/star/beans/XVetoableChangeListener.hpp>
+
+using namespace ::osl;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+
+class TestInterfaceContainer2: public CppUnit::TestFixture
+{
+public:
+    void test1();
+
+    CPPUNIT_TEST_SUITE(TestInterfaceContainer2);
+    CPPUNIT_TEST(test1);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener >
+{
+public:
+    // Methods
+    virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) override
+        {
+
+        }
+
+    virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) override
+        {
+
+        }
+};
+
+void TestInterfaceContainer2::test1()
+{
+    Mutex mutex;
+
+    {
+        comphelper::OInterfaceContainerHelper2 helper( mutex );
+
+        Reference< XVetoableChangeListener > r1 = new TestListener;
+        Reference< XVetoableChangeListener > r2 = new TestListener;
+        Reference< XVetoableChangeListener > r3 = new TestListener;
+
+        helper.addInterface( r1 );
+        helper.addInterface( r2 );
+        helper.addInterface( r3 );
+
+        helper.disposeAndClear( EventObject() );
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper2 helper( mutex );
+
+        Reference< XVetoableChangeListener > r1 = new TestListener;
+        Reference< XVetoableChangeListener > r2 = new TestListener;
+        Reference< XVetoableChangeListener > r3 = new TestListener;
+
+        helper.addInterface( r1 );
+        helper.addInterface( r2 );
+        helper.addInterface( r3 );
+
+        comphelper::OInterfaceIteratorHelper2 iterator( helper );
+
+        while( iterator.hasMoreElements() )
+            static_cast<XVetoableChangeListener*>(iterator.next())->vetoableChange( PropertyChangeEvent() );
+
+        helper.disposeAndClear( EventObject() );
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper2 helper( mutex );
+
+        Reference< XVetoableChangeListener > r1 = new TestListener;
+        Reference< XVetoableChangeListener > r2 = new TestListener;
+        Reference< XVetoableChangeListener > r3 = new TestListener;
+
+        helper.addInterface( r1 );
+        helper.addInterface( r2 );
+        helper.addInterface( r3 );
+
+        comphelper::OInterfaceIteratorHelper2 iterator( helper );
+
+        static_cast<XVetoableChangeListener*>(iterator.next())->vetoableChange( PropertyChangeEvent() );
+        iterator.remove();
+        static_cast<XVetoableChangeListener*>(iterator.next())->vetoableChange( PropertyChangeEvent() );
+        iterator.remove();
+        static_cast<XVetoableChangeListener*>(iterator.next())->vetoableChange( PropertyChangeEvent() );
+        iterator.remove();
+
+        CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), helper.getLength() );
+        helper.disposeAndClear( EventObject() );
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper2 helper( mutex );
+
+        Reference< XVetoableChangeListener > r1 = new TestListener;
+        Reference< XVetoableChangeListener > r2 = new TestListener;
+        Reference< XVetoableChangeListener > r3 = new TestListener;
+
+        helper.addInterface( r1 );
+        helper.addInterface( r2 );
+        helper.addInterface( r3 );
+
+        {
+            comphelper::OInterfaceIteratorHelper2 iterator( helper );
+            while( iterator.hasMoreElements() )
+            {
+                Reference< XVetoableChangeListener > r = static_cast<XVetoableChangeListener*>(iterator.next());
+                if( r == r1 )
+                    iterator.remove();
+            }
+        }
+        CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), helper.getLength() );
+        {
+            comphelper::OInterfaceIteratorHelper2 iterator( helper );
+            while( iterator.hasMoreElements() )
+            {
+                Reference< XVetoableChangeListener > r = static_cast<XVetoableChangeListener*>(iterator.next());
+                CPPUNIT_ASSERT( r != r1 );
+                CPPUNIT_ASSERT( r == r2 || r == r3 );
+            }
+        }
+
+        helper.disposeAndClear( EventObject() );
+    }
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestInterfaceContainer2);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/container/testifcontainer3.cxx b/comphelper/qa/container/testifcontainer3.cxx
new file mode 100644
index 000000000..e300adeda
--- /dev/null
+++ b/comphelper/qa/container/testifcontainer3.cxx
@@ -0,0 +1,170 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <osl/mutex.hxx>
+#include <comphelper/interfacecontainer3.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <com/sun/star/beans/XVetoableChangeListener.hpp>
+
+using namespace ::osl;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+class TestInterfaceContainer3 : public CppUnit::TestFixture
+{
+public:
+    void test1();
+
+    CPPUNIT_TEST_SUITE(TestInterfaceContainer3);
+    CPPUNIT_TEST(test1);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+class TestListener : public cppu::WeakImplHelper<XVetoableChangeListener>
+{
+public:
+    // Methods
+    virtual void SAL_CALL disposing(const css::lang::EventObject& /*Source*/) override {}
+
+    virtual void SAL_CALL vetoableChange(const css::beans::PropertyChangeEvent& /*aEvent*/) override
+    {
+    }
+};
+
+void TestInterfaceContainer3::test1()
+{
+    Mutex mutex;
+
+    {
+        comphelper::OInterfaceContainerHelper3<XVetoableChangeListener> helper(mutex);
+
+        Reference<XVetoableChangeListener> r1 = new TestListener;
+        Reference<XVetoableChangeListener> r2 = new TestListener;
+        Reference<XVetoableChangeListener> r3 = new TestListener;
+
+        helper.addInterface(r1);
+        helper.addInterface(r2);
+        helper.addInterface(r3);
+
+        helper.disposeAndClear(EventObject());
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper3<XVetoableChangeListener> helper(mutex);
+
+        Reference<XVetoableChangeListener> r1 = new TestListener;
+        Reference<XVetoableChangeListener> r2 = new TestListener;
+        Reference<XVetoableChangeListener> r3 = new TestListener;
+
+        helper.addInterface(r1);
+        helper.addInterface(r2);
+        helper.addInterface(r3);
+
+        comphelper::OInterfaceIteratorHelper3 iterator(helper);
+
+        while (iterator.hasMoreElements())
+            iterator.next()->vetoableChange(PropertyChangeEvent());
+
+        helper.disposeAndClear(EventObject());
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper3<XVetoableChangeListener> helper(mutex);
+
+        Reference<XVetoableChangeListener> r1 = new TestListener;
+        Reference<XVetoableChangeListener> r2 = new TestListener;
+        Reference<XVetoableChangeListener> r3 = new TestListener;
+
+        helper.addInterface(r1);
+        helper.addInterface(r2);
+        helper.addInterface(r3);
+
+        comphelper::OInterfaceIteratorHelper3 iterator(helper);
+
+        iterator.next()->vetoableChange(PropertyChangeEvent());
+        iterator.remove();
+        iterator.next()->vetoableChange(PropertyChangeEvent());
+        iterator.remove();
+        iterator.next()->vetoableChange(PropertyChangeEvent());
+        iterator.remove();
+
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), helper.getLength());
+        helper.disposeAndClear(EventObject());
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper3<XVetoableChangeListener> helper(mutex);
+
+        Reference<XVetoableChangeListener> r1 = new TestListener;
+        Reference<XVetoableChangeListener> r2 = new TestListener;
+        Reference<XVetoableChangeListener> r3 = new TestListener;
+
+        helper.addInterface(r1);
+        helper.addInterface(r2);
+        helper.addInterface(r3);
+
+        {
+            comphelper::OInterfaceIteratorHelper3 iterator(helper);
+            while (iterator.hasMoreElements())
+            {
+                Reference<XVetoableChangeListener> r = iterator.next();
+                if (r == r1)
+                    iterator.remove();
+            }
+        }
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), helper.getLength());
+        {
+            comphelper::OInterfaceIteratorHelper3 iterator(helper);
+            while (iterator.hasMoreElements())
+            {
+                Reference<XVetoableChangeListener> r = iterator.next();
+                CPPUNIT_ASSERT(r != r1);
+                CPPUNIT_ASSERT(r == r2 || r == r3);
+            }
+        }
+
+        helper.disposeAndClear(EventObject());
+    }
+
+    {
+        comphelper::OInterfaceContainerHelper3<XVetoableChangeListener> helper(mutex);
+
+        Reference<XVetoableChangeListener> r1 = new TestListener;
+
+        helper.addInterface(r1);
+
+        {
+            comphelper::OInterfaceIteratorHelper3 iterator(helper);
+            iterator.next();
+            iterator.remove();
+        }
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), helper.getLength());
+    }
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestInterfaceContainer3);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */