[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
Jens Carl
j.carl43 at gmx.de
Sun Aug 27 07:53:05 UTC 2017
include/test/sheet/cellarealink.hxx | 38 +++
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinkObj.csv | 5
qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java | 39 ---
sc/qa/extras/scarealinkobj.cxx | 13 -
test/Library_subsequenttest.mk | 1
test/source/sheet/cellarealink.cxx | 112 ++++++++++
7 files changed, 162 insertions(+), 47 deletions(-)
New commits:
commit 90b5555e3ac951c6387f1fc9110119655b23b832
Author: Jens Carl <j.carl43 at gmx.de>
Date: Thu Aug 24 00:15:39 2017 +0000
tdf#45904 Move _CellAreaLink Java tests to C++
Change-Id: I82dac69dfed136eaf96771bf1ef2b8dfbf4e05aa
Reviewed-on: https://gerrit.libreoffice.org/41488
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/include/test/sheet/cellarealink.hxx b/include/test/sheet/cellarealink.hxx
new file mode 100644
index 000000000000..a5f63747d316
--- /dev/null
+++ b/include/test/sheet/cellarealink.hxx
@@ -0,0 +1,38 @@
+/* -*- 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_CELLAREALINK_HXX
+#define INCLUDED_TEST_SHEET_CELLAREALINK_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 CellAreaLink
+{
+public:
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+
+ void testUrl();
+ void testFilter();
+ void testFilterOptions();
+ void testRefreshDelay();
+ void testRefreshPeriod();
+
+protected:
+ ~CellAreaLink() {}
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_CELLAREALINK_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 c09c9134c895..833e32163ac4 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -563,7 +563,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer \
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer \
qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster \
- qadevOOo/tests/java/ifc/sheet/_CellAreaLink \
qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor \
qadevOOo/tests/java/ifc/sheet/_DatabaseRange \
qadevOOo/tests/java/ifc/sheet/_DataPilotItem \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinkObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinkObj.csv
index a16e668d5547..258ab7268840 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinkObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinkObj.csv
@@ -1,8 +1,3 @@
-"ScAreaLinkObj";"com::sun::star::sheet::CellAreaLink";"Url"
-"ScAreaLinkObj";"com::sun::star::sheet::CellAreaLink";"Filter"
-"ScAreaLinkObj";"com::sun::star::sheet::CellAreaLink";"FilterOptions"
-"ScAreaLinkObj";"com::sun::star::sheet::CellAreaLink";"RefreshDelay"
-"ScAreaLinkObj";"com::sun::star::sheet::CellAreaLink";"RefreshPeriod#optional"
"ScAreaLinkObj";"com::sun::star::util::XRefreshable";"refresh()"
"ScAreaLinkObj";"com::sun::star::util::XRefreshable";"addRefreshListener()"
"ScAreaLinkObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java b/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java
deleted file mode 100644
index cf612afb4327..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java
+++ /dev/null
@@ -1,39 +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 lib.MultiPropertyTest;
-
-/**
-* Testing <code>com.sun.star.sheet.CellAreaLink</code>
-* service properties :
-* <ul>
-* <li><code> Url</code></li>
-* <li><code> Filter</code></li>
-* <li><code> FilterOptions</code></li>
-* <li><code> RefreshDelay</code></li>
-* </ul> <p>
-* Properties testing is automated by <code>lib.MultiPropertyTest</code>.
-* @see com.sun.star.sheet.CellAreaLink
-*/
-public class _CellAreaLink extends MultiPropertyTest {
-
-} // finish class _CellAreaLink
-
-
diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx
index f918f5116356..c2bbb3f1fb08 100644
--- a/sc/qa/extras/scarealinkobj.cxx
+++ b/sc/qa/extras/scarealinkobj.cxx
@@ -8,6 +8,8 @@
*/
#include <test/calc_unoapi_test.hxx>
+
+#include <test/sheet/cellarealink.hxx>
#include <test/sheet/xarealink.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -25,9 +27,9 @@ using namespace css::uno;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 4
+#define NUMBER_OF_TESTS 9
-class ScAreaLink : public CalcUnoApiTest, public apitest::XAreaLink
+class ScAreaLink : public CalcUnoApiTest, public apitest::CellAreaLink, public apitest::XAreaLink
{
public:
ScAreaLink();
@@ -38,6 +40,13 @@ public:
CPPUNIT_TEST_SUITE(ScAreaLink);
+ // CellAreaLink
+ CPPUNIT_TEST(testUrl);
+ CPPUNIT_TEST(testFilter);
+ CPPUNIT_TEST(testFilterOptions);
+ CPPUNIT_TEST(testRefreshDelay);
+ CPPUNIT_TEST(testRefreshPeriod);
+
// XAreaLink
CPPUNIT_TEST(testGetDestArea);
CPPUNIT_TEST(testGetSourceArea);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 2563e0aa06f9..fac8f1b7706f 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/container/xnamecontainer \
test/source/container/xnamereplace \
test/source/container/xnamed \
+ test/source/sheet/cellarealink \
test/source/sheet/cellproperties \
test/source/sheet/datapilotfield \
test/source/sheet/xarealink \
diff --git a/test/source/sheet/cellarealink.cxx b/test/source/sheet/cellarealink.cxx
new file mode 100644
index 000000000000..0c5b1cbcc11a
--- /dev/null
+++ b/test/source/sheet/cellarealink.cxx
@@ -0,0 +1,112 @@
+/* -*- 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/cellarealink.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XAreaLink.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 CellAreaLink::testUrl()
+{
+ uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW);
+
+ const OUString propName("Url");
+
+ OUString aUrl;
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aUrl);
+ // FIXME: set a value in ScAreaLinkObj (if nothing is used it points to the home directory
+ // of the user)
+ //CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Url already changed", OUString("file:///home/"), aUrl);
+
+ uno::Any aNewUrl;
+ aNewUrl <<= OUString("file:///tmp");
+ xCellAreaLink->setPropertyValue(propName, aNewUrl);
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aUrl);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of Url wasn't changed", OUString("file:///tmp"), aUrl);
+}
+
+void CellAreaLink::testFilter()
+{
+ uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW);
+
+ const OUString propName("Filter");
+
+ OUString aFilter;
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilter);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Filter already changed", OUString(""), aFilter);
+
+ uno::Any aNewFilter;
+ aNewFilter <<= OUString("UnitTest");
+ xCellAreaLink->setPropertyValue(propName, aNewFilter);
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilter);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of Filter wasn't changed", OUString("UnitTest"), aFilter);
+}
+
+void CellAreaLink::testFilterOptions()
+{
+ uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW);
+
+ const OUString propName("FilterOptions");
+
+ OUString aFilterOptions;
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilterOptions);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default FilterOptions already changed", OUString(""), aFilterOptions);
+
+ uno::Any aNewFilterOptions;
+ aNewFilterOptions <<= OUString("UnitTest");
+ xCellAreaLink->setPropertyValue(propName, aNewFilterOptions);
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilterOptions);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of FilterOptions wasn't changed", OUString("UnitTest"), aFilterOptions);
+}
+
+void CellAreaLink::testRefreshDelay()
+{
+ uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW);
+
+ const OUString propName("RefreshDelay");
+
+ sal_Int32 aRefreshDelay = 0;
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshDelay);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshDelay already changed", sal_Int32(0), aRefreshDelay);
+
+ uno::Any aNewRefreshDelay;
+ aNewRefreshDelay <<= static_cast<sal_Int32>(42);
+ xCellAreaLink->setPropertyValue(propName, aNewRefreshDelay);
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshDelay);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshDelay wasn't changed", sal_Int32(42), aRefreshDelay);
+}
+
+void CellAreaLink::testRefreshPeriod()
+{
+ uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW);
+
+ const OUString propName("RefreshPeriod");
+
+ sal_Int32 aRefreshPeriod = 0;
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshPeriod);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshPeriod already changed", sal_Int32(0), aRefreshPeriod);
+
+ uno::Any aNewRefreshPeriod;
+ aNewRefreshPeriod <<= static_cast<sal_Int32>(42);
+ xCellAreaLink->setPropertyValue(propName, aNewRefreshPeriod);
+ CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshPeriod);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshPeriod wasn't changed", sal_Int32(42), aRefreshPeriod);
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list