qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv | 4
sc/CppunitTest_sc_drawpagesobj.mk | 44 ++++
sc/Module_sc.mk | 1
sc/qa/extras/scdrawpagesobj.cxx | 96
++++++++++
4 files changed, 141 insertions(+), 4 deletions(-)
New commits:
commit 41ae69e330857a3bb983f20c4096be125c4139e9
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Mon Jan 21 22:52:51 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Tue Jan 22 01:42:01 2019 +0100
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScDrawPagesObj.
Change-Id: Ic7ba9acbcc9f285569d8f185b6ebfded60b6e87d
Reviewed-on: https://gerrit.libreoffice.org/66709
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
index bdc6ddbf447b..11ce9966a95a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
@@ -1,6 +1,4 @@
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPages";"insertNewByIndex()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPages";"remove()"
-"ScDrawPagesObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScDrawPagesObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPageExpander#optional";"expand()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPageSummarizer#optional";"summarize()"
diff --git a/sc/qa/extras/scdrawpagesobj.cxx b/sc/qa/extras/scdrawpagesobj.cxx
index 471225ec611a..9a40d417791e 100644
--- a/sc/qa/extras/scdrawpagesobj.cxx
+++ b/sc/qa/extras/scdrawpagesobj.cxx
@@ -8,8 +8,10 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xelementaccess.hxx>
#include <test/container/xindexaccess.hxx>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -18,12 +20,16 @@
#include <com/sun/star/uno/Reference.hxx>
+#include <cppu/unotype.hxx>
+
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
-class ScDrawPagesObj : public CalcUnoApiTest, public apitest::XIndexAccess
+class ScDrawPagesObj : public CalcUnoApiTest,
+ public apitest::XElementAccess,
+ public apitest::XIndexAccess
{
public:
ScDrawPagesObj();
@@ -34,6 +40,10 @@ public:
CPPUNIT_TEST_SUITE(ScDrawPagesObj);
+ // XElementAccess
+ CPPUNIT_TEST(testGetElementType);
+ CPPUNIT_TEST(testHasElements);
+
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
@@ -46,6 +56,7 @@ private:
ScDrawPagesObj::ScDrawPagesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XElementAccess(cppu::UnoType<drawing::XDrawPage>::get())
, XIndexAccess(3)
{
}
commit 835b854d74bcd9f9c6a87b24d533242433f7800b
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Mon Jan 21 22:47:27 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Tue Jan 22 01:41:50 2019 +0100
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScDrawPagesObj.
Change-Id: Ib9983f0f55c79856cf66091a4b4881fafaa1f0b9
Reviewed-on: https://gerrit.libreoffice.org/66707
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
index e1775ea0d8db..bdc6ddbf447b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
@@ -1,5 +1,3 @@
-"ScDrawPagesObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScDrawPagesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPages";"insertNewByIndex()"
"ScDrawPagesObj";"com::sun::star::drawing::XDrawPages";"remove()"
"ScDrawPagesObj";"com::sun::star::container::XElementAccess";"getElementType()"
diff --git a/sc/CppunitTest_sc_drawpagesobj.mk
b/sc/CppunitTest_sc_drawpagesobj.mk
new file mode 100644
index 000000000000..db344475b44b
--- /dev/null
+++ b/sc/CppunitTest_sc_drawpagesobj.mk
@@ -0,0 +1,44 @@
+# -*- 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_drawpagesobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_drawpagesobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_drawpagesobj, \
+ sc/qa/extras/scdrawpagesobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_drawpagesobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_drawpagesobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_drawpagesobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_drawpagesobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_drawpagesobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_drawpagesobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_drawpagesobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 53c729e5ce78..8d7d327b0d1d 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_ddelinkobj \
CppunitTest_sc_ddelinksobj \
CppunitTest_sc_documentconfigurationobj \
+ CppunitTest_sc_drawpagesobj \
CppunitTest_sc_editfieldobj_cell \
CppunitTest_sc_editfieldobj_header \
CppunitTest_sc_filterdescriptorbaseobj \
diff --git a/sc/qa/extras/scdrawpagesobj.cxx b/sc/qa/extras/scdrawpagesobj.cxx
new file mode 100644
index 000000000000..471225ec611a
--- /dev/null
+++ b/sc/qa/extras/scdrawpagesobj.cxx
@@ -0,0 +1,85 @@
+/* -*- 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/xindexaccess.hxx>
+
+#include <com/sun/star/drawing/XDrawPages.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.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 ScDrawPagesObj : public CalcUnoApiTest, public apitest::XIndexAccess
+{
+public:
+ ScDrawPagesObj();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScDrawPagesObj);
+
+ // XIndexAccess
+ CPPUNIT_TEST(testGetByIndex);
+ CPPUNIT_TEST(testGetCount);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScDrawPagesObj::ScDrawPagesObj()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XIndexAccess(3)
+{
+}
+
+uno::Reference<uno::XInterface> ScDrawPagesObj::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
+
+ uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDoc,
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPages> xDP(xDPS->getDrawPages(),
uno::UNO_QUERY_THROW);
+
+ xDP->insertNewByIndex(1);
+ xDP->insertNewByIndex(2);
+
+ return xDP;
+}
+
+void ScDrawPagesObj::setUp()
+{
+ CalcUnoApiTest::setUp();
+ // create a calc document
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+}
+
+void ScDrawPagesObj::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScDrawPagesObj);
+
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
