tdf#45904 Move _XSheetAuditing Java tests to C++

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

include/test/sheet/xsheetauditing.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_SHEET_XSHEETAUDITING_HXX
+#define INCLUDED_TEST_SHEET_XSHEETAUDITING_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 XSheetAuditing
+{
+public:
+    virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+    void testShowHideDependents();
+    void testShowHidePrecedents();
+    void testShowErrors();
+    void testShowInvalid();
+    void testClearArrows();
+
+protected:
+    ~XSheetAuditing() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETAUDITING_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

qadevOOo/Jar_OOoRunner.mk

@@ -611,7 +611,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/sheet/_XScenario \
     qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced \
     qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
-    qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
     qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
     qadevOOo/tests/java/ifc/style/_CharacterProperties \
     qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \

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

@@ -142,13 +142,6 @@
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryColumnDifferences()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryRowDifferences()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryIntersection()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"hideDependents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"hidePrecedents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showDependents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showPrecedents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showErrors()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showInvalid()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"clearArrows()"
 "ScTableSheetObj";"com::sun::star::sheet::XScenario";"getIsScenario()"
 "ScTableSheetObj";"com::sun::star::sheet::XScenario";"getScenarioComment()"
 "ScTableSheetObj";"com::sun::star::sheet::XScenario";"setScenarioComment()"

qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.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.sheet;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.drawing.XDrawPage;
-import com.sun.star.drawing.XDrawPageSupplier;
-import com.sun.star.drawing.XShape;
-import com.sun.star.sheet.ValidationType;
-import com.sun.star.sheet.XSheetAuditing;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.XCell;
-import com.sun.star.text.XText;
-import com.sun.star.uno.UnoRuntime;
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
-/**
- *
- */
-public class _XSheetAuditing extends MultiMethodTest {
-    public XSheetAuditing oObj = null;
-    CellAddress address = null;
-    CellAddress precedentAddress = null;
-    CellAddress dependentAddress = null;
-    XCell xAddress = null;
-    XCell xPrecedentAddress = null;
-    XDrawPage xDrawPage = null;
-    int elementCount = 0;
-
-    @Override
-    public void before() {
-        address = (CellAddress)tEnv.getObjRelation("XSheetAuditing.CellAddress");
-        precedentAddress = (CellAddress)tEnv.getObjRelation("XSheetAuditing.PrecedentCellAddress");
-        dependentAddress= (CellAddress)tEnv.getObjRelation("XSheetAuditing.DependentCellAddress");
-        if (address == null || precedentAddress == null || dependentAddress == null) {
-            throw new StatusException(Status.failed("Necessary CellAddress object relations not found."));
-        }
-
-        // get the draw page for checking the shapes
-        xDrawPage = (XDrawPage)tEnv.getObjRelation("XSheetAuditing.DrawPage");
-        if (xDrawPage == null) { // get from object
-            XDrawPageSupplier oDPS = UnoRuntime.queryInterface(XDrawPageSupplier.class, oObj);
-            xDrawPage = oDPS.getDrawPage();
-        }
-        if (xDrawPage == null) {
-            throw new StatusException(Status.failed("'XSheetAuditing.DrawPage' object relation not found."));
-        }
-        if (xDrawPage.hasElements()) {
-            elementCount = xDrawPage.getCount();
-        }
-
-        // get a sheet for changing the cells
-        XSpreadsheet xSheet = (XSpreadsheet)tEnv.getObjRelation("XSheetAuditing.Spreadsheet");
-        if (xSheet == null) // query on their object
-            xSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj);
-        if (xSheet == null)
-            throw new StatusException(Status.failed("'XSheetAuditing.Spreadsheet' object relation not found."));
-        try {
-            xAddress = xSheet.getCellByPosition(address.Column, address.Row);
-            xSheet.getCellByPosition(dependentAddress.Column, dependentAddress.Row);
-            xPrecedentAddress = xSheet.getCellByPosition(precedentAddress.Column, precedentAddress.Row);
-        }
-        catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-            throw new StatusException(e, Status.failed("Invalid cell addresses in object relations."));
-        }
-    }
-
-    public void _clearArrows() {
-        requiredMethod("hideDependents()");
-        boolean erg = false;
-        oObj.showDependents(address);
-        oObj.showPrecedents(address);
-        erg = hasRightAmountOfShapes(3);
-        oObj.clearArrows();
-        erg &= hasRightAmountOfShapes(0);
-        tRes.tested("clearArrows()", erg);
-    }
-
-    public void _hideDependents() {
-        requiredMethod("showDependents()");
-        oObj.hideDependents(address);
-        tRes.tested("hideDependents()", hasRightAmountOfShapes(0));
-    }
-
-    public void _hidePrecedents() {
-        requiredMethod("showPrecedents()");
-        oObj.hidePrecedents(address);
-        tRes.tested("hidePrecedents()", hasRightAmountOfShapes(0));
-    }
-
-    public void _showDependents() {
-        requiredMethod("hidePrecedents()");
-        oObj.showDependents(address);
-        tRes.tested("showDependents()", hasRightAmountOfShapes(1));
-    }
-
-    public void _showErrors() {
-        requiredMethod("clearArrows()");
-        // construct an error: square root from -3
-        xPrecedentAddress.setValue(-9);
-        String cellAddress = "" + (char)('A' + precedentAddress.Column) + (precedentAddress.Row + 1);
-        xAddress.setFormula("=SQRT(" + cellAddress + ")");
-        XText xText = UnoRuntime.queryInterface(XText.class, xAddress);
-        // correct error in cell:
-        String error = xText.getString();
-        boolean erg = error.equals("Err:502");
-        log.println("Content: " + error);
-        oObj.showErrors(dependentAddress);
-        erg &= hasRightAmountOfShapes(2);
-        tRes.tested("showErrors()", erg);
-    }
-
-    public void _showInvalid() {
-        requiredMethod("showErrors()");
-        boolean result = true;
-        // insert a value
-        xAddress.setValue(2.5);
-        try {
-            // add a validitation to a cell: only whole numbers are allowed
-            XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xAddress);
-            Object o = xPropertySet.getPropertyValue("Validation");
-            XPropertySet xValidation = UnoRuntime.queryInterface(XPropertySet.class, o);
-            xValidation.setPropertyValue("Type", ValidationType.WHOLE);
-            xPropertySet.setPropertyValue("Validation", xValidation);
-            // test
-            oObj.showInvalid();
-            result = hasRightAmountOfShapes(1);
-            oObj.clearArrows();
-            result &= hasRightAmountOfShapes(0);
-            // revoke the validitation to a cell
-            xValidation.setPropertyValue("Type", ValidationType.ANY);
-            xPropertySet.setPropertyValue("Validation", xValidation);
-            // test again
-            oObj.showInvalid();
-            result &= hasRightAmountOfShapes(0);
-        }
-        catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace(log);
-            result = false;
-        }
-
-        tRes.tested("showInvalid()", result);
-    }
-
-    public void _showPrecedents() {
-        oObj.showPrecedents(address);
-        tRes.tested("showPrecedents()", hasRightAmountOfShapes(2));
-    }
-
-    /**
-     * Check if the amount of shapes is the right one after displaying that stuff
-     * 2do improve this: check that the shapes are the correct ones -> convwatch
-     * @desiredValue That's the amount of shapes that have to be here.
-     * @return True, if the actual count of shapes is the same
-     */
-    private boolean hasRightAmountOfShapes(int desiredValue) {
-        int newCount = xDrawPage.getCount();
-        if (newCount != elementCount + desiredValue) {
-            return false;
-        }
-        else {
-            if (desiredValue >= 0) {
-                for (int i=elementCount; i<newCount; i++) {
-                    try {
-                        Object o = xDrawPage.getByIndex(i);
-                        XShape xShape = UnoRuntime.queryInterface(XShape.class, o);
-                        System.out.println("Shape Type: " + xShape.getShapeType());
-                    }
-                    catch(com.sun.star.uno.Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-        return true;
-    }
-}

sc/qa/extras/sctablesheetobj.cxx

@@ -12,6 +12,7 @@
 #include <test/sheet/xprintareas.hxx>
 #include <test/sheet/xscenariossupplier.hxx>
 #include <test/sheet/xsheetannotationssupplier.hxx>
+#include <test/sheet/xsheetauditing.hxx>
 #include <test/sheet/xsheetcellrange.hxx>
 #include <test/sheet/xsheetfilterable.hxx>
 #include <test/sheet/xsheetfilterableex.hxx>
@@ -33,7 +34,7 @@ using namespace css::uno;
 namespace sc_apitest
 {
 
-#define NUMBER_OF_TESTS 25
+#define NUMBER_OF_TESTS 30
 
 class ScTableSheetObj : public CalcUnoApiTest, public apitest::XCellSeries,
                                                public apitest::XPrintAreas,
@@ -41,6 +42,7 @@ class ScTableSheetObj : public CalcUnoApiTest, public apitest::XCellSeries,
                                                public apitest::XScenariosSupplier,
                                                public apitest::XSearchable,
                                                public apitest::XSheetAnnotationsSupplier,
+                                               public apitest::XSheetAuditing,
                                                public apitest::XSheetCellRange,
                                                public apitest::XSheetFilterable,
                                                public apitest::XSheetFilterableEx,
@@ -87,6 +89,13 @@ public:
     // XSheetAnnotationsSupplier
     CPPUNIT_TEST(testGetAnnotations);
 
+    // XSheetAuditing
+    CPPUNIT_TEST(testShowHideDependents);
+    CPPUNIT_TEST(testShowHidePrecedents);
+    CPPUNIT_TEST(testClearArrows);
+    CPPUNIT_TEST(testShowErrors);
+    CPPUNIT_TEST(testShowInvalid);
+
     // XSheetCellRange
     CPPUNIT_TEST(testGetSpreadsheet);
 
@@ -146,12 +155,17 @@ uno::Reference< uno::XInterface > ScTableSheetObj::init()
     createFileURL("ScTableSheetObj.ods", maFileURL);
     if (!mxComponent.is())
         mxComponent = loadFromDesktop(maFileURL, "com.sun.star.sheet.SpreadsheetDocument");
-    CPPUNIT_ASSERT(mxComponent.is());
+    CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is());
 
     uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
     uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW);
     uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW);
 
+    xSheet->getCellByPosition(6, 6)->setValue(3);
+    xSheet->getCellByPosition(7, 6)->setValue(3);
+    xSheet->getCellByPosition(8, 6)->setFormula("= SUM(G7:H7)");
+    xSheet->getCellByPosition(9, 6)->setFormula("= G7*I7");
+
     return xSheet;
 }
 
@@ -160,7 +174,7 @@ uno::Reference< uno::XInterface > ScTableSheetObj::getXSpreadsheet()
     createFileURL("ScTableSheetObj.ods", maFileURL);
     if (!mxComponent.is())
         mxComponent = loadFromDesktop(maFileURL, "com.sun.star.sheet.SpreadsheetDocument");
-    CPPUNIT_ASSERT(mxComponent.is());
+    CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is());
 
     uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
     uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW);

test/Library_subsequenttest.mk

@@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/sheet/xsheetannotations \
 	test/source/sheet/xsheetannotationssupplier \
 	test/source/sheet/xsheetannotationshapesupplier \
+	test/source/sheet/xsheetauditing \
 	test/source/sheet/xsheetcellrangecontainer \
 	test/source/sheet/xsheetcellrange \
 	test/source/sheet/xsheetcellranges \

test/source/sheet/xsheetauditing.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/sheet/xsheetauditing.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/sheet/XSheetAuditing.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/ValidationType.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/XCell.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace css;
+using namespace css::uno;
+
+namespace apitest
+{
+void XSheetAuditing::testShowHideDependents()
+{
+    uno::Reference<sheet::XSheetAuditing> xAuditing(init(), UNO_QUERY_THROW);
+
+    uno::Reference<drawing::XDrawPageSupplier> xDPS(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDPS->getDrawPage();
+    const sal_Int32 nElements = xDrawPage->getCount();
+
+    xAuditing->showDependents(table::CellAddress(0, 8, 6));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to showDependents()", nElements + 1,
+                                 xDrawPage->getCount());
+
+    xAuditing->hideDependents(table::CellAddress(0, 8, 6));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to hideDependents()", nElements, xDrawPage->getCount());
+}
+
+void XSheetAuditing::testShowHidePrecedents()
+{
+    uno::Reference<sheet::XSheetAuditing> xAuditing(init(), UNO_QUERY_THROW);
+
+    uno::Reference<drawing::XDrawPageSupplier> xDPS(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDPS->getDrawPage();
+    const sal_Int32 nElements = xDrawPage->getCount();
+
+    xAuditing->showPrecedents(table::CellAddress(0, 8, 6));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to showPrecedents()", nElements + 2,
+                                 xDrawPage->getCount());
+
+    xAuditing->hidePrecedents(table::CellAddress(0, 8, 6));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to showPrecedents()", nElements, xDrawPage->getCount());
+}
+
+void XSheetAuditing::testClearArrows()
+{
+    uno::Reference<sheet::XSheetAuditing> xAuditing(init(), UNO_QUERY_THROW);
+
+    uno::Reference<drawing::XDrawPageSupplier> xDPS(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDPS->getDrawPage();
+    const sal_Int32 nElements = xDrawPage->getCount();
+
+    xAuditing->showPrecedents(table::CellAddress(0, 8, 6));
+    xAuditing->showDependents(table::CellAddress(0, 8, 6));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set arrows", nElements + 3, xDrawPage->getCount());
+
+    xAuditing->clearArrows();
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to clear arrows", nElements, xDrawPage->getCount());
+}
+
+void XSheetAuditing::testShowErrors()
+{
+    uno::Reference<sheet::XSheetAuditing> xAuditing(init(), UNO_QUERY_THROW);
+
+    uno::Reference<drawing::XDrawPageSupplier> xDPS(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDPS->getDrawPage();
+    const sal_Int32 nElements = xDrawPage->getCount();
+
+    uno::Reference<sheet::XSpreadsheet> xSheet(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<table::XCell> xCell = xSheet->getCellByPosition(7, 6);
+    xCell->setValue(-9);
+    xCell->setFormula("=SQRT(" + OUString(static_cast<char>('A' + 7)) + OUString::number(7) + ")");
+
+    uno::Reference<text::XText> xText(xCell, UNO_QUERY_THROW);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("No error code", OUString("Err:522"), xText->getString());
+
+    xAuditing->showErrors(table::CellAddress(0, 7, 6));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to show errors", nElements + 1, xDrawPage->getCount());
+}
+
+void XSheetAuditing::testShowInvalid()
+{
+    uno::Reference<sheet::XSheetAuditing> xAuditing(init(), UNO_QUERY_THROW);
+
+    uno::Reference<drawing::XDrawPageSupplier> xDPS(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDPS->getDrawPage();
+    const sal_Int32 nElements = xDrawPage->getCount();
+
+    uno::Reference<sheet::XSpreadsheet> xSheet(xAuditing, UNO_QUERY_THROW);
+    uno::Reference<table::XCell> xCell = xSheet->getCellByPosition(7, 6);
+    xCell->setValue(2.5);
+
+    uno::Reference<beans::XPropertySet> xPropSet(xCell, UNO_QUERY_THROW);
+    uno::Any aValidation = xPropSet->getPropertyValue("Validation");
+    uno::Reference<beans::XPropertySet> xValidation(aValidation, UNO_QUERY_THROW);
+    uno::Any aAny;
+
+    aAny <<= sheet::ValidationType_WHOLE;
+    xValidation->setPropertyValue("Type", aAny);
+    aAny <<= xValidation;
+    xPropSet->setPropertyValue("Validation", aAny);
+    xAuditing->showInvalid();
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to show invalid (WHOLE)", nElements + 1,
+                                 xDrawPage->getCount());
+
+    xAuditing->clearArrows();
+
+    aAny <<= sheet::ValidationType_ANY;
+    xValidation->setPropertyValue("Type", aAny);
+    aAny <<= xValidation;
+    xPropSet->setPropertyValue("Validation", aAny);
+
+    xAuditing->showInvalid();
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to show invalid (ANY)", nElements, xDrawPage->getCount());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */