[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_cellformatsobj.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 5 21:20:44 UTC 2018
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv | 2
sc/CppunitTest_sc_cellformatsobj.mk | 43 ++++
sc/Module_sc.mk | 1
sc/qa/extras/sccellformatsobj.cxx | 91 ++++++++++
4 files changed, 135 insertions(+), 2 deletions(-)
New commits:
commit b4ffa8c04117ba75f7f63f2a7655a2b611b83ab9
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Wed Dec 5 19:35:13 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Dec 5 22:20:19 2018 +0100
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScCellFormatsObj.
Change-Id: I8c72c7eb352720f4ff40727df4823855ec8014e5
Reviewed-on: https://gerrit.libreoffice.org/64646
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
index 6d993456bd81..08c7325ce95d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
@@ -1,5 +1,3 @@
"ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
"ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScCellFormatsObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScCellFormatsObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScCellFormatsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/CppunitTest_sc_cellformatsobj.mk b/sc/CppunitTest_sc_cellformatsobj.mk
new file mode 100644
index 000000000000..82175e00d918
--- /dev/null
+++ b/sc/CppunitTest_sc_cellformatsobj.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_cellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_cellformatsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellformatsobj, \
+ sc/qa/extras/sccellformatsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_cellformatsobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_cellformatsobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_cellformatsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_cellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_cellformatsobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_cellformatsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 530b5a791fec..60a1f6ebaf44 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_autoformatobj \
CppunitTest_sc_cellcursorobj \
CppunitTest_sc_cellformatsenumeration \
+ CppunitTest_sc_cellformatsobj \
CppunitTest_sc_cellobj \
CppunitTest_sc_cellsobj \
CppunitTest_sc_cellrangeobj \
diff --git a/sc/qa/extras/sccellformatsobj.cxx b/sc/qa/extras/sccellformatsobj.cxx
new file mode 100644
index 000000000000..0a79374f9f42
--- /dev/null
+++ b/sc/qa/extras/sccellformatsobj.cxx
@@ -0,0 +1,91 @@
+/* -*- 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/container/xelementaccess.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XCellFormatRangesSupplier.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/XCellRange.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 ScCellFormatsObj : public CalcUnoApiTest, public apitest::XElementAccess
+{
+public:
+ ScCellFormatsObj();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScCellFormatsObj);
+
+ // XElementAccess
+ CPPUNIT_TEST(testGetElementType);
+ CPPUNIT_TEST(testHasElements);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScCellFormatsObj::ScCellFormatsObj()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XElementAccess(cppu::UnoType<table::XCellRange>::get())
+{
+}
+
+uno::Reference<uno::XInterface> ScCellFormatsObj::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ 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<sheet::XCellFormatRangesSupplier> xCFRS(xSheet0, uno::UNO_QUERY_THROW);
+
+ return xCFRS->getCellFormatRanges();
+}
+
+void ScCellFormatsObj::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScCellFormatsObj::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFormatsObj);
+
+} // 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