include/test/document/xembeddedobjectsupplier.hxx | 35 +++++++++++++
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv | 1
sc/qa/extras/scchartobj.cxx | 8 ++
test/Library_subsequenttest.mk | 1
test/source/document/xembeddedobjectsupplier.cxx | 30 +++++++++++
5 files changed, 73 insertions(+), 2 deletions(-)
New commits:
commit 9a2954f566b88c06c9e3aa34e1fa7e23200182ee
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Thu Jan 24 08:17:56 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Thu Jan 24 18:42:23 2019 +0100
tdf#45904 Move XEmbeddedObjectSupplier Java test to C++
Move XEmbeddedObjectSupplier Java test to C++ for ScChartObj.
Change-Id: I125951e490719de225f1ac48d10b857c457fa529
Reviewed-on: https://gerrit.libreoffice.org/66839
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/include/test/document/xembeddedobjectsupplier.hxx b/include/test/document/xembeddedobjectsupplier.hxx
new file mode 100644
index 000000000000..b9caee190aec
--- /dev/null
+++ b/include/test/document/xembeddedobjectsupplier.hxx
@@ -0,0 +1,35 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_TEST_DOCUMENT_XEMBEDDEDOBJECTSUPPLIER_HXX
+#define INCLUDED_TEST_DOCUMENT_XEMBEDDEDOBJECTSUPPLIER_HXX
+
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <test/testdllapi.hxx>
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XEmbeddedObjectSupplier
+{
+public:
+ virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+ void testGetEmbeddedObject();
+
+protected:
+ ~XEmbeddedObjectSupplier() {}
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_DOCUMENT_XEMBEDDEDOBJECTSUPPLIER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv
index 6cc64619217c..921ae1ef8e1b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv
@@ -4,4 +4,3 @@
"ScChartObj";"com::sun::star::table::XTableChart";"setHasRowHeaders()"
"ScChartObj";"com::sun::star::table::XTableChart";"getRanges()"
"ScChartObj";"com::sun::star::table::XTableChart";"setRanges()"
-"ScChartObj";"com::sun::star::document::XEmbeddedObjectSupplier";"getEmbeddedObject()"
diff --git a/sc/qa/extras/scchartobj.cxx b/sc/qa/extras/scchartobj.cxx
index c6ead1372d67..b4925ac43219 100644
--- a/sc/qa/extras/scchartobj.cxx
+++ b/sc/qa/extras/scchartobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/container/xnamed.hxx>
+#include <test/document/xembeddedobjectsupplier.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -33,7 +34,9 @@ using namespace css;
namespace sc_apitest
{
-class ScChartObj : public CalcUnoApiTest, public apitest::XNamed
+class ScChartObj : public CalcUnoApiTest,
+ public apitest::XEmbeddedObjectSupplier,
+ public apitest::XNamed
{
public:
ScChartObj();
@@ -44,6 +47,9 @@ public:
CPPUNIT_TEST_SUITE(ScChartObj);
+ // XEmbeddedObjectSupplier
+ CPPUNIT_TEST(testGetEmbeddedObject);
+
// XNamed
CPPUNIT_TEST(testGetName);
CPPUNIT_TEST(testSetNameThrowsException);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 80e8f0be7952..14faf49f6e57 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/container/xnamecontainer \
test/source/container/xnamed \
test/source/container/xnamereplace \
+ test/source/document/xembeddedobjectsupplier \
test/source/document/xlinktargetsupplier \
test/source/drawing/captionshape \
test/source/drawing/xdrawpages \
diff --git a/test/source/document/xembeddedobjectsupplier.cxx b/test/source/document/xembeddedobjectsupplier.cxx
new file mode 100644
index 000000000000..8a0ce9b32d55
--- /dev/null
+++ b/test/source/document/xembeddedobjectsupplier.cxx
@@ -0,0 +1,30 @@
+/* -*- 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/document/xembeddedobjectsupplier.hxx>
+
+#include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace css;
+
+namespace apitest
+{
+void XEmbeddedObjectSupplier::testGetEmbeddedObject()
+{
+ uno::Reference<document::XEmbeddedObjectSupplier> xEOS(init(), uno::UNO_QUERY_THROW);
+
+ CPPUNIT_ASSERT(xEOS->getEmbeddedObject());
+}
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */