tdf#45904 Move XShapeDescriptor Java test to C++
Move XShapeDescriptor Java test to C++ for ScShapeObj.
Change-Id: I2d530ea73c6f25e36665db0bd65f734e509d97a6
Reviewed-on: https://gerrit.libreoffice.org/74139
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/include/test/drawing/xshapedescriptor.hxx b/include/test/drawing/xshapedescriptor.hxx
new file mode 100644
index 0000000..cb7c37e
--- /dev/null
+++ b/include/test/drawing/xshapedescriptor.hxx
@@ -0,0 +1,41 @@
/* -*- 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 <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
#include <rtl/string.hxx>
namespace apitest
{
class OOO_DLLPUBLIC_TEST XShapeDescriptor
{
public:
XShapeDescriptor(const OUString& rShapeType)
: m_aShapeType(rShapeType)
{
}
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testGetShapeType();
protected:
~XShapeDescriptor() {}
private:
OUString const m_aShapeType;
};
} // 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 47138b4..6a5cd6f 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::XShapeDescriptor";"getShapeType()"
"ScShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 2a1be66..91ab4ad 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
#include <test/drawing/xshapedescriptor.hxx>
#include <test/lang/xcomponent.hxx>
#include <test/sheet/shape.hxx>
@@ -29,7 +30,10 @@
namespace sc_apitest
{
class ScShapeObj : public CalcUnoApiTest, public apitest::Shape, public apitest::XComponent
class ScShapeObj : public CalcUnoApiTest,
public apitest::Shape,
public apitest::XComponent,
public apitest::XShapeDescriptor
{
public:
ScShapeObj();
@@ -51,6 +55,9 @@
CPPUNIT_TEST(testDispose);
CPPUNIT_TEST(testRemoveEventListener);
// XShapeDescriptor
CPPUNIT_TEST(testGetShapeType);
CPPUNIT_TEST_SUITE_END();
private:
@@ -59,6 +66,7 @@
ScShapeObj::ScShapeObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XShapeDescriptor("com.sun.star.drawing.RectangleShape")
{
}
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 2ad096c..bdd8900 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -56,6 +56,7 @@
test/source/document/xlinktargetsupplier \
test/source/drawing/captionshape \
test/source/drawing/xdrawpages \
test/source/drawing/xshapedescriptor \
test/source/drawing/xshapegrouper \
test/source/drawing/xshapes \
test/source/lang/xserviceinfo \
diff --git a/test/source/drawing/xshapedescriptor.cxx b/test/source/drawing/xshapedescriptor.cxx
new file mode 100644
index 0000000..37c95e7
--- /dev/null
+++ b/test/source/drawing/xshapedescriptor.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/drawing/xshapedescriptor.hxx>
#include <com/sun/star/drawing/XShapeDescriptor.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <cppunit/extensions/HelperMacros.h>
using namespace css;
namespace apitest
{
void XShapeDescriptor::testGetShapeType()
{
uno::Reference<drawing::XShapeDescriptor> xSD(init(), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(m_aShapeType, xSD->getShapeType());
}
} // namespace apitest
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
