[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |    2 -
 sc/qa/extras/scdrawpageobj.cxx                                |   11 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit f897e80d063436be07356049f595efe5afb04859
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Wed Mar 27 23:14:48 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Thu Mar 28 06:27:15 2019 +0100

    tdf#45904 Move XElementAccess Java tests to C++
    
    Move XElementAccess Java tests to C++ for ScDrawPageObj.
    
    Change-Id: I3a51c77f524311416ac054005c0632e5127efb79
    Reviewed-on: https://gerrit.libreoffice.org/69871
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
index 11bfae0d02d9..7273ff229a1d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
@@ -1,8 +1,6 @@
 "ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
 "ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"supportsService()"
 "ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"ScDrawPageObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScDrawPageObj";"com::sun::star::container::XElementAccess";"hasElements()"
 "ScDrawPageObj";"com::sun::star::drawing::XShapes";"add()"
 "ScDrawPageObj";"com::sun::star::drawing::XShapes";"remove()"
 "ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"group()"
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index 77beb3629528..9f8e9194598d 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -9,7 +9,9 @@
 
 #include <test/calc_unoapi_test.hxx>
 #include <test/helper/shape.hxx>
+#include <test/container/xelementaccess.hxx>
 #include <test/container/xindexaccess.hxx>
+#include <cppu/unotype.hxx>
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
@@ -26,7 +28,9 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDrawPageObj : public CalcUnoApiTest, public apitest::XIndexAccess
+class ScDrawPageObj : public CalcUnoApiTest,
+                      public apitest::XElementAccess,
+                      public apitest::XIndexAccess
 {
 public:
     ScDrawPageObj();
@@ -37,6 +41,10 @@ public:
 
     CPPUNIT_TEST_SUITE(ScDrawPageObj);
 
+    // XElementAccess
+    CPPUNIT_TEST(testGetElementType);
+    CPPUNIT_TEST(testHasElements);
+
     // XIndexAccess
     CPPUNIT_TEST(testGetByIndex);
     CPPUNIT_TEST(testGetCount);
@@ -49,6 +57,7 @@ private:
 
 ScDrawPageObj::ScDrawPageObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XElementAccess(cppu::UnoType<drawing::XShape>::get())
     , XIndexAccess(2)
 {
 }