From bda1d88f2bfa21202725ab9c567b3cccba3c1f0b Mon Sep 17 00:00:00 2001
From: Jens Carl <j.carl43@gmx.de>
Date: Sat, 14 Sep 2019 17:37:01 -0700
Subject: tdf#45904 Move XShapeDescriptor Java test to C++

Move XShapeDescriptor Java test to C++ for ScAnnotationShapeObj.

Change-Id: I21c51f6d557e877fed6319ed83f7951bdcb3f800
Reviewed-on: https://gerrit.libreoffice.org/78924
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
---
 .../objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv     | 1 -
 sc/qa/extras/scannotationshapeobj.cxx                               | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
index c65940379cc2..3a76ca37b9f5 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -86,7 +86,6 @@
 "ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontPitchComplex"
 "ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharPostureComplex"
 "ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharLocaleComplex"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
 "ScAnnotationShapeObj";"com::sun::star::drawing::RotationDescriptor";"RotateAngle"
 "ScAnnotationShapeObj";"com::sun::star::drawing::RotationDescriptor";"ShearAngle#optional"
 "ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineStyle"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx
index 5cf3fc927464..48f97b1be887 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -10,6 +10,7 @@
 #include <test/calc_unoapi_test.hxx>
 #include <test/drawing/captionshape.hxx>
 #include <test/drawing/xshape.hxx>
+#include <test/drawing/xshapedescriptor.hxx>
 #include <test/text/xtext.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -36,6 +37,7 @@ namespace sc_apitest
 class ScAnnotationShapeObj : public CalcUnoApiTest,
                              public apitest::CaptionShape,
                              public apitest::XShape,
+                             public apitest::XShapeDescriptor,
                              public apitest::XText
 {
 public:
@@ -55,6 +57,9 @@ public:
     CPPUNIT_TEST(testGetSetSize);
     CPPUNIT_TEST(testGetSetPosition);
 
+    // XShapeDescriptor
+    CPPUNIT_TEST(testGetShapeType);
+
     // XText
     CPPUNIT_TEST(testInsertRemoveTextContent);
 
@@ -69,6 +74,7 @@ uno::Reference<text::XTextContent> ScAnnotationShapeObj::m_xField;
 
 ScAnnotationShapeObj::ScAnnotationShapeObj()
     : CalcUnoApiTest("sc/qa/extras/testdocuments")
+    , XShapeDescriptor("com.sun.star.drawing.CaptionShape")
 {
 }
 
-- 
cgit