[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/lang/xcomponent.hxx |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |3 -
sc/qa/extras/scshapeobj.cxx| 26 -
test/source/lang/xcomponent.cxx| 10 +
4 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 35608a192df5529d8a0df4ad2f6bce42fc64a9ab
Author: Jens Carl
AuthorDate: Sat May 4 06:27:17 2019 +
Commit: Jens Carl
CommitDate: Sat May 4 17:37:47 2019 +0200
tdf#45904 Move XComponent Java tests to C++
Move XComponent Java tests to C++ for ScShapeObj.
Change-Id: Ib692827729dbe38eaceb76aa042d76e14d9614f8
Reviewed-on: https://gerrit.libreoffice.org/71787
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/lang/xcomponent.hxx b/include/test/lang/xcomponent.hxx
index 347a36e2925c..fdbeccc6cf7b 100644
--- a/include/test/lang/xcomponent.hxx
+++ b/include/test/lang/xcomponent.hxx
@@ -26,6 +26,7 @@ public:
void testAddEventListener();
void testRemoveEventListener();
+void testDispose();
void testDisposedByDesktopTerminate();
protected:
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
index e7385e4ec6f7..47138b49c5ea 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -1,6 +1,3 @@
-"ScShapeObj";"com::sun::star::lang::XComponent";"dispose()"
-"ScShapeObj";"com::sun::star::lang::XComponent";"addEventListener()"
-"ScShapeObj";"com::sun::star::lang::XComponent";"removeEventListener()"
"ScShapeObj";"com::sun::star::drawing::Shape";"ZOrder#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"LayerID#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"LayerName#optional"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 279b07dead3d..2a1bebb1 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -25,17 +26,17 @@
#include
using namespace css;
-using namespace css::uno;
namespace sc_apitest
{
-class ScShapeObj : public CalcUnoApiTest, public apitest::Shape
+class ScShapeObj : public CalcUnoApiTest, public apitest::Shape, public
apitest::XComponent
{
public:
ScShapeObj();
virtual uno::Reference init() override;
virtual uno::Reference getXSheetDocument() override;
+virtual void triggerDesktopTerminate() override{};
virtual void setUp() override;
virtual void tearDown() override;
@@ -45,6 +46,11 @@ public:
CPPUNIT_TEST(testShapePropertiesAnchor);
CPPUNIT_TEST(testShapePropertiesPosition);
+// XComponent
+CPPUNIT_TEST(testAddEventListener);
+CPPUNIT_TEST(testDispose);
+CPPUNIT_TEST(testRemoveEventListener);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -58,18 +64,18 @@ ScShapeObj::ScShapeObj()
uno::Reference ScShapeObj::init()
{
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
-uno::Reference xMSF(xDoc, UNO_QUERY_THROW);
+uno::Reference xMSF(xDoc,
uno::UNO_QUERY_THROW);
uno::Reference xShape(
-xMSF->createInstance("com.sun.star.drawing.RectangleShape"),
UNO_QUERY_THROW);
+xMSF->createInstance("com.sun.star.drawing.RectangleShape"),
uno::UNO_QUERY_THROW);
xShape->setPosition(awt::Point(5000, 3500));
xShape->setSize(awt::Size(7500, 5000));
-uno::Reference xDPS(xDoc, UNO_QUERY_THROW);
+uno::Reference xDPS(xDoc,
uno::UNO_QUERY_THROW);
uno::Reference xDrawPages = xDPS->getDrawPages();
-uno::Reference xDrawPage(xDrawPages->getByIndex(0),
UNO_QUERY_THROW);
-uno::Reference xShapes(xDrawPage, UNO_QUERY_THROW);
+uno::Reference xDrawPage(xDrawPages->getByIndex(0),
uno::UNO_QUERY_THROW);
+uno::Reference xShapes(xDrawPage, uno::UNO_QUERY_THROW);
xShapes->add(xShape);
for (auto i = 0; i < 10; i++)
@@ -84,7 +90,7 @@ uno::Reference ScShapeObj::init()
uno::Reference ScShapeObj::getXSheetDocument()
{
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
return xDoc;
}
@@ -103,7 +109,7 @@ void ScShapeObj::tearDown()
CPPUNIT_TEST_SUITE_REGISTRATION(ScShapeObj);
-} // end namespace
+} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/test/source/lang/xcomponent.cxx b/test/source/lang/xcomponent.cxx
index 386fa45f232f..ef0049d5953c 100644
--- a/test/source/lang/xcomponent.cxx
+++ b/test/source/lang/xcomponent.cxx
@@ -57,6 +57,16 @@ void XComponent::testRemoveEventListener()
CPPUNIT_ASSERT_EQUAL(false,
pListenerAddedAndRemoved->m_hasDisposingCalled);
}
+void XComponent::testDispose()
+{
+Reference xComponent(init(), uno::UNO_QUERY_THROW);
+auto
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/text/xtextfield.hxx | 17 ---
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv |1
sc/qa/extras/sceditfieldobj-header.cxx |7 ++-
test/source/text/xtextfield.cxx | 23
+++---
4 files changed, 34 insertions(+), 14 deletions(-)
New commits:
commit 5696272f9055b9b15c94d70a0dea7cee299c23ed
Author: Jens Carl
AuthorDate: Tue Apr 16 19:21:58 2019 +
Commit: Jens Carl
CommitDate: Wed Apr 17 01:11:58 2019 +0200
tdf#45904 Move XTextField Java tests to C++
Move XTextField Java tests to C++ for ScEditFieldObj_Header (formerly
ScHeaderFieldObj).
Change-Id: I36b723945d9306720846b4a4e2d3eaddb1a1c063
Reviewed-on: https://gerrit.libreoffice.org/70841
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/text/xtextfield.hxx b/include/test/text/xtextfield.hxx
index 870d51d20da5..6d717b1ead06 100644
--- a/include/test/text/xtextfield.hxx
+++ b/include/test/text/xtextfield.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -10,25 +10,28 @@
#ifndef INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
#define INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
+#include
+
#include
#include
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XTextField
{
public:
-virtual ~XTextField() {}
-
-virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+virtual css::uno::Reference init() = 0;
void testGetPresentation();
+void testGetPresentationEmptyString();
+
+protected:
+~XTextField() {}
};
-}
+} // namespace apitest
#endif // INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
index 343631dee5b6..e4f37d6e1016 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
@@ -1,4 +1,3 @@
"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"dispose()"
"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"addEventListener()"
"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()"
-"ScHeaderFieldObj";"com::sun::star::text::XTextField";"getPresentation()"
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx
b/sc/qa/extras/sceditfieldobj-header.cxx
index a38b3a122ebb..f8d1e5d5a0d4 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -38,7 +39,8 @@ namespace sc_apitest
class ScEditFieldObj_Header : public CalcUnoApiTest,
public apitest::TextContent,
public apitest::XPropertySet,
- public apitest::XTextContent
+ public apitest::XTextContent,
+ public apitest::XTextField
{
public:
ScEditFieldObj_Header();
@@ -66,6 +68,9 @@ public:
CPPUNIT_TEST(testGetAnchor);
CPPUNIT_TEST(testAttach);
+// XTextField
+CPPUNIT_TEST(testGetPresentationEmptyString);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx
index 1d0abb22dad0..87fff9db3f83 100644
--- a/test/source/text/xtextfield.cxx
+++ b/test/source/text/xtextfield.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -8,24 +8,37 @@
*/
#include
+#include
+
#include
+
+#include
+
#include
using namespace css;
-using namespace css::uno;
namespace apitest
{
-
void XTextField::testGetPresentation()
{
-uno::Reference< text::XTextField > xTextField(init(), UNO_QUERY_THROW);
+uno::Reference xTextField(init(), uno::UNO_QUERY_THROW);
+
OUString aString = xTextField->getPresentation(true);
CPPUNIT_ASSERT(!aString.isEmpty());
aString = xTextField->getPresentation(false);
CPPUNIT_ASSERT(!aString.isEmpty());
}
+void XTextField::testGetPresentationEmptyString()
+{
+uno::Reference xTextField(init(), uno::UNO_QUERY_THROW);
+
+OUString aString = xTextField->getPresentation(true);
+CPPUNIT_ASSERT(aString.isEmpty());
+aString = xTextField->getPresentation(false);
+CPPUNIT_ASSERT(aString.isEmpty());
}
+} // namespace apitest
-/* vim:set shiftwidth=4
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/container/xnamed.hxx |2 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv |2 -
sc/qa/extras/scsheetlinkobj.cxx|7 +
test/source/container/xnamed.cxx | 14
++
4 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit d757b121e3f0f5de03da1be430ed51bf830dce67
Author: Jens Carl
AuthorDate: Fri Mar 29 00:30:18 2019 +
Commit: Jens Carl
CommitDate: Fri Mar 29 02:47:05 2019 +0100
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScSheetLinkObj.
Change-Id: I64904ed6bae1b96767f8b0a65b0850a8694b10c2
Reviewed-on: https://gerrit.libreoffice.org/69907
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/container/xnamed.hxx
b/include/test/container/xnamed.hxx
index 1b1a762ef8b4..de8618ce4436 100644
--- a/include/test/container/xnamed.hxx
+++ b/include/test/container/xnamed.hxx
@@ -30,6 +30,8 @@ public:
void testGetName();
void testSetName();
+// special case, here name is equal to links URL
+void testSetNameByScSheetLinkObj();
void testSetNameThrowsException();
virtual css::uno::Reference< css::uno::XInterface > init() = 0;
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
index 2d72f6819568..63be54e69d85 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
@@ -1,5 +1,3 @@
-"ScSheetLinkObj";"com::sun::star::container::XNamed";"getName()"
-"ScSheetLinkObj";"com::sun::star::container::XNamed";"setName()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/scsheetlinkobj.cxx b/sc/qa/extras/scsheetlinkobj.cxx
index 2819c915b6f0..5239a3288cee 100644
--- a/sc/qa/extras/scsheetlinkobj.cxx
+++ b/sc/qa/extras/scsheetlinkobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -31,6 +32,7 @@ namespace sc_apitest
{
class ScSheetLinkObj : public CalcUnoApiTest,
public apitest::SheetLink,
+ public apitest::XNamed,
public apitest::XRefreshable
{
public:
@@ -46,6 +48,10 @@ public:
// SheetLink
CPPUNIT_TEST(testSheetLinkProperties);
+// XNamed
+CPPUNIT_TEST(testGetName);
+CPPUNIT_TEST(testSetNameByScSheetLinkObj);
+
// XRefreshable
CPPUNIT_TEST(testRefreshListener);
@@ -57,6 +63,7 @@ private:
ScSheetLinkObj::ScSheetLinkObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+,
XNamed(m_directories.getURLFromSrc("/sc/qa/extras/testdocuments/ScSheetLinkObj.ods"))
{
}
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index c8234f6dde4f..3b8023b6bc95 100644
--- a/test/source/container/xnamed.cxx
+++ b/test/source/container/xnamed.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -40,6 +41,19 @@ void XNamed::testSetName()
CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
}
+void XNamed::testSetNameByScSheetLinkObj()
+{
+uno::Reference xNamed(init(), uno::UNO_QUERY_THROW);
+OUString aTestName(m_aTestName.replaceAll("ScSheetLinkObj",
"NewScSheetLinkObj"));
+
+xNamed->setName(aTestName);
+CPPUNIT_ASSERT_EQUAL(aTestName, xNamed->getName());
+
+// restore old name
+xNamed->setName(m_aTestName);
+CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
+}
+
void XNamed::testSetNameThrowsException()
{
uno::Reference xNamed(init(), uno::UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/container/xnamed.hxx| 18 +++--
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinkObj.csv |2 -
sc/qa/extras/scddelinkobj.cxx|8 +++-
test/source/container/xnamed.cxx | 20 +++
4 files changed, 35 insertions(+), 13 deletions(-)
New commits:
commit e01b46b4229bfb7ba54127f590dec837d798ebd4
Author: Jens Carl
AuthorDate: Tue Dec 4 07:27:25 2018 +
Commit: Jens Carl
CommitDate: Tue Dec 4 10:18:55 2018 +0100
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScDDELinkObj and refactor class
XNamed. ScDDELinkObj doesn't allow to set the name, so test that a
exception of type RuntimeException is thrown.
Change-Id: Ie110c3c0ea22d205d4f2c4575f3db3676dda9ce3
Reviewed-on: https://gerrit.libreoffice.org/64497
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/container/xnamed.hxx
b/include/test/container/xnamed.hxx
index f9f708114f68..1b1a762ef8b4 100644
--- a/include/test/container/xnamed.hxx
+++ b/include/test/container/xnamed.hxx
@@ -11,7 +11,11 @@
#define INCLUDED_TEST_CONTAINER_XNAMED_HXX
#include
+
+#include
+
#include
+
#include
namespace apitest {
@@ -19,16 +23,22 @@ namespace apitest {
class OOO_DLLPUBLIC_TEST XNamed
{
public:
-XNamed(const OUString& rName): maTestName(rName) {}
-virtual ~XNamed();
+XNamed(const OUString& rTestName)
+ : m_aTestName(rTestName)
+{
+}
void testGetName();
void testSetName();
+void testSetNameThrowsException();
virtual css::uno::Reference< css::uno::XInterface > init() = 0;
-private:
-OUString const maTestName;
+protected:
+~XNamed() {}
+
+private:
+OUString const m_aTestName;
};
}
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinkObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinkObj.csv
index d66cec243583..651b7c6ffebd 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinkObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinkObj.csv
@@ -1,5 +1,3 @@
"ScDDELinkObj";"com::sun::star::util::XRefreshable";"refresh()"
"ScDDELinkObj";"com::sun::star::util::XRefreshable";"addRefreshListener()"
"ScDDELinkObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()"
-"ScDDELinkObj";"com::sun::star::container::XNamed";"getName()"
-"ScDDELinkObj";"com::sun::star::container::XNamed";"setName()"
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index a9b7358e54da..2b2263af5df6 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -29,7 +30,7 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScDDELinkObj : public CalcUnoApiTest, public apitest::XDDELink
+class ScDDELinkObj : public CalcUnoApiTest, public apitest::XDDELink, public
apitest::XNamed
{
public:
ScDDELinkObj();
@@ -45,6 +46,10 @@ public:
CPPUNIT_TEST(testGetItem);
CPPUNIT_TEST(testGetTopic);
+// XNamed
+CPPUNIT_TEST(testGetName);
+CPPUNIT_TEST(testSetNameThrowsException);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -53,6 +58,7 @@ private:
ScDDELinkObj::ScDDELinkObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XNamed("soffice|ScDDELinksObj.ods!Sheet.A1")
{
}
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index a405ddc60a66..c8234f6dde4f 100644
--- a/test/source/container/xnamed.cxx
+++ b/test/source/container/xnamed.cxx
@@ -7,8 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
#include
+
+#include
+#include
+
+#include
+
#include
using namespace css;
@@ -19,7 +24,7 @@ namespace apitest {
void XNamed::testGetName()
{
uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW);
-CPPUNIT_ASSERT_EQUAL(maTestName, xNamed->getName());
+CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
}
void XNamed::testSetName()
@@ -31,14 +36,17 @@ void XNamed::testSetName()
CPPUNIT_ASSERT_EQUAL(aTestName, xNamed->getName());
// restore old name
-xNamed->setName(maTestName);
-CPPUNIT_ASSERT_EQUAL(maTestName, xNamed->getName());
+xNamed->setName(m_aTestName);
+CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
}
-XNamed::~XNamed()
+void XNamed::testSetNameThrowsException()
{
-}
+uno::Reference xNamed(init(), uno::UNO_QUERY_THROW);
+OUString aTestName("NewName");
+CPPUNIT_ASSERT_THROW(xNamed->setName(aTestName), uno::RuntimeException);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/sheet/xcellrangedata.hxx |3
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |2
sc/qa/extras/sccellcursorobj.cxx| 12 ++
sc/qa/extras/sctablesheetobj.cxx| 12 ++
test/source/sheet/xcellrangedata.cxx| 45
+++---
7 files changed, 61 insertions(+), 17 deletions(-)
New commits:
commit 939fc7dc50a038edb252a8da941ef4e1c018f2b0
Author: Jens Carl
Date: Tue Jun 12 06:21:24 2018 +
tdf#45904 Move _XCellRangeData Java test to C++
Move the remaining tests to C++ and also enable/fix #i84671 by creating
test cases for ScTableSheetObj.
Change-Id: I9412fe7a1947b9afb4343a8f5726eccf9ea371a3
Reviewed-on: https://gerrit.libreoffice.org/55657
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xcellrangedata.hxx
b/include/test/sheet/xcellrangedata.hxx
index 7af4e7d9ea0f..00aef5e8152c 100644
--- a/include/test/sheet/xcellrangedata.hxx
+++ b/include/test/sheet/xcellrangedata.hxx
@@ -18,10 +18,13 @@ namespace apitest {
class OOO_DLLPUBLIC_TEST XCellRangeData
{
public:
+virtual css::uno::Reference< css::uno::XInterface > init() = 0;
virtual css::uno::Reference< css::uno::XInterface > getXCellRangeData() =
0;
void testGetDataArray();
void testSetDataArray();
+void testGetDataArrayOnTableSheet();
+void testSetDataArrayOnTableSheet();
protected:
~XCellRangeData() {}
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index cf6417dcdf44..74d9a7752bb9 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -190,8 +190,6 @@
"ScCellCursorObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScCellCursorObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScCellCursorObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScCellCursorObj";"com::sun::star::sheet::XCellRangeData";"getDataArray()"
-"ScCellCursorObj";"com::sun::star::sheet::XCellRangeData";"setDataArray()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"getData()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setData()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"getRowDescriptions()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 3ca844258495..581e8884dec1 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -185,8 +185,6 @@
"ScCellRangeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScCellRangeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScCellRangeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScCellRangeObj";"com::sun::star::sheet::XCellRangeData";"getDataArray()"
-"ScCellRangeObj";"com::sun::star::sheet::XCellRangeData";"setDataArray()"
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"getData()"
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"setData()"
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"getRowDescriptions()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index 78efd29dae01..cb29417eb43b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -192,8 +192,6 @@
"ScTableSheetObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScTableSheetObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScTableSheetObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScTableSheetObj";"com::sun::star::sheet::XCellRangeData";"getDataArray()"
-"ScTableSheetObj";"com::sun::star::sheet::XCellRangeData";"setDataArray()"
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getData()"
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setData()"
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getRowDescriptions()"
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index 61e564215787..eb38ea141087 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -12,6 +12,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -36,6 +37,7 @@ class ScCellCursorObj :
