From 31bfb20c81b0d293a5531c381885791540f477b0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 6 Nov 2014 14:19:28 +0000 Subject: add a build-time regression test for pcd file format Change-Id: Ie413372ab1cfc7e38570fdf65c6daca8c2cc426b --- filter/CppunitTest_filter_pcd_test.mk | 42 ++++++++++++ filter/Module_filter.mk | 1 + filter/qa/cppunit/data/pcd/fail/.gitignore | 0 .../qa/cppunit/data/pcd/indeterminate/.gitignore | 1 + filter/qa/cppunit/data/pcd/pass/.gitignore | 0 filter/qa/cppunit/data/pcd/pass/blank-square.pcd | Bin 0 -> 788480 bytes filter/qa/cppunit/data/psd/pass/blank-square.psd | Bin 0 -> 23846 bytes filter/qa/cppunit/filters-pcd-test.cxx | 71 +++++++++++++++++++++ 8 files changed, 115 insertions(+) create mode 100644 filter/CppunitTest_filter_pcd_test.mk create mode 100644 filter/qa/cppunit/data/pcd/fail/.gitignore create mode 100644 filter/qa/cppunit/data/pcd/indeterminate/.gitignore create mode 100644 filter/qa/cppunit/data/pcd/pass/.gitignore create mode 100644 filter/qa/cppunit/data/pcd/pass/blank-square.pcd create mode 100644 filter/qa/cppunit/data/psd/pass/blank-square.psd create mode 100644 filter/qa/cppunit/filters-pcd-test.cxx (limited to 'filter') diff --git a/filter/CppunitTest_filter_pcd_test.mk b/filter/CppunitTest_filter_pcd_test.mk new file mode 100644 index 000000000000..071d76fb4c2e --- /dev/null +++ b/filter/CppunitTest_filter_pcd_test.mk @@ -0,0 +1,42 @@ +# -*- 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,filter_pcd_test)) + +$(eval $(call gb_CppunitTest_use_external,filter_pcd_test,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,filter_pcd_test, \ + filter/qa/cppunit/filters-pcd-test \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \ + icd \ + sal \ + test \ + tl \ + unotest \ + vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_api,filter_pcd_test,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,filter_pcd_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_pcd_test)) + +$(eval $(call gb_CppunitTest_use_components,filter_pcd_test,\ + configmgr/source/configmgr \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,filter_pcd_test)) + +# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 7c7575ac34ac..33f0f745f1e9 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\ CppunitTest_filter_dxf_test \ CppunitTest_filter_eps_test \ CppunitTest_filter_met_test \ + CppunitTest_filter_pcd_test \ CppunitTest_filter_pcx_test \ CppunitTest_filter_pict_test \ CppunitTest_filter_ppm_test \ diff --git a/filter/qa/cppunit/data/pcd/fail/.gitignore b/filter/qa/cppunit/data/pcd/fail/.gitignore new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/filter/qa/cppunit/data/pcd/indeterminate/.gitignore b/filter/qa/cppunit/data/pcd/indeterminate/.gitignore new file mode 100644 index 000000000000..583b009c7c60 --- /dev/null +++ b/filter/qa/cppunit/data/pcd/indeterminate/.gitignore @@ -0,0 +1 @@ +*.wmf-* diff --git a/filter/qa/cppunit/data/pcd/pass/.gitignore b/filter/qa/cppunit/data/pcd/pass/.gitignore new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/filter/qa/cppunit/data/pcd/pass/blank-square.pcd b/filter/qa/cppunit/data/pcd/pass/blank-square.pcd new file mode 100644 index 000000000000..a626b5f2309b Binary files /dev/null and b/filter/qa/cppunit/data/pcd/pass/blank-square.pcd differ diff --git a/filter/qa/cppunit/data/psd/pass/blank-square.psd b/filter/qa/cppunit/data/psd/pass/blank-square.psd new file mode 100644 index 000000000000..fc811da006e7 Binary files /dev/null and b/filter/qa/cppunit/data/psd/pass/blank-square.psd differ diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx new file mode 100644 index 000000000000..681dc7de641c --- /dev/null +++ b/filter/qa/cppunit/filters-pcd-test.cxx @@ -0,0 +1,71 @@ +/* -*- 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 +#include +#include +#include +#include + +#include +#include + +extern "C" +{ + SAL_DLLPUBLIC_EXPORT bool SAL_CALL + GraphicImport(SvStream & rStream, Graphic & rGraphic, + FilterConfigItem*); +} + +using namespace ::com::sun::star; + +/* Implementation of Filters test */ + +class PcdFilterTest + : public test::FiltersTest + , public test::BootstrapFixture +{ +public: + PcdFilterTest() : BootstrapFixture(true, false) {} + + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, + unsigned int, unsigned int, unsigned int) SAL_OVERRIDE; + + /** + * Ensure CVEs remain unbroken + */ + void testCVEs(); + + CPPUNIT_TEST_SUITE(PcdFilterTest); + CPPUNIT_TEST(testCVEs); + CPPUNIT_TEST_SUITE_END(); +}; + +bool PcdFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, + unsigned int, unsigned int, unsigned int) +{ + SvFileStream aFileStream(rURL, STREAM_READ); + Graphic aGraphic; + return GraphicImport(aFileStream, aGraphic, NULL); +} + +void PcdFilterTest::testCVEs() +{ + testDir(OUString(), + getURLFromSrc("/filter/qa/cppunit/data/pcd/"), + OUString()); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(PcdFilterTest); + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit