[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk cppcanvas/Module_cppcanvas.mk cppcanvas/qa
Miklos Vajna
vmiklos at collabora.co.uk
Thu Apr 10 03:21:57 PDT 2014
cppcanvas/CppunitTest_cppcanvas_emfplus.mk | 65 ++++++++++++++++++
cppcanvas/Module_cppcanvas.mk | 4 +
cppcanvas/qa/extras/emfplus/data/fdo77229.emf |binary
cppcanvas/qa/extras/emfplus/emfplus.cxx | 92 ++++++++++++++++++++++++++
4 files changed, 161 insertions(+)
New commits:
commit c3d90aa384d82cbd0dd9f60d5576dbdca9ec1e53
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Apr 10 11:56:47 2014 +0200
fdo#77229 testcase
We didn't have EMF+ rendering testcases so far, let's see if it works
out to render into a bitmap and then just assert pixel position colors
there. It's better than nothing for missing shapes at least.
Change-Id: I2d1c63fef1127f69af7156ed6c99553845f77c9f
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
new file mode 100644
index 0000000..d6a73b5
--- /dev/null
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_emfplus, \
+ cppcanvas/qa/extras/emfplus/emfplus \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
+ comphelper \
+ cppu \
+ sal \
+ sfx \
+ test \
+ tl \
+ unotest \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
+ canvas/source/cairo/cairocanvas \
+ canvas/source/factory/canvasfactory \
+ cppcanvas/source/uno/mtfrenderer \
+ configmgr/source/configmgr \
+ extensions/source/scanner/scn \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ sd/util/sd \
+ sd/util/sdd \
+ svl/source/fsstor/fsstorage \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index 9894f9c..62ba638 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -29,6 +29,10 @@ ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
$(eval $(call gb_Module_add_check_targets,cppcanvas,\
CppunitTest_cppcanvas_test \
))
+
+$(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
+ CppunitTest_cppcanvas_emfplus \
+))
endif
# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/qa/extras/emfplus/data/fdo77229.emf b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
new file mode 100755
index 0000000..1f12717
Binary files /dev/null and b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf differ
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
new file mode 100644
index 0000000..adfb11c
--- /dev/null
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+
+#include <comphelper/processfactory.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/sfxbasemodel.hxx>
+#include <test/bootstrapfixture.hxx>
+#include <unotest/macros_test.hxx>
+#include <vcl/bmpacc.hxx>
+#include <vcl/pngwrite.hxx>
+
+using namespace com::sun::star;
+
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+public:
+ Test()
+ : mpTestDocumentPath("/cppcanvas/qa/extras/emfplus/data/")
+ {
+ }
+
+ virtual ~Test()
+ {
+ }
+
+ virtual void setUp() SAL_OVERRIDE
+ {
+ test::BootstrapFixture::setUp();
+ mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
+ };
+
+ virtual void tearDown() SAL_OVERRIDE
+ {
+ if (mxComponent.is())
+ mxComponent->dispose();
+ test::BootstrapFixture::tearDown();
+ };
+
+ Bitmap load(const char* pName)
+ {
+ mxComponent = loadFromDesktop(getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(pName), "com.sun.star.drawing.DrawingDocument");
+ SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+ SfxObjectShell* pShell = pModel->GetObjectShell();
+ boost::shared_ptr<GDIMetaFile> pMetaFile = pShell->GetPreviewMetaFile();
+ BitmapEx aResultBitmap;
+ CPPUNIT_ASSERT(pMetaFile->CreateThumbnail(aResultBitmap));
+ // If this is set, the metafile will be dumped as a PNG one for debug purposes.
+ char* pEnv = getenv("CPPCANVAS_DEBUG_EMFPLUS_DUMP_TO");
+ if (pEnv)
+ {
+ SvFileStream aStream(OStringToOUString(pEnv, RTL_TEXTENCODING_UTF8), STREAM_WRITE);
+ vcl::PNGWriter aWriter(aResultBitmap);
+ CPPUNIT_ASSERT(aWriter.Write(aStream));
+ }
+
+ return aResultBitmap.GetBitmap();
+ }
+
+ void testFdo77229();
+
+ CPPUNIT_TEST_SUITE(Test);
+ CPPUNIT_TEST(testFdo77229);
+ CPPUNIT_TEST_SUITE_END();
+
+ uno::Reference<lang::XComponent> mxComponent;
+ const char* mpTestDocumentPath;
+};
+
+void Test::testFdo77229()
+{
+ Bitmap aBitmap = load("fdo77229.emf");
+ Bitmap::ScopedReadAccess pAccess(aBitmap);
+ // The green star was missing.
+ CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x00fe00), Color(pAccess->GetPixel(140, 140)).GetColor());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list