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

[Libreoffice Gerrit user]

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

New commits:
commit ec291d1ad0581688522cd1f1d341ad4345b14885
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Dec 18 07:13:56 2018 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Tue Dec 18 18:31:56 2018 +0100

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv
index 8ef1b812bd2b..668c1cc6d36d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv
@@ -1,5 +1,3 @@
 "ScScenariosObj";"com::sun::star::container::XNameAccess";"getByName()"
 "ScScenariosObj";"com::sun::star::container::XNameAccess";"getElementNames()"
 "ScScenariosObj";"com::sun::star::container::XNameAccess";"hasByName()"
-"ScScenariosObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScScenariosObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/scscenariosobj.cxx b/sc/qa/extras/scscenariosobj.cxx
index 415ffec08d6d..cddbf07f8744 100644
--- a/sc/qa/extras/scscenariosobj.cxx
+++ b/sc/qa/extras/scscenariosobj.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <test/calc_unoapi_test.hxx>
+#include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
 #include <test/sheet/xscenarios.hxx>
@@ -15,6 +16,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XScenario.hpp>
 #include <com/sun/star/sheet/XScenariosSupplier.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheets.hpp>
@@ -24,6 +26,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 
 #include <unonames.hxx>
+#include <cppu/unotype.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -35,6 +38,7 @@ using namespace com::sun::star;
 namespace sc_apitest
 {
 class ScScenariosObj : public CalcUnoApiTest,
+                       public apitest::XElementAccess,
                        public apitest::XEnumerationAccess,
                        public apitest::XIndexAccess,
                        public apitest::XScenarios
@@ -48,6 +52,10 @@ public:
 
     CPPUNIT_TEST_SUITE(ScScenariosObj);
 
+    // XElementAccess
+    CPPUNIT_TEST(testGetElementType);
+    CPPUNIT_TEST(testHasElements);
+
     // XEnumerationAccess
     CPPUNIT_TEST(testCreateEnumeration);
 
@@ -67,6 +75,7 @@ private:
 
 ScScenariosObj::ScScenariosObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XElementAccess(cppu::UnoType<sheet::XScenario>::get())
     , XIndexAccess(1)
 {
 }