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

[Libreoffice Gerrit user]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv |    4 --
 sc/qa/extras/scstylefamilyobj.cxx                                |   19 +++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit bf63df7a6f781f595ada126cb6f67806124ab7f8
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sun Mar 10 20:50:31 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Mon Mar 11 04:35:03 2019 +0100

    tdf#45904 Move XIndexAccess Java tests to C++
    
    Move XIndexAccess Java tests to C++ for ScStyleFamilyObj.
    
            modified:   sc/qa/extras/scstylefamilyobj.cxx
    
    Change-Id: I1ee22139effe5f3931fb40b46b9c5c5701fa415d
    Reviewed-on: https://gerrit.libreoffice.org/69020
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
index 8c6fa00877c7..4c5519b5b7f8 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
@@ -1,5 +1,3 @@
 "ScStyleFamilyObj";"com::sun::star::container::XNameReplace#optional";"replaceByName()"
 "ScStyleFamilyObj";"com::sun::star::container::XNameContainer#optional";"insertByName()"
 "ScStyleFamilyObj";"com::sun::star::container::XNameContainer#optional";"removeByName()"
-"ScStyleFamilyObj";"com::sun::star::container::XIndexAccess#optional";"getCount()"
-"ScStyleFamilyObj";"com::sun::star::container::XIndexAccess#optional";"getByIndex()"
diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx
index 632fe4dbbe15..c9df85f5cc92 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -9,6 +9,7 @@
 
 #include <test/calc_unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
+#include <test/container/xindexaccess.hxx>
 #include <test/container/xnameaccess.hxx>
 #include <cppu/unotype.hxx>
 
@@ -30,6 +31,7 @@ namespace sc_apitest
 {
 class ScStyleFamilyObj : public CalcUnoApiTest,
                          public apitest::XElementAccess,
+                         public apitest::XIndexAccess,
                          public apitest::XNameAccess
 {
 public:
@@ -45,6 +47,10 @@ public:
     CPPUNIT_TEST(testGetElementType);
     CPPUNIT_TEST(testHasElements);
 
+    // XIndexAccess
+    CPPUNIT_TEST(testGetByIndex);
+    CPPUNIT_TEST(testGetCount);
+
     // XNameAccess
     CPPUNIT_TEST(testGetByName);
     CPPUNIT_TEST(testGetElementNames);
@@ -59,6 +65,7 @@ private:
 ScStyleFamilyObj::ScStyleFamilyObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuemts")
     , XElementAccess(cppu::UnoType<style::XStyle>::get())
+    , XIndexAccess(19)
     , XNameAccess("Default")
 {
 }
commit 01cc0586f52969886b59140de11dda33deddb048
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sun Mar 10 20:47:28 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Mon Mar 11 04:34:52 2019 +0100

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
index 9e6efecdd398..8c6fa00877c7 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
@@ -3,5 +3,3 @@
 "ScStyleFamilyObj";"com::sun::star::container::XNameContainer#optional";"removeByName()"
 "ScStyleFamilyObj";"com::sun::star::container::XIndexAccess#optional";"getCount()"
 "ScStyleFamilyObj";"com::sun::star::container::XIndexAccess#optional";"getByIndex()"
-"ScStyleFamilyObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScStyleFamilyObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx
index 561d492abebf..632fe4dbbe15 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -8,7 +8,9 @@
  */
 
 #include <test/calc_unoapi_test.hxx>
+#include <test/container/xelementaccess.hxx>
 #include <test/container/xnameaccess.hxx>
+#include <cppu/unotype.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -16,6 +18,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 
@@ -25,7 +28,9 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScStyleFamilyObj : public CalcUnoApiTest, public apitest::XNameAccess
+class ScStyleFamilyObj : public CalcUnoApiTest,
+                         public apitest::XElementAccess,
+                         public apitest::XNameAccess
 {
 public:
     ScStyleFamilyObj();
@@ -36,6 +41,10 @@ public:
 
     CPPUNIT_TEST_SUITE(ScStyleFamilyObj);
 
+    // XElementAccess
+    CPPUNIT_TEST(testGetElementType);
+    CPPUNIT_TEST(testHasElements);
+
     // XNameAccess
     CPPUNIT_TEST(testGetByName);
     CPPUNIT_TEST(testGetElementNames);
@@ -49,6 +58,7 @@ private:
 
 ScStyleFamilyObj::ScStyleFamilyObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuemts")
+    , XElementAccess(cppu::UnoType<style::XStyle>::get())
     , XNameAccess("Default")
 {
 }