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

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv |    2 --
 sc/qa/extras/scsubtotaldescriptorbase.cxx                                |    9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 5e67b38309b4c9c925530cafa6b9476f9839a48e
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Mon Apr 1 06:20:03 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Mon Apr 1 09:27:55 2019 +0200

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index a001e7a8497c..1bcb85bf438f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -1,5 +1,3 @@
-"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
 "ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 "ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
 "ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx b/sc/qa/extras/scsubtotaldescriptorbase.cxx
index 93ff4de17081..54176abd6ea1 100644
--- a/sc/qa/extras/scsubtotaldescriptorbase.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -8,10 +8,12 @@
  */
 
 #include <test/calc_unoapi_test.hxx>
+#include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
 #include <test/sheet/subtotaldescriptor.hxx>
 #include <test/sheet/xsubtotaldescriptor.hxx>
+#include <cppu/unotype.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -22,6 +24,7 @@
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/sheet/XSubTotalCalculatable.hpp>
 #include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
+#include <com/sun/star/sheet/XSubTotalField.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
@@ -33,6 +36,7 @@ namespace sc_apitest
 {
 class ScSubTotalDescriptorBase : public CalcUnoApiTest,
                                  public apitest::SubTotalDescriptor,
+                                 public apitest::XElementAccess,
                                  public apitest::XEnumerationAccess,
                                  public apitest::XIndexAccess,
                                  public apitest::XSubTotalDescriptor
@@ -49,6 +53,10 @@ public:
     // SubTotalDescriptor
     CPPUNIT_TEST(testSubTotalDescriptorProperties);
 
+    // XElementAccess
+    CPPUNIT_TEST(testGetElementType);
+    CPPUNIT_TEST(testHasElements);
+
     // XEnumerationAccess
     CPPUNIT_TEST(testCreateEnumeration);
 
@@ -68,6 +76,7 @@ private:
 
 ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XElementAccess(cppu::UnoType<sheet::XSubTotalField>::get())
     , XIndexAccess(1)
 {
 }