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

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv |    3 -
 sc/qa/extras/sctablesheetsobj.cxx                                |   24 ++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 49eb4906de8f499ae14b789e90df9ba654895af5
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Mon Feb 24 22:56:27 2020 -0800
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Feb 26 05:05:24 2020 +0100

    tdf#45904 Move XNameAccess Java tests to C++
    
    Move XNameAccess Java tests to C++ for ScTableSheetsObj.
    
    Change-Id: I5fdaafe35852ea3c6e260d490200ce99e990c3b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89408
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index 8eca36532a14..83fbb64ec41d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,6 +1,3 @@
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"hasByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameReplace";"replaceByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 99d55ea75a16..82c74e832c7d 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -9,6 +9,7 @@
 
 #include <test/calc_unoapi_test.hxx>
 #include <test/container/xenumerationaccess.hxx>
+#include <test/container/xnameaccess.hxx>
 #include <test/container/xnamecontainer.hxx>
 #include <test/sheet/xspreadsheets.hxx>
 #include <test/sheet/xspreadsheets2.hxx>
@@ -19,11 +20,12 @@ using namespace css;
 using namespace css::uno;
 
 namespace sc_apitest {
-
-class ScTableSheetsObj : public CalcUnoApiTest, public apitest::XEnumerationAccess,
-                                                public ::apitest::XSpreadsheets,
-                                                public ::apitest::XSpreadsheets2,
-                                                public apitest::XNameContainer
+class ScTableSheetsObj : public CalcUnoApiTest,
+                         public ::apitest::XEnumerationAccess,
+                         public ::apitest::XNameAccess,
+                         public ::apitest::XNameContainer,
+                         public ::apitest::XSpreadsheets,
+                         public ::apitest::XSpreadsheets2
 {
 public:
     ScTableSheetsObj();
@@ -36,6 +38,11 @@ public:
     // XEnumerationAccess
     CPPUNIT_TEST(testCreateEnumeration);
 
+    // XNameAccess
+    CPPUNIT_TEST(testGetByName);
+    CPPUNIT_TEST(testGetElementNames);
+    CPPUNIT_TEST(testHasByName);
+
     // XSpreadsheets
     CPPUNIT_TEST(testInsertNewByName);
     CPPUNIT_TEST(testInsertNewByNameBadName);
@@ -69,9 +76,10 @@ protected:
     uno::Reference< lang::XComponent > mxComponent;
 };
 
-ScTableSheetsObj::ScTableSheetsObj():
-            CalcUnoApiTest("/sc/qa/extras/testdocuments"),
-            apitest::XNameContainer("Sheet2")
+ScTableSheetsObj::ScTableSheetsObj()
+    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , ::apitest::XNameAccess("Sheet1")
+    , ::apitest::XNameContainer("Sheet2")
 {
 }