tdf#45904 Move _XLabelRanges Java test to C++

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

include/test/sheet/xlabelranges.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_XLABELRANGES_HXX
+#define INCLUDED_TEST_SHEET_XLABELRANGES_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 XLabelRanges
+{
+public:
+    virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+    void testAddNew();
+    void testRemoveByIndex();
+
+protected:
+    ~XLabelRanges() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XLABELRANGES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

qadevOOo/Jar_OOoRunner.mk

@@ -606,7 +606,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \
     qadevOOo/tests/java/ifc/sheet/_XHeaderFooterContent \
     qadevOOo/tests/java/ifc/sheet/_XLabelRange \
-    qadevOOo/tests/java/ifc/sheet/_XLabelRanges \
     qadevOOo/tests/java/ifc/sheet/_XMultipleOperation \
     qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
     qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \

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

@@ -2,6 +2,4 @@
 "ScLabelRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 "ScLabelRangesObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScLabelRangesObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScLabelRangesObj";"com::sun::star::sheet::XLabelRanges";"addNew()"
-"ScLabelRangesObj";"com::sun::star::sheet::XLabelRanges";"removeByIndex()"
 "ScLabelRangesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"

qadevOOo/tests/java/ifc/sheet/_XLabelRanges.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 lib.MultiMethodTest;
-
-import com.sun.star.sheet.XLabelRanges;
-import com.sun.star.table.CellRangeAddress;
-
-/**
-* Testing <code>com.sun.star.sheet.XLabelRanges</code>
-* interface methods :
-* <ul>
-*  <li><code> addNew()</code></li>
-*  <li><code> removeByIndex()</code></li>
-* </ul> <p>
-* @see com.sun.star.sheet.XLabelRanges
-*/
-public class _XLabelRanges extends MultiMethodTest {
-
-    public XLabelRanges oObj = null;
-
-    /**
-    * Test calls the method and compares number of label range before method
-    * call and after. <p>
-    * Has <b>OK</b> status if number of label range before method call is less
-    * than after and no exceptions were thrown. <p>
-    */
-    public void _addNew() {
-        int anz = oObj.getCount();
-        oObj.addNew(
-            new CellRangeAddress((short)0, 1, 0, 1, 0),
-            new CellRangeAddress((short)0, 1, 1, 1, 6) );
-        tRes.tested("addNew()", anz < oObj.getCount());
-    }
-
-    /**
-    * Test removes an existent label range first and tries to remove
-    * non-existent label range. <p>
-    * Has <b> OK </b> status if number of range decreased by one after first
-    * call and exception was thrown in second. <p>
-    * The following method tests are to be completed successfully before :
-    * <ul>
-    *  <li> <code> addNew() </code> : to have one label range at least </li>
-    * </ul>
-    */
-    public void _removeByIndex() {
-        requiredMethod("addNew()");
-        int anz = oObj.getCount();
-        log.println("First remove an existent LabelRange");
-
-        oObj.removeByIndex(anz - 1);
-        boolean result = (anz - 1 == oObj.getCount());
-
-        log.println("Remove a nonexistent LabelRange");
-        try {
-            oObj.removeByIndex(anz);
-            log.println("No Exception thrown while removing nonexisting "+
-                "LabelRange");
-            result &= false;
-        } catch (com.sun.star.uno.RuntimeException e) {
-            log.println("Expected exception thrown while removing "+
-                "nonexisting LabelRange: "+e);
-            result &= true;
-        }
-
-        tRes.tested("removeByIndex()", result);
-    }
-
-}  // finish class _XLabelRanges
-
-

sc/CppunitTest_sc_labelrangesobj.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_labelrangesobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_labelrangesobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_labelrangesobj, \
+	sc/qa/extras/sclabelrangesobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_labelrangesobj, \
+	basegfx \
+	comphelper \
+	cppu \
+	cppuhelper \
+	drawinglayer \
+	editeng \
+	for \
+	forui \
+	i18nlangtag \
+	msfilter \
+	oox \
+	sal \
+	salhelper \
+	sax \
+	sb \
+	sc \
+	sfx \
+	sot \
+	subsequenttest \
+	svl \
+	svt \
+	svx \
+	svxcore \
+	test \
+	tk \
+	tl \
+	ucbhelper \
+	unotest \
+	utl \
+	vbahelper \
+	vcl \
+	xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_labelrangesobj,\
+	-I$(SRCDIR)/sc/source/ui/inc \
+	-I$(SRCDIR)/sc/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_labelrangesobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_labelrangesobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_labelrangesobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_labelrangesobj,\
+	basic/util/sb \
+	comphelper/util/comphelp \
+	configmgr/source/configmgr \
+	dbaccess/util/dba \
+	filter/source/config/cache/filterconfig1 \
+	filter/source/storagefilterdetect/storagefd \
+	forms/util/frm \
+	framework/util/fwk \
+	i18npool/util/i18npool \
+	linguistic/source/lng \
+	oox/util/oox \
+	package/source/xstor/xstor \
+	package/util/package2 \
+	sax/source/expatwrap/expwrap \
+	scripting/source/basprov/basprov \
+	scripting/util/scriptframe \
+	sc/util/sc \
+	sc/util/scd \
+	sc/util/scfilt \
+	$(call gb_Helper_optional,SCRIPTING, \
+		sc/util/vbaobj) \
+	sfx2/util/sfx \
+	sot/util/sot \
+	svl/source/fsstor/fsstorage \
+	toolkit/util/tk \
+	ucb/source/core/ucb1 \
+	ucb/source/ucp/file/ucpfile1 \
+	ucb/source/ucp/tdoc/ucptdoc1 \
+	unotools/util/utl \
+	unoxml/source/rdf/unordf \
+	unoxml/source/service/unoxml \
+	uui/util/uui \
+	xmloff/util/xo \
+	svtools/util/svt \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_labelrangesobj))
+
+# vim: set noet sw=4 ts=4:

sc/Module_sc.mk

@@ -137,6 +137,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 	CppunitTest_sc_tableconditionalentryobj \
 	CppunitTest_sc_tableconditionalformatobj \
 	CppunitTest_sc_scenariosobj \
+	CppunitTest_sc_labelrangesobj \
 ))
 
 $(eval $(call gb_Module_add_perfcheck_targets,sc,\

sc/qa/extras/sclabelrangesobj.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/calc_unoapi_test.hxx>
+#include <test/sheet/xlabelranges.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XLabelRanges.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+
+using namespace css;
+using namespace css::uno;
+using namespace com::sun::star;
+
+namespace sc_apitest
+{
+#define NUMBER_OF_TESTS 2
+
+class ScLabelRangesObj : public CalcUnoApiTest, public apitest::XLabelRanges
+{
+public:
+    ScLabelRangesObj();
+
+    virtual uno::Reference<uno::XInterface> init() override;
+    virtual void setUp() override;
+    virtual void tearDown() override;
+
+    CPPUNIT_TEST_SUITE(ScLabelRangesObj);
+
+    // XLabelRanges
+    CPPUNIT_TEST(testAddNew);
+    CPPUNIT_TEST(testRemoveByIndex);
+
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    static sal_Int32 nTest;
+    static uno::Reference<lang::XComponent> mxComponent;
+};
+
+sal_Int32 ScLabelRangesObj::nTest = 0;
+uno::Reference<lang::XComponent> ScLabelRangesObj::mxComponent;
+
+ScLabelRangesObj::ScLabelRangesObj()
+    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScLabelRangesObj::init()
+{
+    // create a calc document
+    if (!mxComponent.is())
+        mxComponent = loadFromDesktop("private:factory/scalc");
+
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
+    CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+    uno::Reference<beans::XPropertySet> xProp(xDoc, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XLabelRanges> xLabelRanges(xProp->getPropertyValue("ColumnLabelRanges"),
+                                                     uno::UNO_QUERY_THROW);
+
+    table::CellRangeAddress aCellRanageAddr1(0, 0, 1, 0, 6);
+    table::CellRangeAddress aCellRanageAddr2(0, 0, 0, 0, 1);
+    xLabelRanges->addNew(aCellRanageAddr1, aCellRanageAddr2);
+
+    return xLabelRanges;
+}
+
+void ScLabelRangesObj::setUp()
+{
+    nTest++;
+    CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
+    CalcUnoApiTest::setUp();
+}
+
+void ScLabelRangesObj::tearDown()
+{
+    if (nTest == NUMBER_OF_TESTS)
+    {
+        closeDocument(mxComponent);
+        mxComponent.clear();
+    }
+
+    CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScLabelRangesObj);
+
+} // end namespace
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

test/Library_subsequenttest.mk

@@ -60,6 +60,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/sheet/xdatapilotfieldgrouping \
 	test/source/sheet/xdatapilottable \
 	test/source/sheet/xdatapilottable2 \
+	test/source/sheet/xlabelranges \
 	test/source/sheet/xnamedrange \
 	test/source/sheet/xnamedranges \
 	test/source/sheet/xprintareas \

test/source/sheet/xlabelranges.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/xlabelranges.hxx>
+
+#include <com/sun/star/sheet/XLabelRanges.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace css;
+using namespace css::uno;
+
+namespace apitest
+{
+void XLabelRanges::testAddNew()
+{
+    uno::Reference<sheet::XLabelRanges> xLabelRanges(init(), UNO_QUERY_THROW);
+
+    const sal_Int32 nCount = xLabelRanges->getCount();
+    xLabelRanges->addNew(table::CellRangeAddress(0, 1, 0, 1, 0),
+                         table::CellRangeAddress(0, 1, 1, 1, 6));
+
+    CPPUNIT_ASSERT_MESSAGE("Unable to add new range", nCount < xLabelRanges->getCount());
+}
+
+void XLabelRanges::testRemoveByIndex()
+{
+    uno::Reference<sheet::XLabelRanges> xLabelRanges(init(), UNO_QUERY_THROW);
+
+    const sal_Int32 nCount = xLabelRanges->getCount();
+    xLabelRanges->removeByIndex(nCount - 1);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove range", (nCount - 1), xLabelRanges->getCount());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */