[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_arealinksobj.mk sc/Module_sc.mk sc/qa test/Library_subsequenttest.mk test/source
Jens Carl
j.carl43 at gmx.de
Sun Oct 8 23:16:22 UTC 2017
include/test/sheet/xarealinks.hxx | 39 +++
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv | 2
qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java | 98 ---------
sc/CppunitTest_sc_arealinksobj.mk | 107 ++++++++++
sc/Module_sc.mk | 1
sc/qa/extras/scarealinksobj.cxx | 97 +++++++++
test/Library_subsequenttest.mk | 1
test/source/sheet/xarealinks.cxx | 50 ++++
9 files changed, 295 insertions(+), 101 deletions(-)
New commits:
commit f3c6264d1e8a599ddfb23f6dc9a9dd2e42885c19
Author: Jens Carl <j.carl43 at gmx.de>
Date: Sun Sep 3 08:04:24 2017 +0000
tdf#45904: Move _XAreaLinks Java to C++
This allows to re-activate the test and fixes #i84701.
Change-Id: Ifd295e9521a04e88a68aa96fad8f9e8e32f927fa
Reviewed-on: https://gerrit.libreoffice.org/41855
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/include/test/sheet/xarealinks.hxx b/include/test/sheet/xarealinks.hxx
new file mode 100644
index 000000000000..f85667b9b15e
--- /dev/null
+++ b/include/test/sheet/xarealinks.hxx
@@ -0,0 +1,39 @@
+/* -*- 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_XAREALINKS_HXX
+#define INCLUDED_TEST_SHEET_XAREALINKS_HXX
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <test/testdllapi.hxx>
+
+using namespace css;
+using namespace css::uno;
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XAreaLinks
+{
+public:
+ virtual uno::Reference< uno::XInterface > init() = 0;
+
+ void testInsertAtPosition();
+ void testRemoveByIndex();
+
+protected:
+ ~XAreaLinks(){}
+
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XAREALINKS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index f29279109c4a..fb9e160cde8e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -584,7 +584,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
qadevOOo/tests/java/ifc/sheet/_TableValidation \
qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
- qadevOOo/tests/java/ifc/sheet/_XAreaLinks \
qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
qadevOOo/tests/java/ifc/sheet/_XCalculatable \
qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
index 67a7cb9178da..f88bd91a2c70 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
@@ -1,7 +1,5 @@
"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getCount()"
"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScAreaLinksObj";"com::sun::star::sheet::XAreaLinks";"insertAtPosition()"
-"ScAreaLinksObj";"com::sun::star::sheet::XAreaLinks";"removeByIndex()"
"ScAreaLinksObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAreaLinksObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScAreaLinksObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java b/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java
deleted file mode 100644
index 07b64b6a0b18..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.sheet.XAreaLinks;
-import com.sun.star.table.CellAddress;
-import lib.MultiMethodTest;
-
-/**
-* Testing <code>com.sun.star.sheet.XAreaLinks</code>
-* interface methods :
-* <ul>
-* <li><code> insertAtPosition()</code></li>
-* <li><code> removeByIndex()</code></li>
-* </ul> <p>
-* Test is <b> NOT </b> multithread compliant. <p>
-* @see com.sun.star.sheet.XAreaLinks
-*/
-public class _XAreaLinks extends MultiMethodTest {
-
- public XAreaLinks oObj = null;
-
- /**
- * Inserts a new link into collection. Checks number of links
- * before and after method call. <p>
- * Has <b>OK</b> status if after method call number of
- * links increased by 1.
- */
- public void _insertAtPosition(){
- boolean bResult = true ;
- int cnt = 0;
-
- cnt = oObj.getCount() ;
- CellAddress addr = new CellAddress ((short) 1,2,3) ;
- String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc");
- oObj.insertAtPosition (addr, aSourceArea, "a2:b5", "", "") ;
-
- if (bResult) {
- int new_cnt = oObj.getCount() ;
-
- if (cnt + 1 != new_cnt) {
- bResult = false ;
- log.println("Number of links before insertAtPosition() call was " + cnt +
- ", after call is " + new_cnt) ;
- }
- }
-
- tRes.tested("insertAtPosition()", bResult) ;
- }
-
-
- /**
- * Removes a link from collection. Checks number of links
- * before and after method call. <p>
- * Has <b>OK</b> status if after method call number of
- * links decreases by 1. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> insertAtPosition </code> : to have at least one link. </li>
- * </ul>
- */
- public void _removeByIndex(){
- requiredMethod("insertAtPosition()") ;
-
- boolean bResult = true ;
- int lcnt = 0;
-
- lcnt = oObj.getCount() ;
- oObj.removeByIndex(0) ;
-
- int new_lcnt = oObj.getCount() ;
- if (lcnt - 1 != new_lcnt) {
- bResult = false ;
- log.println(" # Number of links before removeByIndex() call was " +
- lcnt + ", after call is " + new_lcnt) ;
- }
- tRes.tested("removeByIndex()", bResult) ;
- }
-
-} //EOC _XAreaLinks
-
-
diff --git a/sc/CppunitTest_sc_arealinksobj.mk b/sc/CppunitTest_sc_arealinksobj.mk
new file mode 100644
index 000000000000..dead8dfb28bd
--- /dev/null
+++ b/sc/CppunitTest_sc_arealinksobj.mk
@@ -0,0 +1,107 @@
+# -*- 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_arealinksobj))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_arealinksobj, \
+ sc/qa/extras/scarealinksobj \
+))
+
+$(eval $(call gb_CppunitTest_use_external,sc_arealinksobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_arealinksobj, \
+ 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_arealinksobj,\
+ -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(SRCDIR)/sc/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_arealinksobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_arealinksobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_arealinksobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_arealinksobj,\
+ 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_arealinksobj))
+
+# vim: set noet sw=4 ts=4:
+
+
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3698137d27f6..bd5b7696e4fa 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -130,6 +130,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_arealinkobj \
CppunitTest_sc_datapilotitemobj \
CppunitTest_sc_subtotalfieldobj \
+ CppunitTest_sc_arealinksobj \
))
$(eval $(call gb_Module_add_perfcheck_targets,sc,\
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
new file mode 100644
index 000000000000..21a90ee6f6c0
--- /dev/null
+++ b/sc/qa/extras/scarealinksobj.cxx
@@ -0,0 +1,97 @@
+/* -*- 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/xarealinks.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XAreaLinks.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest {
+
+#define NUMBER_OF_TESTS 2
+
+class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks
+{
+public:
+ ScAreaLinksObj();
+
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScAreaLinksObj);
+
+ // XAreaLinks
+ CPPUNIT_TEST(testInsertAtPosition);
+ CPPUNIT_TEST(testRemoveByIndex);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ static sal_Int32 nTest;
+ static uno::Reference< lang::XComponent > mxComponent;
+
+};
+
+sal_Int32 ScAreaLinksObj::nTest = 0;
+uno::Reference< lang::XComponent > ScAreaLinksObj::mxComponent;
+
+ScAreaLinksObj::ScAreaLinksObj()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference< uno::XInterface > ScAreaLinksObj::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 > xPropSet(xDoc, uno::UNO_QUERY_THROW);
+ uno::Reference< sheet::XAreaLinks > xLinks(xPropSet->getPropertyValue("AreaLinks"), uno::UNO_QUERY_THROW);
+
+ return xLinks;
+}
+
+void ScAreaLinksObj::setUp()
+{
+ nTest++;
+ CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
+ CalcUnoApiTest::setUp();
+}
+
+void ScAreaLinksObj::tearDown()
+{
+ if (nTest == NUMBER_OF_TESTS)
+ {
+ closeDocument(mxComponent);
+ mxComponent.clear();
+ }
+
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinksObj);
+
+} // end namespace
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index bda4b7a8613b..2270669a0945 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/datapilotfield \
test/source/sheet/datapilotitem \
test/source/sheet/xarealink \
+ test/source/sheet/xarealinks \
test/source/sheet/xcelladdressable \
test/source/sheet/xcellrangedata \
test/source/sheet/xcellrangereferrer \
diff --git a/test/source/sheet/xarealinks.cxx b/test/source/sheet/xarealinks.cxx
new file mode 100644
index 000000000000..e1f59f3b2ab3
--- /dev/null
+++ b/test/source/sheet/xarealinks.cxx
@@ -0,0 +1,50 @@
+/* -*- 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/xarealinks.hxx>
+
+#include <com/sun/star/sheet/XAreaLinks.hpp>
+#include <com/sun/star/table/CellAddress.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 XAreaLinks::testInsertAtPosition()
+{
+ uno::Reference< sheet::XAreaLinks > xAreaLinks(init(), UNO_QUERY_THROW);
+
+ table::CellAddress aCellAddress(1, 2, 3);
+ xAreaLinks->insertAtPosition(aCellAddress, "", "a2:b5", "", "");
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to insert new CellAddress",
+ sal_Int32(1), xAreaLinks->getCount());
+}
+
+void XAreaLinks::testRemoveByIndex()
+{
+ uno::Reference< sheet::XAreaLinks > xAreaLinks(init(), UNO_QUERY_THROW);
+
+ table::CellAddress aCellAddress(1, 2, 3);
+ xAreaLinks->insertAtPosition(aCellAddress, "", "a2:b5", "", "");
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to insert CellAddress for removal",
+ sal_Int32(1), xAreaLinks->getCount());
+
+ xAreaLinks->removeByIndex(0);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellAddress",
+ sal_Int32(0), xAreaLinks->getCount());
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list