qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv | 4 -- sc/qa/extras/scnamedrangesobj.cxx | 17 ++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-)
New commits: commit 3e0c4c0e96298a4f0c72b52652e2cc1d9f3a20e8 Author: Jens Carl <[email protected]> AuthorDate: Sat Jan 26 01:25:18 2019 +0000 Commit: Jens Carl <[email protected]> CommitDate: Sat Jan 26 05:25:23 2019 +0100 tdf#45904 Move XElementAccess Java tests to C++ Move XElementAccess Java tests to C++ for ScNamedRangesObj. modified: sc/qa/extras/scnamedrangesobj.cxx Change-Id: I1274e23acbd125dd784ae7591bfab8d3d146d2e2 Reviewed-on: https://gerrit.libreoffice.org/66949 Tested-by: Jenkins Reviewed-by: Jens Carl <[email protected]> diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv index f6942169a9bb..96616bf6a251 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv @@ -1,5 +1,3 @@ "ScNamedRangesObj";"com::sun::star::container::XNameAccess";"getByName()" "ScNamedRangesObj";"com::sun::star::container::XNameAccess";"getElementNames()" "ScNamedRangesObj";"com::sun::star::container::XNameAccess";"hasByName()" -"ScNamedRangesObj";"com::sun::star::container::XElementAccess";"getElementType()" -"ScNamedRangesObj";"com::sun::star::container::XElementAccess";"hasElements()" diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index 983b08d4acf0..c20380ea7d7d 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -8,23 +8,28 @@ */ #include <test/calc_unoapi_test.hxx> +#include <test/container/xelementaccess.hxx> #include <test/container/xenumerationaccess.hxx> #include <test/container/xindexaccess.hxx> #include <test/sheet/xnamedranges.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/sheet/XNamedRange.hpp> #include <com/sun/star/sheet/XNamedRanges.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> +#include <cppu/unotype.hxx> + using namespace css; using namespace css::uno; namespace sc_apitest { class ScNamedRangesObj : public CalcUnoApiTest, + public apitest::XElementAccess, public apitest::XEnumerationAccess, public apitest::XIndexAccess, public apitest::XNamedRanges @@ -40,6 +45,10 @@ public: CPPUNIT_TEST_SUITE(ScNamedRangesObj); + // XElementAccess + CPPUNIT_TEST(testGetElementType); + CPPUNIT_TEST(testHasElements); + // XEnumerationAccess CPPUNIT_TEST(testCreateEnumeration); @@ -61,6 +70,7 @@ private: ScNamedRangesObj::ScNamedRangesObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") + , XElementAccess(cppu::UnoType<sheet::XNamedRange>::get()) , XIndexAccess(4) { } commit ce0be9900fd72b7ffc7e86da49ce836dd2da37fe Author: Jens Carl <[email protected]> AuthorDate: Sat Jan 26 01:19:06 2019 +0000 Commit: Jens Carl <[email protected]> CommitDate: Sat Jan 26 05:25:11 2019 +0100 tdf#45904 Move XIndexAccess Java tests to C++ Move XIndexAccess Java tests to C++ for ScNamedRangesObj. Change-Id: I6455bad007d3347c805352384196d538b99ea72e Reviewed-on: https://gerrit.libreoffice.org/66948 Tested-by: Jenkins Reviewed-by: Jens Carl <[email protected]> diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv index da83532fe621..f6942169a9bb 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv @@ -1,7 +1,5 @@ "ScNamedRangesObj";"com::sun::star::container::XNameAccess";"getByName()" "ScNamedRangesObj";"com::sun::star::container::XNameAccess";"getElementNames()" "ScNamedRangesObj";"com::sun::star::container::XNameAccess";"hasByName()" -"ScNamedRangesObj";"com::sun::star::container::XIndexAccess";"getCount()" -"ScNamedRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()" "ScNamedRangesObj";"com::sun::star::container::XElementAccess";"getElementType()" "ScNamedRangesObj";"com::sun::star::container::XElementAccess";"hasElements()" diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index d09ad0dcc40b..983b08d4acf0 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -9,6 +9,7 @@ #include <test/calc_unoapi_test.hxx> #include <test/container/xenumerationaccess.hxx> +#include <test/container/xindexaccess.hxx> #include <test/sheet/xnamedranges.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -25,6 +26,7 @@ namespace sc_apitest { class ScNamedRangesObj : public CalcUnoApiTest, public apitest::XEnumerationAccess, + public apitest::XIndexAccess, public apitest::XNamedRanges { public: @@ -41,6 +43,10 @@ public: // XEnumerationAccess CPPUNIT_TEST(testCreateEnumeration); + // XIndexAccess + CPPUNIT_TEST(testGetByIndex); + CPPUNIT_TEST(testGetCount); + // XNamedRanges CPPUNIT_TEST(testAddNewByName); CPPUNIT_TEST(testAddNewFromTitles); @@ -55,6 +61,7 @@ private: ScNamedRangesObj::ScNamedRangesObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") + , XIndexAccess(4) { } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
