[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl (via logerrit)]

 include/test/drawing/xshapedescriptor.hxx                  |   41 +++++++++++++
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |    1 
 sc/qa/extras/scshapeobj.cxx                                |   10 ++-
 test/Library_subsequenttest.mk                             |    1 
 test/source/drawing/xshapedescriptor.cxx                   |   30 +++++++++
 5 files changed, 81 insertions(+), 2 deletions(-)

New commits:
commit c77a1e1c039c863e6fdb47b92ce315b87fc73d0d
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Mon Jun 17 05:13:27 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Mon Jun 17 08:03:15 2019 +0200

    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 at gmx.de>

diff --git a/include/test/drawing/xshapedescriptor.hxx b/include/test/drawing/xshapedescriptor.hxx
new file mode 100644
index 000000000000..cb7c37e3a5ba
--- /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 47138b49c5ea..6a5cd6fc7345 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 2a1be6666bb1..91ab4adc79af 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 @@ using namespace css;
 
 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 @@ public:
     CPPUNIT_TEST(testDispose);
     CPPUNIT_TEST(testRemoveEventListener);
 
+    // XShapeDescriptor
+    CPPUNIT_TEST(testGetShapeType);
+
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -59,6 +66,7 @@ private:
 
 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 2ad096c59c32..bdd8900fd61b 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/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 000000000000..37c95e75eff0
--- /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: */