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

[Libreoffice Gerrit user]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv |    2 -
 sc/qa/extras/scdatapilottablesobj.cxx                                |   15 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 823ce74283d5214204abee7b2765e86f094c32eb
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sun Jan 13 19:08:09 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Sun Jan 13 21:47:28 2019 +0100

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
index 4de45992a904..8e400adc6c10 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
@@ -1,7 +1,5 @@
 "ScDataPilotTablesObj";"com::sun::star::container::XNameAccess";"getByName()"
 "ScDataPilotTablesObj";"com::sun::star::container::XNameAccess";"getElementNames()"
 "ScDataPilotTablesObj";"com::sun::star::container::XNameAccess";"hasByName()"
-"ScDataPilotTablesObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScDataPilotTablesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 "ScDataPilotTablesObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScDataPilotTablesObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/scdatapilottablesobj.cxx b/sc/qa/extras/scdatapilottablesobj.cxx
index eb3eaf884563..76dcdf9c86fa 100644
--- a/sc/qa/extras/scdatapilottablesobj.cxx
+++ b/sc/qa/extras/scdatapilottablesobj.cxx
@@ -9,6 +9,7 @@
 
 #include <test/calc_unoapi_test.hxx>
 #include <test/container/xenumerationaccess.hxx>
+#include <test/container/xindexaccess.hxx>
 #include <test/sheet/xdatapilottables.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -17,8 +18,8 @@
 #include <com/sun/star/sheet/XDataPilotTables.hpp>
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XSpreadsheets.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
@@ -33,7 +34,8 @@ namespace sc_apitest
 {
 class ScDataPilotTablesObj : public CalcUnoApiTest,
                              public apitest::XDataPilotTables,
-                             public apitest::XEnumerationAccess
+                             public apitest::XEnumerationAccess,
+                             public apitest::XIndexAccess
 {
 public:
     ScDataPilotTablesObj();
@@ -51,6 +53,10 @@ public:
     // XEnumerationAccess
     CPPUNIT_TEST(testCreateEnumeration);
 
+    // XIndexAccess
+    CPPUNIT_TEST(testGetByIndex);
+    CPPUNIT_TEST(testGetCount);
+
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -59,6 +65,7 @@ private:
 
 ScDataPilotTablesObj::ScDataPilotTablesObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XIndexAccess(1)
 {
 }
 
@@ -81,7 +88,7 @@ uno::Reference<uno::XInterface> ScDataPilotTablesObj::init()
     uno::Reference<sheet::XDataPilotDescriptor> xDPD(xDPT->createDataPilotDescriptor(),
                                                      UNO_QUERY_THROW);
     xDPD->setSourceRange(table::CellRangeAddress(0, 0, 0, 4, 4));
-    //xDPT->insertNewByName("DataPilotTable", table::CellAddress(0, 5, 5), xDPD);
+    xDPT->insertNewByName("DataPilotTable", table::CellAddress(0, 5, 5), xDPD);
 
     return xDPT;
 }
@@ -112,7 +119,7 @@ void ScDataPilotTablesObj::tearDown()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTablesObj);
 
-} // end namespace
+} // namespace sc_apitest
 
 CPPUNIT_PLUGIN_IMPLEMENT();