summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2019-01-21 22:52:51 +0000
committerJens Carl <j.carl43@gmx.de>2019-01-22 01:42:01 +0100
commit41ae69e330857a3bb983f20c4096be125c4139e9 (patch)
treef4a766908663632c92d3e681acdcbed92600f1c2
parent835b854d74bcd9f9c6a87b24d533242433f7800b (diff)
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScDrawPagesObj. Change-Id: Ic7ba9acbcc9f285569d8f185b6ebfded60b6e87d Reviewed-on: https://gerrit.libreoffice.org/66709 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv2
-rw-r--r--sc/qa/extras/scdrawpagesobj.cxx13
2 files changed, 12 insertions, 3 deletions
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
index bdc6ddbf447b..11ce9966a95a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
@@ -1,6 +1,4 @@
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPages";"insertNewByIndex()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPages";"remove()"
-"ScDrawPagesObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScDrawPagesObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPageExpander#optional";"expand()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPageSummarizer#optional";"summarize()"
diff --git a/sc/qa/extras/scdrawpagesobj.cxx b/sc/qa/extras/scdrawpagesobj.cxx
index 471225ec611a..9a40d417791e 100644
--- a/sc/qa/extras/scdrawpagesobj.cxx
+++ b/sc/qa/extras/scdrawpagesobj.cxx
@@ -8,8 +8,10 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xelementaccess.hxx>
#include <test/container/xindexaccess.hxx>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -18,12 +20,16 @@
#include <com/sun/star/uno/Reference.hxx>
+#include <cppu/unotype.hxx>
+
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
-class ScDrawPagesObj : public CalcUnoApiTest, public apitest::XIndexAccess
+class ScDrawPagesObj : public CalcUnoApiTest,
+ public apitest::XElementAccess,
+ public apitest::XIndexAccess
{
public:
ScDrawPagesObj();
@@ -34,6 +40,10 @@ public:
CPPUNIT_TEST_SUITE(ScDrawPagesObj);
+ // XElementAccess
+ CPPUNIT_TEST(testGetElementType);
+ CPPUNIT_TEST(testHasElements);
+
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
@@ -46,6 +56,7 @@ private:
ScDrawPagesObj::ScDrawPagesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XElementAccess(cppu::UnoType<drawing::XDrawPage>::get())
, XIndexAccess(3)
{
}