[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_cellsearchobj.mk sc/Module_sc.mk sc/qa
Jens Carl (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 1 07:30:36 UTC 2019
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv | 7
sc/CppunitTest_sc_cellsearchobj.mk | 43 +++++
sc/Module_sc.mk | 3
sc/qa/extras/sccellsearchobj.cxx | 86 ++++++++++
4 files changed, 131 insertions(+), 8 deletions(-)
New commits:
commit 4931a1e5e365c018a271fcd94f0a743b4fc38c6c
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Wed May 1 00:58:31 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed May 1 09:30:00 2019 +0200
tdf#45904 Move XPropertSet Java tests to C++
Move XPropertSet Java tests to C++ for ScCellSearchObj.
Change-Id: I46e55794fe0b205173c3b208ba84c90d70aa2de0
Reviewed-on: https://gerrit.libreoffice.org/71608
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
index 3af1d2feb37e..8f8a0add5ae6 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
@@ -12,10 +12,3 @@
"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarityExchange"
"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"getReplaceString()"
"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"setReplaceString()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/sc/CppunitTest_sc_cellsearchobj.mk b/sc/CppunitTest_sc_cellsearchobj.mk
new file mode 100644
index 000000000000..a6bc54d1e9aa
--- /dev/null
+++ b/sc/CppunitTest_sc_cellsearchobj.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_cellsearchobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_cellsearchobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsearchobj, \
+ sc/qa/extras/sccellsearchobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_cellsearchobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_cellsearchobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsearchobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_cellsearchobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_cellsearchobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_cellsearchobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_cellsearchobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 633fa010982e..0b424cd0a381 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -114,10 +114,11 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_cellformatsenumeration \
CppunitTest_sc_cellformatsobj \
CppunitTest_sc_cellobj \
- CppunitTest_sc_cellsobj \
CppunitTest_sc_cellrangeobj \
CppunitTest_sc_cellrangesobj \
+ CppunitTest_sc_cellsearchobj \
CppunitTest_sc_cellsenumeration \
+ CppunitTest_sc_cellsobj \
CppunitTest_sc_chart2dataprovider \
CppunitTest_sc_chartobj \
CppunitTest_sc_chartsobj \
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
new file mode 100644
index 000000000000..21ece504221b
--- /dev/null
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -0,0 +1,86 @@
+/* -*- 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/beans/xpropertyset.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.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/uno/XInterface.hpp>
+#include <com/sun/star/util/XSearchable.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+
+namespace sc_apitest
+{
+class ScCellSearchObj : public CalcUnoApiTest, public apitest::XPropertySet
+{
+public:
+ ScCellSearchObj();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScCellSearchObj);
+
+ // XPropertSet
+ CPPUNIT_TEST(testGetPropertySetInfo);
+ CPPUNIT_TEST(testGetPropertyValue);
+ CPPUNIT_TEST(testGetPropertyValue);
+ CPPUNIT_TEST(testPropertyChangeListener);
+ CPPUNIT_TEST(testVetoableChangeListener);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScCellSearchObj::ScCellSearchObj()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScCellSearchObj::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, 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<util::XSearchable> xSearchable(xSheet0, uno::UNO_QUERY_THROW);
+ return xSearchable->createSearchDescriptor();
+}
+
+void ScCellSearchObj::setUp()
+{
+ CalcUnoApiTest::setUp();
+ // create calc document
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+}
+
+void ScCellSearchObj::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScCellSearchObj);
+
+} // 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