Kaydet (Commit) 412fbb6f authored tarafından Jens Carl's avatar Jens Carl

tdf#45904 Move XEnumerationAccess Java test to C++

Move XEnumerationAccess Java test to C++ for ScNamedRangesObj.

Change-Id: Ia19281b8e481eda2535eb6f26c60dedc65f1beec
Reviewed-on: https://gerrit.libreoffice.org/66933
Tested-by: Jenkins
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 3424004c
...@@ -10,23 +10,33 @@ ...@@ -10,23 +10,33 @@
#ifndef INCLUDED_TEST_SHEET_XNAMEDRANGES_HXX #ifndef INCLUDED_TEST_SHEET_XNAMEDRANGES_HXX
#define INCLUDED_TEST_SHEET_XNAMEDRANGES_HXX #define INCLUDED_TEST_SHEET_XNAMEDRANGES_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <test/testdllapi.hxx>
namespace apitest { #include <com/sun/star/uno/Reference.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <test/testdllapi.hxx>
namespace apitest
{
class OOO_DLLPUBLIC_TEST XNamedRanges class OOO_DLLPUBLIC_TEST XNamedRanges
{ {
public: public:
// remove default entry // remove default entry
XNamedRanges(); XNamedRanges()
// removes given entry : maNameToRemove("initial1")
XNamedRanges(const OUString& rNameToRemove); {
}
virtual ~XNamedRanges(); // removes given entry
XNamedRanges(const OUString& rNameToRemove)
: maNameToRemove(rNameToRemove)
{
}
virtual css::uno::Reference< css::uno::XInterface > init(sal_Int32 nSheets = 0) = 0; virtual css::uno::Reference<css::uno::XInterface> init() = 0;
virtual css::uno::Reference<css::uno::XInterface> getXNamedRanges(sal_Int32 nSheet = 0) = 0;
// XNamedRanges // XNamedRanges
void testAddNewByName(); void testAddNewByName();
...@@ -35,13 +45,14 @@ public: ...@@ -35,13 +45,14 @@ public:
void testOutputList(); void testOutputList();
protected: protected:
css::uno::Reference< css::sheet::XSpreadsheet > xSheet; ~XNamedRanges(){};
css::uno::Reference<css::sheet::XSpreadsheet> xSheet;
private: private:
OUString const maNameToRemove; OUString const maNameToRemove;
}; };
} } // namespace apitest
#endif // INCLUDED_TEST_SHEET_XNAMEDRANGES_HXX #endif // INCLUDED_TEST_SHEET_XNAMEDRANGES_HXX
......
...@@ -5,4 +5,3 @@ ...@@ -5,4 +5,3 @@
"ScNamedRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()" "ScNamedRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScNamedRangesObj";"com::sun::star::container::XElementAccess";"getElementType()" "ScNamedRangesObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScNamedRangesObj";"com::sun::star::container::XElementAccess";"hasElements()" "ScNamedRangesObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScNamedRangesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
...@@ -8,18 +8,24 @@ ...@@ -8,18 +8,24 @@
*/ */
#include <test/calc_unoapi_test.hxx> #include <test/calc_unoapi_test.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xnamedranges.hxx> #include <test/sheet/xnamedranges.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XNamedRanges.hpp> #include <com/sun/star/sheet/XNamedRanges.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
using namespace css; using namespace css;
using namespace css::uno; using namespace css::uno;
namespace sc_apitest { namespace sc_apitest
{
class ScNamedRangesObj : public CalcUnoApiTest, public apitest::XNamedRanges class ScNamedRangesObj : public CalcUnoApiTest,
public apitest::XEnumerationAccess,
public apitest::XNamedRanges
{ {
public: public:
ScNamedRangesObj(); ScNamedRangesObj();
...@@ -27,10 +33,14 @@ public: ...@@ -27,10 +33,14 @@ public:
virtual void setUp() override; virtual void setUp() override;
virtual void tearDown() override; virtual void tearDown() override;
virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet = 0) override; virtual uno::Reference<uno::XInterface> init() override;
virtual uno::Reference<uno::XInterface> getXNamedRanges(sal_Int32 nSheet = 0) override;
CPPUNIT_TEST_SUITE(ScNamedRangesObj); CPPUNIT_TEST_SUITE(ScNamedRangesObj);
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
// XNamedRanges // XNamedRanges
CPPUNIT_TEST(testAddNewByName); CPPUNIT_TEST(testAddNewByName);
CPPUNIT_TEST(testAddNewFromTitles); CPPUNIT_TEST(testAddNewFromTitles);
...@@ -40,24 +50,37 @@ public: ...@@ -40,24 +50,37 @@ public:
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
uno::Reference< lang::XComponent > mxComponent; uno::Reference<lang::XComponent> mxComponent;
}; };
ScNamedRangesObj::ScNamedRangesObj() ScNamedRangesObj::ScNamedRangesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
} }
uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) uno::Reference<uno::XInterface> ScNamedRangesObj::init()
{ {
CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is()); uno::Reference<beans::XPropertySet> xPropSet(mxComponent, UNO_QUERY_THROW);
uno::Reference<sheet::XNamedRanges> xNamedRanges(xPropSet->getPropertyValue("NamedRanges"),
UNO_QUERY_THROW);
uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); //set value from xnamedranges.hxx
uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue("NamedRanges"), UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW);
xSheet.set(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
return xNamedRanges;
}
uno::Reference<uno::XInterface> ScNamedRangesObj::getXNamedRanges(sal_Int32 nSheet)
{
uno::Reference<beans::XPropertySet> xPropSet(mxComponent, UNO_QUERY_THROW);
uno::Reference<sheet::XNamedRanges> xNamedRanges(xPropSet->getPropertyValue("NamedRanges"),
UNO_QUERY_THROW);
//set value from xnamedranges.hxx //set value from xnamedranges.hxx
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
uno::Reference< container::XIndexAccess > xIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW);
xSheet.set(xIndexAccess->getByIndex(nSheet), UNO_QUERY_THROW); xSheet.set(xIndexAccess->getByIndex(nSheet), UNO_QUERY_THROW);
return xNamedRanges; return xNamedRanges;
...@@ -80,7 +103,7 @@ void ScNamedRangesObj::tearDown() ...@@ -80,7 +103,7 @@ void ScNamedRangesObj::tearDown()
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj); CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj);
} } // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
......
...@@ -7599,7 +7599,6 @@ include/test/sheet/xdatapilottable.hxx ...@@ -7599,7 +7599,6 @@ include/test/sheet/xdatapilottable.hxx
include/test/sheet/xdatapilottable2.hxx include/test/sheet/xdatapilottable2.hxx
include/test/sheet/xgoalseek.hxx include/test/sheet/xgoalseek.hxx
include/test/sheet/xnamedrange.hxx include/test/sheet/xnamedrange.hxx
include/test/sheet/xnamedranges.hxx
include/test/sheet/xprintareas.hxx include/test/sheet/xprintareas.hxx
include/test/sheet/xsheetannotation.hxx include/test/sheet/xsheetannotation.hxx
include/test/sheet/xsheetannotations.hxx include/test/sheet/xsheetannotations.hxx
...@@ -10146,7 +10145,6 @@ sc/qa/extras/sceditfieldobj-header.cxx ...@@ -10146,7 +10145,6 @@ sc/qa/extras/sceditfieldobj-header.cxx
sc/qa/extras/scfilterdescriptorbaseobj.cxx sc/qa/extras/scfilterdescriptorbaseobj.cxx
sc/qa/extras/scmodelobj.cxx sc/qa/extras/scmodelobj.cxx
sc/qa/extras/scnamedrangeobj.cxx sc/qa/extras/scnamedrangeobj.cxx
sc/qa/extras/scnamedrangesobj.cxx
sc/qa/extras/scoutlineobj.cxx sc/qa/extras/scoutlineobj.cxx
sc/qa/extras/scsubtotaldescriptorbaseobj.cxx sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
sc/qa/extras/scsubtotalfieldobj.cxx sc/qa/extras/scsubtotalfieldobj.cxx
...@@ -16588,7 +16586,6 @@ test/source/sheet/xdatapilottable.cxx ...@@ -16588,7 +16586,6 @@ test/source/sheet/xdatapilottable.cxx
test/source/sheet/xdatapilottable2.cxx test/source/sheet/xdatapilottable2.cxx
test/source/sheet/xgoalseek.cxx test/source/sheet/xgoalseek.cxx
test/source/sheet/xnamedrange.cxx test/source/sheet/xnamedrange.cxx
test/source/sheet/xnamedranges.cxx
test/source/sheet/xprintareas.cxx test/source/sheet/xprintareas.cxx
test/source/sheet/xsheetannotation.cxx test/source/sheet/xsheetannotation.cxx
test/source/sheet/xsheetannotations.cxx test/source/sheet/xsheetannotations.cxx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment