[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_cellfieldsobj.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 8 03:02:41 UTC 2018
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv | 3
sc/CppunitTest_sc_cellfieldsobj.mk | 43 ++++
sc/Module_sc.mk | 1
sc/qa/extras/sccellfieldsobj.cxx | 98 ++++++++++
4 files changed, 142 insertions(+), 3 deletions(-)
New commits:
commit 47d7608395bde93782cd9642abeeebe482ddf301
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Fri Dec 7 20:47:38 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Sat Dec 8 04:02:16 2018 +0100
tdf#45904 Move XRefreshable Java tests to C++
Move XRefreshable Java tests to C++ for ScCellFieldsObj.
Change-Id: Ic5679c32669b1368a702c9b132e6789fb828330f
Reviewed-on: https://gerrit.libreoffice.org/64793
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv
index 8e7210da3839..dac1b035ea34 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv
@@ -1,6 +1,3 @@
-"ScCellFieldsObj";"com::sun::star::util::XRefreshable";"refresh()"
-"ScCellFieldsObj";"com::sun::star::util::XRefreshable";"addRefreshListener()"
-"ScCellFieldsObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()"
"ScCellFieldsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScCellFieldsObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScCellFieldsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/CppunitTest_sc_cellfieldsobj.mk b/sc/CppunitTest_sc_cellfieldsobj.mk
new file mode 100644
index 000000000000..3d672ea176f5
--- /dev/null
+++ b/sc/CppunitTest_sc_cellfieldsobj.mk
@@ -0,0 +1,43 @@
+# -*- 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_cellfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_cellfieldsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellfieldsobj, \
+ sc/qa/extras/sccellfieldsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_cellfieldsobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_cellfieldsobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_cellfieldsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_cellfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_cellfieldsobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_cellfieldsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index e7aa99051ae7..46f3ff9ad25f 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_arealinksobj \
CppunitTest_sc_autoformatobj \
CppunitTest_sc_cellcursorobj \
+ CppunitTest_sc_cellfieldsobj \
CppunitTest_sc_cellformatsenumeration \
CppunitTest_sc_cellformatsobj \
CppunitTest_sc_cellobj \
diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx
new file mode 100644
index 000000000000..ec6400ebf6f1
--- /dev/null
+++ b/sc/qa/extras/sccellfieldsobj.cxx
@@ -0,0 +1,98 @@
+/* -*- 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/util/xrefreshable.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/table/XCell.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XTextFieldsSupplier.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
+{
+class ScCellFieldsObj : public CalcUnoApiTest, public apitest::XRefreshable
+{
+public:
+ ScCellFieldsObj();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScCellFieldsObj);
+
+ // XRefreshable
+ CPPUNIT_TEST(testAddRefreshListener);
+ CPPUNIT_TEST(testRefresh);
+ CPPUNIT_TEST(testRemoveRefreshListener);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScCellFieldsObj::ScCellFieldsObj()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScCellFieldsObj::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
+ uno::Reference<text::XTextContent> xTC(xMSF->createInstance("com.sun.star.text.TextField.URL"),
+ uno::UNO_QUERY_THROW);
+
+ uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
+
+ uno::Reference<table::XCell> xCell(xSheet0->getCellByPosition(2, 3), uno::UNO_QUERY_THROW);
+ uno::Reference<text::XText> xText(xCell, uno::UNO_QUERY_THROW);
+ xText->insertTextContent(xText->createTextCursor(), xTC, true);
+
+ uno::Reference<text::XTextFieldsSupplier> xTFS(xCell, uno::UNO_QUERY_THROW);
+ return xTFS->getTextFields();
+}
+
+void ScCellFieldsObj::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no compoment", m_xComponent.is());
+}
+
+void ScCellFieldsObj::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFieldsObj);
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list