From 8a453f96f0181b1eae227ebdadea6ee458d53eb4 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Mon, 17 Jun 2019 05:50:26 +0000 Subject: tdf#45904 Move XGluePointsSupplier Java test to C++ Move XGluePointsSupplier Java test to C++ for ScShapeObj. Change-Id: I75babf46b664cccbb4d1df2af1764c3fa296903a Reviewed-on: https://gerrit.libreoffice.org/74140 Tested-by: Jenkins Reviewed-by: Jens Carl --- include/test/drawing/xgluepointssupplier.hxx | 33 ++++++++++++++++++++++ .../sc/com.sun.star.comp.office.ScShapeObj.csv | 1 - sc/qa/extras/scshapeobj.cxx | 5 ++++ test/Library_subsequenttest.mk | 1 + test/source/drawing/xgluepointssupplier.cxx | 32 +++++++++++++++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 include/test/drawing/xgluepointssupplier.hxx create mode 100644 test/source/drawing/xgluepointssupplier.cxx diff --git a/include/test/drawing/xgluepointssupplier.hxx b/include/test/drawing/xgluepointssupplier.hxx new file mode 100644 index 000000000000..0dd8bf58a138 --- /dev/null +++ b/include/test/drawing/xgluepointssupplier.hxx @@ -0,0 +1,33 @@ +/* -*- 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/. + */ + +#pragma once + +#include + +#include + +#include + +namespace apitest +{ +class OOO_DLLPUBLIC_TEST XGluePointsSupplier +{ +public: + virtual css::uno::Reference init() = 0; + + void testGetGluePoints(); + +protected: + ~XGluePointsSupplier() {} +}; + +} // namespace apitest + +/* 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.ScShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv index 6a5cd6fc7345..4e59e44415b9 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv @@ -9,7 +9,6 @@ "ScShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional" "ScShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" "ScShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" -"ScShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "ScShapeObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()" "ScShapeObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()" "ScShapeObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()" diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx index 91ab4adc79af..723d71a3f1c4 100644 --- a/sc/qa/extras/scshapeobj.cxx +++ b/sc/qa/extras/scshapeobj.cxx @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -33,6 +34,7 @@ namespace sc_apitest class ScShapeObj : public CalcUnoApiTest, public apitest::Shape, public apitest::XComponent, + public apitest::XGluePointsSupplier, public apitest::XShapeDescriptor { public: @@ -55,6 +57,9 @@ public: CPPUNIT_TEST(testDispose); CPPUNIT_TEST(testRemoveEventListener); + // XGluePointsSupplier + CPPUNIT_TEST(testGetGluePoints); + // XShapeDescriptor CPPUNIT_TEST(testGetShapeType); diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index bdd8900fd61b..c03cb7b9d8c4 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/document/xlinktargetsupplier \ test/source/drawing/captionshape \ test/source/drawing/xdrawpages \ + test/source/drawing/xgluepointssupplier \ test/source/drawing/xshapedescriptor \ test/source/drawing/xshapegrouper \ test/source/drawing/xshapes \ diff --git a/test/source/drawing/xgluepointssupplier.cxx b/test/source/drawing/xgluepointssupplier.cxx new file mode 100644 index 000000000000..68d6b6fb6269 --- /dev/null +++ b/test/source/drawing/xgluepointssupplier.cxx @@ -0,0 +1,32 @@ +/* -*- 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 + +#include +#include + +#include + +#include + +using namespace css; + +namespace apitest +{ +void XGluePointsSupplier::testGetGluePoints() +{ + uno::Reference xGPS(init(), uno::UNO_QUERY_THROW); + + uno::Reference xIC = xGPS->getGluePoints(); + CPPUNIT_ASSERT(xIC->getCount()); +} +} // namespace apitest + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit