include/test/drawing/xshape.hxx | 41 +++++++++
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv | 4
sc/qa/extras/scshapeobj.cxx | 6 +
test/Library_subsequenttest.mk | 1
test/source/drawing/xshape.cxx | 56 +++++++++++++
5 files changed, 104 insertions(+), 4 deletions(-)
New commits:
commit 0e73f9eb415793c1c7503021c40fd746b2ef7ba2
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Wed Jun 19 05:18:55 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Wed Jun 19 08:10:10 2019 +0200
tdf#45904 Move XShape Java tests to C++
Move XShape Java tests to C++ for ScShapeObj.
Change-Id: I349c4abb09c3e9e43285b63ee5f19f55d967b38f
Reviewed-on: https://gerrit.libreoffice.org/74331
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/include/test/drawing/xshape.hxx b/include/test/drawing/xshape.hxx
new file mode 100644
index 000000000000..7da565355635
--- /dev/null
+++ b/include/test/drawing/xshape.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>
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XShape
+{
+public:
+ XShape(bool bObjSupportsPosition = true)
+ : m_bObjSupportsPosition(bObjSupportsPosition)
+ {
+ }
+ virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+ void testGetSetPosition();
+ void testGetSetSize();
+
+protected:
+ ~XShape() {}
+
+private:
+ bool const m_bObjSupportsPosition;
+};
+
+} // 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 4e59e44415b9..be9506938cdc 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -15,8 +15,4 @@
"ScShapeObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScShapeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScShapeObj";"com::sun::star::drawing::XShape";"getPosition()"
-"ScShapeObj";"com::sun::star::drawing::XShape";"setPosition()"
-"ScShapeObj";"com::sun::star::drawing::XShape";"getSize()"
"ScShapeObj";"com::sun::star::drawing::XShape";"setSize()"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 723d71a3f1c4..ef8761a657d9 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/drawing/xgluepointssupplier.hxx>
+#include <test/drawing/xshape.hxx>
#include <test/drawing/xshapedescriptor.hxx>
#include <test/lang/xcomponent.hxx>
#include <test/sheet/shape.hxx>
@@ -35,6 +36,7 @@ class ScShapeObj : public CalcUnoApiTest,
public apitest::Shape,
public apitest::XComponent,
public apitest::XGluePointsSupplier,
+ public apitest::XShape,
public apitest::XShapeDescriptor
{
public:
@@ -60,6 +62,10 @@ public:
// XGluePointsSupplier
CPPUNIT_TEST(testGetGluePoints);
+ // XShape
+ CPPUNIT_TEST(testGetSetPosition);
+ CPPUNIT_TEST(testGetSetSize);
+
// XShapeDescriptor
CPPUNIT_TEST(testGetShapeType);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index c03cb7b9d8c4..aaa357ef63b8 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -59,6 +59,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/drawing/xgluepointssupplier \
test/source/drawing/xshapedescriptor \
test/source/drawing/xshapegrouper \
+ test/source/drawing/xshape \
test/source/drawing/xshapes \
test/source/lang/xserviceinfo \
test/source/lang/xcomponent \
diff --git a/test/source/drawing/xshape.cxx b/test/source/drawing/xshape.cxx
new file mode 100644
index 000000000000..6992663f56d0
--- /dev/null
+++ b/test/source/drawing/xshape.cxx
@@ -0,0 +1,56 @@
+/* -*- 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/xshape.hxx>
+#include <test/cppunitasserthelper.hxx>
+
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace css;
+
+namespace apitest
+{
+void XShape::testGetSetPosition()
+{
+ uno::Reference<drawing::XShape> xShape(init(), uno::UNO_QUERY_THROW);
+ if (m_bObjSupportsPosition)
+ {
+ awt::Point aOldPoint = xShape->getPosition();
+ CPPUNIT_ASSERT_NO_THROW(
+ xShape->setPosition(awt::Point(aOldPoint.X + 100, aOldPoint.Y +
100)));
+
+ awt::Point aNewPoint = xShape->getPosition();
+ CPPUNIT_ASSERT_EQUAL(awt::Point(aOldPoint.X + 100, aOldPoint.Y + 100),
aNewPoint);
+ }
+ CPPUNIT_ASSERT(true);
+}
+
+void XShape::testGetSetSize()
+{
+ uno::Reference<drawing::XShape> xShape(init(), uno::UNO_QUERY_THROW);
+
+ awt::Size aOldSize = xShape->getSize();
+
+ CPPUNIT_ASSERT_NO_THROW(xShape->setSize(awt::Size(aOldSize.Width + 10,
aOldSize.Height + 10)));
+
+ awt::Size aNewSize = xShape->getSize();
+ const sal_Int16 aAcceptableLimit = 2;
+ CPPUNIT_ASSERT(aOldSize.Height - aNewSize.Height <= aAcceptableLimit);
+ CPPUNIT_ASSERT(aOldSize.Height - aNewSize.Height <= aAcceptableLimit);
+}
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
