From 1b973485e63717e875347f0ad33c8137f4bc05c7 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 25 Jan 2012 00:29:10 +0100 Subject: add XNamed interface test and add this test to ScDataPilotTableObj --- sc/qa/extras/scdatapilottableobj.cxx | 16 ++++++++-- test/Library_subsequenttest.mk | 1 + test/Package_inc.mk | 1 + test/inc/test/container/xnamed.hxx | 53 ++++++++++++++++++++++++++++++++ test/source/container/xnamed.cxx | 58 ++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 test/inc/test/container/xnamed.hxx create mode 100644 test/source/container/xnamed.cxx diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index a09eb6eb1329..0d1cf40a37f7 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -38,11 +39,14 @@ namespace sc_apitest { -#define NUMBER_OF_TESTS 10 +#define NUMBER_OF_TESTS 12 -class ScDataPilotTableObj : public UnoApiTest, apitest::XDataPilotDescriptor, apitest::XDataPilotTable +class ScDataPilotTableObj : public UnoApiTest, apitest::XDataPilotDescriptor, apitest::XDataPilotTable, + apitest::XNamed { public: + ScDataPilotTableObj(); + virtual void setUp(); virtual void tearDown(); virtual uno::Reference< uno::XInterface > init(); @@ -59,6 +63,8 @@ public: CPPUNIT_TEST(testGetRowFields); CPPUNIT_TEST(testGetPageFields); CPPUNIT_TEST(testGetDataFields); + CPPUNIT_TEST(testGetName); + CPPUNIT_TEST(testSetName); CPPUNIT_TEST_SUITE_END(); private: @@ -69,6 +75,12 @@ private: sal_Int32 ScDataPilotTableObj::nTest = 0; uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent; +ScDataPilotTableObj::ScDataPilotTableObj() + : apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))) +{ + +} + uno::Reference< uno::XInterface > ScDataPilotTableObj::init() { rtl::OUString aFileURL; diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index d1c383dde290..675a7e2e18e8 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/container/xelementaccess \ test/source/container/xindexaccess \ test/source/container/xnamecontainer \ + test/source/container/xnamed \ test/source/sheet/cellproperties \ test/source/sheet/datapilotfield \ test/source/sheet/xcellrangesquery \ diff --git a/test/Package_inc.mk b/test/Package_inc.mk index 666a52b13939..e50f358cbea0 100644 --- a/test/Package_inc.mk +++ b/test/Package_inc.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xnamedranges.hxx,test/ $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xnamedrange.hxx,test/sheet/xnamedrange.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatabaserange.hxx,test/sheet/xdatabaserange.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/container/xelementaccess.hxx,test/container/xelementaccess.hxx)) +$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamed.hxx,test/container/xnamed.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/container/xindexaccess.hxx,test/container/xindexaccess.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx,test/container/xnamecontainer.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx)) diff --git a/test/inc/test/container/xnamed.hxx b/test/inc/test/container/xnamed.hxx new file mode 100644 index 000000000000..39445822c51c --- /dev/null +++ b/test/inc/test/container/xnamed.hxx @@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Markus Mohrhard (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include +#include +#include + +using namespace com::sun::star; + +namespace apitest { + +class OOO_DLLPUBLIC_TEST XNamed +{ +public: + XNamed(const rtl::OUString& rName): maName(rName) {} + + void testGetName(); + void testSetName(); + + virtual uno::Reference< uno::XInterface > init() = 0; +private: + rtl::OUString maName; + +}; + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx new file mode 100644 index 000000000000..1de01cbc5906 --- /dev/null +++ b/test/source/container/xnamed.cxx @@ -0,0 +1,58 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Markus Mohrhard (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include +#include +#include "cppunit/extensions/HelperMacros.h" + +using namespace com::sun::star::uno; + +namespace apitest { + +void XNamed::testGetName() +{ + uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); + CPPUNIT_ASSERT( maName == xNamed->getName() ); +} + +void XNamed::testSetName() +{ + uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); + rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("NewName")); + + xNamed->setName(aName); + CPPUNIT_ASSERT( aName == xNamed->getName() ); + + // restore old name + xNamed->setName(maName); + CPPUNIT_ASSERT(maName == xNamed->getName()); +} + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit