Rename testGetByIndex to testIndex

Rename testGetByIndex to testIndex of sheet::XSheetAnnotations test
cases so it won't collide with testGetByIndex of
container::XIndexAccess.

Change-Id: Ic48ffe954c9f4f00b68066ad5d0d2df89cc4dfd7
Reviewed-on: https://gerrit.libreoffice.org/64402
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>

include/test/sheet/xsheetannotations.hxx

@@ -11,6 +11,10 @@
 #define INCLUDED_TEST_SHEET_XSHEETANNOTATIONS_HXX
 
 #include <com/sun/star/sheet/XSheetAnnotations.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
 #include <test/testdllapi.hxx>
 
 namespace apitest {
@@ -19,17 +23,16 @@ class OOO_DLLPUBLIC_TEST XSheetAnnotations
 {
 public:
     virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+    virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations(long nIndex) = 0;
 
     // XSheetAnnotations
-    void testGetByIndex();
+    void testIndex();
     void testInsertNew();
     void testRemoveByIndex();
     void testCount();
 
 protected:
     ~XSheetAnnotations() {}
-
-    virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations(long nIndex) = 0;
 };
 
 }

sc/qa/extras/scannotationsobj.cxx

@@ -11,9 +11,10 @@
 #include <test/container/xenumerationaccess.hxx>
 #include <test/sheet/xsheetannotations.hxx>
 
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
-
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
 
 using namespace css;
@@ -39,10 +40,10 @@ public:
     CPPUNIT_TEST(testCreateEnumeration);
 
     // XSheetAnnotations
+    CPPUNIT_TEST(testCount);
+    CPPUNIT_TEST(testIndex);
     CPPUNIT_TEST(testInsertNew);
     CPPUNIT_TEST(testRemoveByIndex);
-    CPPUNIT_TEST(testCount);
-    CPPUNIT_TEST(testGetByIndex);
 
     CPPUNIT_TEST_SUITE_END();
 

test/source/sheet/xsheetannotations.cxx

@@ -157,7 +157,7 @@ void XSheetAnnotations::testRemoveByIndex()
         OUString("an inserted annotation 1"), aPreviousString);
 }
 
-void XSheetAnnotations::testGetByIndex()
+void XSheetAnnotations::testIndex()
 {
 
     // testing #fdo80551 - getByIndex not on the first sheet