Kaydet (Commit) 0ee02fda authored tarafından Jens Carl's avatar Jens Carl

tdf#45904 Move XPropertySet Java tests to C++

Move XPropertySet Java tests to C++ for ScAreaLinkObj.

Change-Id: I4b0ef0870d2ac3aac474df2e8c7114470e0128e8
Reviewed-on: https://gerrit.libreoffice.org/68948
Tested-by: Jenkins
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst eb4a8a01
"ScAreaLinkObj";"com::sun::star::util::XRefreshable";"refresh()" "ScAreaLinkObj";"com::sun::star::util::XRefreshable";"refresh()"
"ScAreaLinkObj";"com::sun::star::util::XRefreshable";"addRefreshListener()" "ScAreaLinkObj";"com::sun::star::util::XRefreshable";"addRefreshListener()"
"ScAreaLinkObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()" "ScAreaLinkObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScAreaLinkObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
*/ */
#include <test/calc_unoapi_test.hxx> #include <test/calc_unoapi_test.hxx>
#include <test/beans/xpropertyset.hxx>
#include <test/sheet/cellarealink.hxx> #include <test/sheet/cellarealink.hxx>
#include <test/sheet/xarealink.hxx> #include <test/sheet/xarealink.hxx>
...@@ -18,21 +18,23 @@ ...@@ -18,21 +18,23 @@
#include <com/sun/star/sheet/XAreaLinks.hpp> #include <com/sun/star/sheet/XAreaLinks.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
using namespace css; using namespace css;
using namespace css::uno;
namespace sc_apitest {
class ScAreaLinkObj : public CalcUnoApiTest, public apitest::CellAreaLink, public apitest::XAreaLink namespace sc_apitest
{
class ScAreaLinkObj : public CalcUnoApiTest,
public apitest::CellAreaLink,
public apitest::XAreaLink,
public apitest::XPropertySet
{ {
public: public:
ScAreaLinkObj(); ScAreaLinkObj();
virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override; virtual void setUp() override;
virtual void tearDown() override; virtual void tearDown() override;
...@@ -51,11 +53,17 @@ public: ...@@ -51,11 +53,17 @@ public:
CPPUNIT_TEST(testSetSourceArea); CPPUNIT_TEST(testSetSourceArea);
CPPUNIT_TEST(testSetDestArea); CPPUNIT_TEST(testSetDestArea);
// XPropertySet
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
CPPUNIT_TEST(testSetPropertyValue);
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
uno::Reference< lang::XComponent > mxComponent; uno::Reference<lang::XComponent> m_xComponent;
}; };
ScAreaLinkObj::ScAreaLinkObj() ScAreaLinkObj::ScAreaLinkObj()
...@@ -63,35 +71,36 @@ ScAreaLinkObj::ScAreaLinkObj() ...@@ -63,35 +71,36 @@ ScAreaLinkObj::ScAreaLinkObj()
{ {
} }
uno::Reference< uno::XInterface > ScAreaLinkObj::init() uno::Reference<uno::XInterface> ScAreaLinkObj::init()
{ {
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
uno::Reference< beans::XPropertySet > xPropSet(xDoc, uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropSet(xDoc, uno::UNO_QUERY_THROW);
uno::Reference< sheet::XAreaLinks > xLinks(xPropSet->getPropertyValue("AreaLinks"), uno::UNO_QUERY_THROW); uno::Reference<sheet::XAreaLinks> xLinks(xPropSet->getPropertyValue("AreaLinks"),
uno::UNO_QUERY_THROW);
table::CellAddress aCellAddress(1, 2, 3); table::CellAddress aCellAddress(1, 2, 3);
xLinks->insertAtPosition(aCellAddress, "", "a1:c1", "", ""); xLinks->insertAtPosition(aCellAddress, "", "a1:c1", "", "");
uno::Reference< sheet::XAreaLink > xLink( xLinks->getByIndex(0), uno::UNO_QUERY_THROW); uno::Reference<sheet::XAreaLink> xLink(xLinks->getByIndex(0), uno::UNO_QUERY_THROW);
return xLink; return xLink;
} }
void ScAreaLinkObj::setUp() void ScAreaLinkObj::setUp()
{ {
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
mxComponent = loadFromDesktop("private:factory/scalc"); m_xComponent = loadFromDesktop("private:factory/scalc");
} }
void ScAreaLinkObj::tearDown() void ScAreaLinkObj::tearDown()
{ {
closeDocument(mxComponent); closeDocument(m_xComponent);
CalcUnoApiTest::tearDown(); CalcUnoApiTest::tearDown();
} }
CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinkObj); CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinkObj);
} // end namespace } // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
......
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