tdf#45904 Move _XCellCursor Java tests to C++

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

include/test/table/xcellcursor.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef INCLUDED_TEST_TABLE_XCELLCURSOR_HXX
+#define INCLUDED_TEST_TABLE_XCELLCURSOR_HXX
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <test/testdllapi.hxx>
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellCursor
+{
+public:
+    virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+    virtual css::uno::Reference<css::uno::XInterface> getXSpreadsheet() = 0;
+
+    void testGoToNext();
+    void testGoToOffset();
+    void testGoToPrevious();
+    void testGoToStart();
+    void testGoToEnd();
+
+protected:
+    ~XCellCursor() {}
+};
+}
+
+#endif // INCLUDED_TEST_TABLE_XCELLCURSOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

qadevOOo/Jar_OOoRunner.mk

@@ -588,7 +588,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/table/_TableRow \
     qadevOOo/tests/java/ifc/table/_XAutoFormattable \
     qadevOOo/tests/java/ifc/table/_XCell \
-    qadevOOo/tests/java/ifc/table/_XCellCursor \
     qadevOOo/tests/java/ifc/table/_XCellRange \
     qadevOOo/tests/java/ifc/table/_XColumnRowRange \
     qadevOOo/tests/java/ifc/table/_XTableChart \

qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv

@@ -41,11 +41,6 @@
 "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
 "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
 "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoStart()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoEnd()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoNext()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoPrevious()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoOffset()"
 "ScCellCursorObj";"com::sun::star::util::XReplaceable";"createReplaceDescriptor()"
 "ScCellCursorObj";"com::sun::star::util::XReplaceable";"replaceAll()"
 "ScCellCursorObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()"

qadevOOo/tests/java/ifc/table/_XCellCursor.java

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.table;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.sheet.XCellRangeAddressable;
-import com.sun.star.sheet.XSheetCellCursor;
-import com.sun.star.sheet.XSheetCellRange;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.table.XCellCursor;
-import com.sun.star.table.XCellRange;
-import com.sun.star.uno.UnoRuntime;
-
-/**
-* Testing <code>com.sun.star.table.XCellCursor</code>
-* interface methods :
-* <ul>
-*  <li><code> gotoStart()</code></li>
-*  <li><code> gotoEnd()</code></li>
-*  <li><code> gotoNext()</code></li>
-*  <li><code> gotoPrevious()</code></li>
-*  <li><code> gotoOffset()</code></li>
-* </ul> <p>
-* This test needs the following object relations :
-* <ul>
-*  <li> <code>'SHEET'</code> (of type <code>XSpreadsheet</code>):
-*   is used for creating a new cell range.</li>
-* <ul> <p>
-*
-* The component tested <b>must implement</b>
-* <code>XCellRangeAddressable</code> interface. <p>
-*
-* Test is <b> NOT </b> multithread compliant. <p>
-* After test completion object environment has to be recreated.
-* @see com.sun.star.table.XCellCursor
-*/
-public class _XCellCursor extends MultiMethodTest {
-
-    public XCellCursor oObj = null;
-
-    /**
-     * <code>XCellRangeAddressable</code> interface is queried
-     * first for getting current position of cursor. The cursor
-     * is moved to next cell. Address of cursor obtained before
-     * and after moving. <p>
-     * Has <b> OK </b> status if cursor column is changed after
-     * movement. <p>
-     */
-    public void _gotoNext(){
-        boolean bResult = false;
-        int startCol;
-        int startCol2;
-
-        XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj);
-        CellRangeAddress oAddr = oRange.getRangeAddress();
-        startCol = oAddr.StartColumn;
-        oObj.gotoNext();
-
-        oAddr = oRange.getRangeAddress();
-        startCol2 = oAddr.StartColumn;
-        if (startCol != startCol2){
-            bResult = true;
-        }
-        tRes.tested( "gotoNext()", bResult );
-    }
-
-    /**
-     * <code>XCellRangeAddressable</code> interface is queried
-     * first for getting current position of cursor. The cursor
-     * is moved then. Address of cursor obtained before
-     * and after moving. <p>
-     * Has <b> OK </b> status if starting column and row of
-     * cursor is changed after movement. <p>
-     */
-    public void _gotoOffset(){
-        boolean bResult = false;
-        int startCol, startRow;
-        int startCol2, startRow2;
-
-        XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj);
-        CellRangeAddress oAddr = oRange.getRangeAddress();
-        startRow = oAddr.StartRow;
-        startCol = oAddr.StartColumn;
-        oObj.gotoOffset(4,4);
-
-        oAddr = oRange.getRangeAddress();
-        startRow2 = oAddr.StartRow;
-        startCol2 = oAddr.StartColumn;
-        if ((startCol != startCol2) || (startRow == startRow2)){
-            bResult = true;
-        }
-        tRes.tested( "gotoOffset()", bResult );
-    }
-
-    /**
-     * <code>XCellRangeAddressable</code> interface is queried
-     * first for getting current position of cursor. The cursor
-     * is moved to previous cell. Address of cursor obtained before
-     * and after moving. <p>
-     * Has <b> OK </b> status if cursor column is changed after
-     * movement. <p>
-     */
-    public void _gotoPrevious(){
-        boolean bResult = false;
-        int startCol;
-        int startCol2;
-
-        XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj);
-        CellRangeAddress oAddr = oRange.getRangeAddress();
-        startCol = oAddr.StartColumn;
-        oObj.gotoPrevious();
-
-        oAddr = oRange.getRangeAddress();
-        startCol2 = oAddr.StartColumn;
-        if (startCol != startCol2){
-            bResult = true;
-        }
-        tRes.tested( "gotoPrevious()", bResult );
-    }
-
-    /**
-     * <code>XCellRangeAddressable</code> interface is queried
-     * first for getting current position of cursor. The cursor
-     * is moved to the start of its range .
-     * Address of cursor obtained before and after moving. <p>
-     * Has <b> OK </b> status if cursor was collapsed to a single
-     * cell (i.e. start column is the same as end column) after
-     * movement. <p>
-     */
-    public void _gotoStart(){
-        boolean bResult = false;
-        int startCol, endCol, startRow, endRow = 0;
-
-        XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj);
-        oObj.gotoStart();
-        CellRangeAddress oAddr = oRange.getRangeAddress();
-        startRow = oAddr.StartRow;
-        startCol = oAddr.StartColumn;
-        endRow = oAddr.EndRow;
-        endCol = oAddr.EndColumn;
-        if ((startCol == endCol) && (endRow == startRow)){
-            bResult = true;
-        }
-
-        tRes.tested( "gotoStart()", bResult );
-    }
-
-    /**
-     * A new cell range is created using spreadsheet passed by relation.
-     * The method is tested on that range. <code>gotoEnd</code> is
-     * called and range address is checked.<p>
-     * Has <b> OK </b> status if cursor was collapsed to a single
-     * cell (i.e. start column is the same as end column) after
-     * movement. <p>
-     */
-    public void _gotoEnd(){
-        //gotoEnd gets its own cursor to see a change
-        XSpreadsheet oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET");
-        XCellRange testRange = oSheet.getCellRangeByName("$A$1:$g$7") ;
-        XSheetCellRange testSheetRange = UnoRuntime.queryInterface(XSheetCellRange.class,testRange);
-        XSheetCellCursor oCellCursor = oSheet.createCursorByRange
-            (testSheetRange);
-        XCellCursor oCursor = UnoRuntime.queryInterface(XCellCursor.class,oCellCursor);
-
-        boolean bResult = false;
-        int startCol, endCol, startRow, endRow = 0;
-
-        XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oCursor);
-        oCursor.gotoEnd();
-        CellRangeAddress oAddr = oRange.getRangeAddress();
-        startRow = oAddr.StartRow;
-        startCol = oAddr.StartColumn;
-        endRow = oAddr.EndRow;
-        endCol = oAddr.EndColumn;
-        if ((startCol == endCol) && (endRow == startRow)){
-            bResult = true;
-        }
-
-        tRes.tested( "gotoEnd()", bResult );
-    }
-
-    /**
-    * Forces object environment recreation.
-    */
-    @Override
-    protected void after() {
-        disposeEnvironment();
-    }
-
-
-} //EOC _XCellCursor
-

sc/qa/extras/sccellcursorobj.cxx

@@ -25,6 +25,7 @@
 #include <test/sheet/xsubtotalcalculatable.hxx>
 #include <test/sheet/xuniquecellformatrangessupplier.hxx>
 #include <test/sheet/xusedareacursor.hxx>
+#include <test/table/xcellcursor.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -37,6 +38,7 @@ namespace sc_apitest {
 
 class ScCellCursorObj : public CalcUnoApiTest, public apitest::SheetCellRange,
                                                public apitest::XArrayFormulaRange,
+                                               public apitest::XCellCursor,
                                                public apitest::XCellFormatRangesSupplier,
                                                public apitest::XCellRangeAddressable,
                                                public apitest::XCellRangeData,
@@ -70,6 +72,13 @@ public:
     // XArrayFormulaRange
     CPPUNIT_TEST(testGetSetArrayFormula);
 
+    // XCellCursor
+    CPPUNIT_TEST(testGoToNext);
+    CPPUNIT_TEST(testGoToOffset);
+    CPPUNIT_TEST(testGoToPrevious);
+    CPPUNIT_TEST(testGoToStart);
+    CPPUNIT_TEST(testGoToEnd);
+
     // XCellFormatRangesSupplier
     CPPUNIT_TEST(testGetCellFormatRanges);
 

test/Library_subsequenttest.mk

@@ -146,6 +146,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/sheet/xviewsplitable \
 	test/source/sheet/xsubtotalcalculatable \
 	test/source/sheet/xsubtotaldescriptor \
+	test/source/table/xcellcursor \
 	test/source/text/xtext \
 	test/source/text/xtextfield \
 	test/source/text/xtextcontent \

test/source/table/xcellcursor.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#include <test/cppunitasserthelper.hxx>
+
+#include <test/table/xcellcursor.hxx>
+
+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XSheetCellCursor.hpp>
+#include <com/sun/star/sheet/XSheetCellRange.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/table/XCellCursor.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+
+namespace apitest
+{
+void XCellCursor::testGoToNext()
+{
+    uno::Reference<table::XCellCursor> xCellCursor(init(), UNO_QUERY_THROW);
+
+    uno::Reference<sheet::XCellRangeAddressable> xCellRangeAddressable(xCellCursor,
+                                                                       UNO_QUERY_THROW);
+    table::CellRangeAddress aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startCol = aCellRangeAddr.StartColumn;
+
+    xCellCursor->gotoNext();
+
+    aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startCol2 = aCellRangeAddr.StartColumn;
+
+    CPPUNIT_ASSERT_MESSAGE("Sucessfully able to go to Next", startCol != startCol2);
+}
+
+void XCellCursor::testGoToOffset()
+{
+    uno::Reference<table::XCellCursor> xCellCursor(init(), UNO_QUERY_THROW);
+
+    uno::Reference<sheet::XCellRangeAddressable> xCellRangeAddressable(xCellCursor,
+                                                                       UNO_QUERY_THROW);
+    table::CellRangeAddress aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startRow = aCellRangeAddr.StartRow;
+    const sal_Int32 startCol = aCellRangeAddr.StartColumn;
+
+    xCellCursor->gotoOffset(4, 4);
+
+    aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startRow2 = aCellRangeAddr.StartRow;
+    const sal_Int32 startCol2 = aCellRangeAddr.StartColumn;
+
+    CPPUNIT_ASSERT_MESSAGE("Successfully able to go to Offset",
+                           (startCol != startCol2) || (startRow == startRow2));
+}
+
+void XCellCursor::testGoToPrevious()
+{
+    uno::Reference<table::XCellCursor> xCellCursor(init(), UNO_QUERY_THROW);
+
+    uno::Reference<sheet::XCellRangeAddressable> xCellRangeAddressable(xCellCursor,
+                                                                       UNO_QUERY_THROW);
+    xCellCursor->gotoOffset(4, 4);
+
+    table::CellRangeAddress aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startCol = aCellRangeAddr.StartColumn;
+
+    xCellCursor->gotoPrevious();
+
+    aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startCol2 = aCellRangeAddr.StartColumn;
+    CPPUNIT_ASSERT_MESSAGE("Successfully able to go to Previous", startCol != startCol2);
+}
+
+void XCellCursor::testGoToStart()
+{
+    uno::Reference<table::XCellCursor> xCellCursor(init(), UNO_QUERY_THROW);
+
+    uno::Reference<sheet::XCellRangeAddressable> xCellRangeAddressable(xCellCursor,
+                                                                       UNO_QUERY_THROW);
+    xCellCursor->gotoStart();
+
+    table::CellRangeAddress aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+
+    const sal_Int32 startRow = aCellRangeAddr.StartRow;
+    const sal_Int32 startCol = aCellRangeAddr.StartColumn;
+    const sal_Int32 endRow = aCellRangeAddr.EndRow;
+    const sal_Int32 endCol = aCellRangeAddr.EndColumn;
+    CPPUNIT_ASSERT_MESSAGE("Successfully able to got to Start",
+                           (startCol == endCol) && (endRow == startRow));
+}
+
+void XCellCursor::testGoToEnd()
+{
+    uno::Reference<table::XCellCursor> xCellCursor(init(), UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheet> xSpreadsheet(getXSpreadsheet(), UNO_QUERY_THROW);
+    uno::Reference<table::XCellRange> xCellRange(xCellCursor, UNO_QUERY_THROW);
+    xCellRange = xSpreadsheet->getCellRangeByName("$A$1:$g$7");
+    uno::Reference<sheet::XSheetCellRange> xSheetCellRange(xCellCursor, UNO_QUERY_THROW);
+    uno::Reference<sheet::XSheetCellCursor> xSheetCellCursor(xCellCursor, UNO_QUERY_THROW);
+    xSheetCellCursor = xSpreadsheet->createCursorByRange(xSheetCellRange);
+    uno::Reference<sheet::XCellRangeAddressable> xCellRangeAddressable(xCellCursor,
+                                                                       UNO_QUERY_THROW);
+
+    xCellCursor->gotoEnd();
+
+    table::CellRangeAddress aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
+    const sal_Int32 startRow = aCellRangeAddr.StartRow;
+    const sal_Int32 startCol = aCellRangeAddr.StartColumn;
+    const sal_Int32 endRow = aCellRangeAddr.EndRow;
+    const sal_Int32 endCol = aCellRangeAddr.EndColumn;
+    CPPUNIT_ASSERT_MESSAGE("Successfully able to go to End",
+                           (startCol == endCol) && (endRow == startRow));
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */