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

[Libreoffice Gerrit user]

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

New commits:
commit 184d0c4baf3862bddf735aa416d219b83c6da421
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sun Dec 2 18:13:40 2018 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Mon Dec 3 07:20:03 2018 +0100

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
index 62e3ab113118..c814454c7897 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
@@ -1,4 +1,2 @@
-"ScLabelRangesObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScLabelRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 "ScLabelRangesObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScLabelRangesObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/sclabelrangesobj.cxx b/sc/qa/extras/sclabelrangesobj.cxx
index 44e05c8ef7a0..fefba462d117 100644
--- a/sc/qa/extras/sclabelrangesobj.cxx
+++ b/sc/qa/extras/sclabelrangesobj.cxx
@@ -9,6 +9,7 @@
 
 #include <test/calc_unoapi_test.hxx>
 #include <test/container/xenumerationaccess.hxx>
+#include <test/container/xindexaccess.hxx>
 #include <test/sheet/xlabelranges.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -16,9 +17,9 @@
 #include <com/sun/star/sheet/XLabelRanges.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 
 using namespace css;
 using namespace css::uno;
@@ -28,6 +29,7 @@ namespace sc_apitest
 {
 class ScLabelRangesObj : public CalcUnoApiTest,
                          public apitest::XEnumerationAccess,
+                         public apitest::XIndexAccess,
                          public apitest::XLabelRanges
 {
 public:
@@ -42,6 +44,10 @@ public:
     // XEnumerationAccess
     CPPUNIT_TEST(testCreateEnumeration);
 
+    // XIndexAccess
+    CPPUNIT_TEST(testGetByIndex);
+    CPPUNIT_TEST(testGetCount);
+
     // XLabelRanges
     CPPUNIT_TEST(testAddNew);
     CPPUNIT_TEST(testRemoveByIndex);
@@ -54,6 +60,7 @@ private:
 
 ScLabelRangesObj::ScLabelRangesObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XIndexAccess(1)
 {
 }
 
@@ -87,7 +94,7 @@ void ScLabelRangesObj::tearDown()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScLabelRangesObj);
 
-} // end namespace
+} // namespace sc_apitest
 
 CPPUNIT_PLUGIN_IMPLEMENT();