summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2018-12-01 19:16:11 +0000
committerJens Carl <j.carl43@gmx.de>2018-12-02 00:27:38 +0100
commit2562eb1aff667fd9ddc07b75fa8346e9d61ea093 (patch)
treed1609a705c28edc249edfb2778495467cdb27444
parent9c5d20105f0b123fca724cb4845f0e7227c217d8 (diff)
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScAnnotationsObj. Change-Id: Icbd34ffe4b4911754045e4a5dc511b3fb25d4dd0 Reviewed-on: https://gerrit.libreoffice.org/64404 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv2
-rw-r--r--sc/qa/extras/scannotationsobj.cxx10
2 files changed, 10 insertions, 2 deletions
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
index 1a785cf0f365..a6e62ec29e06 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
@@ -1,4 +1,2 @@
-"ScAnnotationsObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScAnnotationsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index a80c35e35a18..5c358e2b4caf 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/container/xenumerationaccess.hxx>
+#include <test/container/xindexaccess.hxx>
#include <test/sheet/xsheetannotations.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -16,6 +17,9 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
using namespace css;
using namespace css::uno;
@@ -23,6 +27,7 @@ using namespace css::uno;
namespace sc_apitest {
class ScAnnontationsObj : public CalcUnoApiTest, public apitest::XEnumerationAccess,
+ public apitest::XIndexAccess,
public apitest::XSheetAnnotations
{
public:
@@ -39,6 +44,10 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+ // XIndexAccess
+ CPPUNIT_TEST(testGetByIndex);
+ CPPUNIT_TEST(testGetCount);
+
// XSheetAnnotations
CPPUNIT_TEST(testCount);
CPPUNIT_TEST(testIndex);
@@ -55,6 +64,7 @@ private:
ScAnnontationsObj::ScAnnontationsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XIndexAccess(1)
{
}