[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_headerfieldsobj.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 15 05:48:05 UTC 2018
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv | 3
sc/CppunitTest_sc_headerfieldsobj.mk | 43 ++++
sc/Module_sc.mk | 1
sc/qa/extras/scheaderfieldsobj.cxx | 104 ++++++++++
4 files changed, 148 insertions(+), 3 deletions(-)
New commits:
commit 2d6e0bdda331dc6343972f9ec786335aa8ddc674
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sat Dec 8 08:22:48 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Sat Dec 15 06:47:46 2018 +0100
tdf#45904 Move XRefreshable Java tests to C++
Move XRefreshable Java tests to C++ for ScHeaderFieldsObj.
Change-Id: Ia922b11e93f38bfc56795cc34c150b3429fd5447
Reviewed-on: https://gerrit.libreoffice.org/64798
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv
index 86875218abdd..532a598aeea2 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv
@@ -1,6 +1,3 @@
-"ScHeaderFieldsObj";"com::sun::star::util::XRefreshable";"refresh()"
-"ScHeaderFieldsObj";"com::sun::star::util::XRefreshable";"addRefreshListener()"
-"ScHeaderFieldsObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()"
"ScHeaderFieldsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScHeaderFieldsObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScHeaderFieldsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/CppunitTest_sc_headerfieldsobj.mk b/sc/CppunitTest_sc_headerfieldsobj.mk
new file mode 100644
index 000000000000..c8257738ae11
--- /dev/null
+++ b/sc/CppunitTest_sc_headerfieldsobj.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_headerfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_headerfieldsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_headerfieldsobj, \
+ sc/qa/extras/scheaderfieldsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_headerfieldsobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_headerfieldsobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_headerfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_headerfieldsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_headerfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_headerfieldsobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_headerfieldsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index a4fa70eb4abd..95bfd089dd13 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -135,6 +135,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_filterdescriptorbaseobj \
CppunitTest_sc_functiondescriptionobj \
CppunitTest_sc_functionlistobj \
+ CppunitTest_sc_headerfieldsobj \
CppunitTest_sc_headerfootercontentobj \
CppunitTest_sc_indexenumeration_cellannotationsenumeration \
CppunitTest_sc_indexenumeration_cellarealinksenumeration \
diff --git a/sc/qa/extras/scheaderfieldsobj.cxx b/sc/qa/extras/scheaderfieldsobj.cxx
new file mode 100644
index 000000000000..ea1379c37c50
--- /dev/null
+++ b/sc/qa/extras/scheaderfieldsobj.cxx
@@ -0,0 +1,104 @@
+/* -*- 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/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XTextField.hpp>
+#include <com/sun/star/text/XTextFieldsSupplier.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppu/unotype.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(testRefreshListener);
+
+ 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<style::XStyleFamiliesSupplier> xSFS(xDoc, uno::UNO_QUERY_THROW);
+ uno::Reference<container::XNameAccess> xNA(xSFS->getStyleFamilies(), uno::UNO_QUERY_THROW);
+ uno::Reference<container::XNameAccess> xNA1(xNA->getByName("PageStyles"), uno::UNO_QUERY_THROW);
+ uno::Reference<style::XStyle> xStyle(xNA1->getByName("Default"), uno::UNO_QUERY_THROW);
+
+ uno::Reference<beans::XPropertySet> xPropertySet(xStyle, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XHeaderFooterContent> xHFC(
+ xPropertySet->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW);
+ uno::Reference<text::XText> xText(xHFC->getLeftText(), uno::UNO_QUERY_THROW);
+
+ uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
+ uno::Reference<text::XTextContent> xTC(xMSF->createInstance("com.sun.star.text.TextField.Time"),
+ uno::UNO_QUERY_THROW);
+ xText->insertTextContent(xText->createTextCursor(), xTC, false);
+ xPropertySet->setPropertyValue("RightPageHeaderContent", uno::makeAny(xHFC));
+
+ uno::Reference<text::XTextFieldsSupplier> xTFS(xText, 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