include/test/document/xactionlockable.hxx | 36 +++++++++++++++++++++++ sc/qa/extras/scnamedrangesobj.cxx | 15 +++++++++ test/Library_subsequenttest.mk | 1 test/source/document/xactionlockable.cxx | 46 ++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+)
New commits: commit 8968e648113820308f5201da723d52d3fbbb09af Author: Jens Carl <j.car...@gmx.de> AuthorDate: Sat Jan 26 02:16:16 2019 +0000 Commit: Jens Carl <j.car...@gmx.de> CommitDate: Sat Jan 26 07:01:00 2019 +0100 Add XActionLockable tests to ScNamedRangesObj Change-Id: Ibadda3535294fb58ea371e00357da8cd504d5f9a Reviewed-on: https://gerrit.libreoffice.org/66953 Tested-by: Jenkins Reviewed-by: Jens Carl <j.car...@gmx.de> diff --git a/include/test/document/xactionlockable.hxx b/include/test/document/xactionlockable.hxx new file mode 100644 index 000000000000..c1a76373bc23 --- /dev/null +++ b/include/test/document/xactionlockable.hxx @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#ifndef INCLUDED_TEST_DOCUMENT_XACTIONLOCKABLE_HXX +#define INCLUDED_TEST_DOCUMENT_XACTIONLOCKABLE_HXX + +#include <com/sun/star/uno/XInterface.hpp> + +#include <com/sun/star/uno/Reference.hxx> + +#include <test/testdllapi.hxx> + +namespace apitest +{ +class OOO_DLLPUBLIC_TEST XActionLockable +{ +public: + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + + void testAddRemoveActionLock(); + void testSetResetActionLock(); + +protected: + ~XActionLockable(){}; +}; +} // namespace apitest + +#endif // INCLUDED_TEST_DOCUMENT_XACTIONLOCKABLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index 4a0c4a304a35..1b61fa098262 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -13,6 +13,7 @@ #include <test/container/xenumerationaccess.hxx> #include <test/container/xindexaccess.hxx> #include <test/container/xnameaccess.hxx> +#include <test/document/xactionlockable.hxx> #include <test/lang/xserviceinfo.hxx> #include <test/sheet/xnamedranges.hxx> @@ -32,6 +33,7 @@ using namespace css::uno; namespace sc_apitest { class ScNamedRangesObj : public CalcUnoApiTest, + public apitest::XActionLockable, public apitest::XElementAccess, public apitest::XEnumerationAccess, public apitest::XIndexAccess, @@ -51,6 +53,10 @@ public: CPPUNIT_TEST_SUITE(ScNamedRangesObj); + // XActionLockable + CPPUNIT_TEST(testAddRemoveActionLock); + CPPUNIT_TEST(testSetResetActionLock); + // XElementAccess CPPUNIT_TEST(testGetElementType); CPPUNIT_TEST(testHasElements); diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index e3f3bce700bb..1269f3771f81 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/container/xnamecontainer \ test/source/container/xnamed \ test/source/container/xnamereplace \ + test/source/document/xactionlockable \ test/source/document/xembeddedobjectsupplier \ test/source/document/xlinktargetsupplier \ test/source/drawing/captionshape \ diff --git a/test/source/document/xactionlockable.cxx b/test/source/document/xactionlockable.cxx new file mode 100644 index 000000000000..7a2380f49608 --- /dev/null +++ b/test/source/document/xactionlockable.cxx @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#include <test/document/xactionlockable.hxx> +#include <sal/types.h> + +#include <com/sun/star/document/XActionLockable.hpp> + +#include <com/sun/star/uno/Reference.hxx> + +#include <cppunit/extensions/HelperMacros.h> + +using namespace css; + +namespace apitest +{ +void XActionLockable::testAddRemoveActionLock() +{ + uno::Reference<document::XActionLockable> xAL(init(), uno::UNO_QUERY_THROW); + + xAL->addActionLock(); + CPPUNIT_ASSERT(xAL->isActionLocked()); + + xAL->removeActionLock(); + CPPUNIT_ASSERT(!xAL->isActionLocked()); +} + +void XActionLockable::testSetResetActionLock() +{ + uno::Reference<document::XActionLockable> xAL(init(), uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT_NO_THROW(xAL->setActionLocks(0)); + + const sal_Int16 nLocks = xAL->resetActionLocks(); + CPPUNIT_ASSERT_EQUAL(sal_Int16(0), nLocks); + CPPUNIT_ASSERT(!xAL->isActionLocked()); +} +} // namespace apitest + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ commit b9f12df1d0346d9c7beccd9c5fcff5d50354be55 Author: Jens Carl <j.car...@gmx.de> AuthorDate: Sat Jan 26 01:46:50 2019 +0000 Commit: Jens Carl <j.car...@gmx.de> CommitDate: Sat Jan 26 07:00:51 2019 +0100 Add XPropertySet tests to ScNamedRangesObj Change-Id: Ia591ab4657ce2e2020ca2328c65702599a70c691 Reviewed-on: https://gerrit.libreoffice.org/66952 Tested-by: Jenkins Reviewed-by: Jens Carl <j.car...@gmx.de> diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index fa387155d784..4a0c4a304a35 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -8,6 +8,7 @@ */ #include <test/calc_unoapi_test.hxx> +#include <test/beans/xpropertyset.hxx> #include <test/container/xelementaccess.hxx> #include <test/container/xenumerationaccess.hxx> #include <test/container/xindexaccess.hxx> @@ -36,6 +37,7 @@ class ScNamedRangesObj : public CalcUnoApiTest, public apitest::XIndexAccess, public apitest::XNameAccess, public apitest::XNamedRanges, + public apitest::XPropertySet, public apitest::XServiceInfo { public: @@ -71,6 +73,13 @@ public: //CPPUNIT_TEST_EXCEPTION(testRemoveByName, uno::RuntimeException); CPPUNIT_TEST(testOutputList); + // XPropertySet + CPPUNIT_TEST(testGetPropertySetInfo); + CPPUNIT_TEST(testGetPropertyValue); + CPPUNIT_TEST(testSetPropertyValue); + CPPUNIT_TEST(testPropertyChangeListener); + CPPUNIT_TEST(testVetoableChangeListener); + // XServiceInfo CPPUNIT_TEST(testGetImplementationName); CPPUNIT_TEST(testGetSupportedServiceNames); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits