[Libreoffice-commits] core.git: filter/CppunitTest_filter_ppm_test.mk filter/Module_filter.mk filter/qa

[Caolán McNamara]

 filter/CppunitTest_filter_ppm_test.mk               |   41 +++++++++++
 filter/Module_filter.mk                             |    1 
 filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm |binary
 filter/qa/cppunit/data/ppm/indeterminate/.gitignore |    1 
 filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm      |binary
 filter/qa/cppunit/filters-ppm-test.cxx              |   71 ++++++++++++++++++++
 6 files changed, 114 insertions(+)

New commits:
commit 58b76a188368f0035e5654657f3bcd90fba2543f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 18 14:26:49 2014 +0100

    add ppm regression test
    
    Change-Id: Ifd5f68a3b0dec16f8d992f75fba8c9920700f351

diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk
new file mode 100644
index 0000000..cce9041
--- /dev/null
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -0,0 +1,41 @@
+# -*- 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_ppm_test))
+
+$(eval $(call gb_CppunitTest_use_external,filter_ppm_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_ppm_test, \
+    filter/qa/cppunit/filters-ppm-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
+    ipb \
+	sal \
+	test \
+	tl \
+	unotest \
+	vcl \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\
+    udkapi \
+    offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_ppm_test))
+
+$(eval $(call gb_CppunitTest_use_components,filter_ppm_test,\
+    configmgr/source/configmgr \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_ppm_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index eeab593..1cb203f 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -85,6 +85,7 @@ ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
     CppunitTest_filter_pcx_test \
     CppunitTest_filter_pict_test \
+    CppunitTest_filter_ppm_test \
     CppunitTest_filter_psd_test \
     CppunitTest_filter_ras_test \
     CppunitTest_filter_tiff_test \
diff --git a/filter/qa/cppunit/data/ppm/fail/.gitignore b/filter/qa/cppunit/data/ppm/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm b/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm
new file mode 100644
index 0000000..4572895
Binary files /dev/null and b/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm differ
diff --git a/filter/qa/cppunit/data/ppm/indeterminate/.gitignore b/filter/qa/cppunit/data/ppm/indeterminate/.gitignore
new file mode 100644
index 0000000..583b009c
--- /dev/null
+++ b/filter/qa/cppunit/data/ppm/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/filter/qa/cppunit/data/ppm/pass/.gitignore b/filter/qa/cppunit/data/ppm/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm b/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm
new file mode 100644
index 0000000..828b972
Binary files /dev/null and b/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm differ
diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx
new file mode 100644
index 0000000..9b281ab
--- /dev/null
+++ b/filter/qa/cppunit/filters-ppm-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 <unotest/filters-test.hxx>
+#include <test/bootstrapfixture.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+
+#include <osl/file.hxx>
+#include <osl/process.h>
+
+extern "C"
+{
+    SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+        GraphicImport(SvStream & rStream, Graphic & rGraphic,
+        FilterConfigItem*);
+}
+
+using namespace ::com::sun::star;
+
+/* Implementation of Filters test */
+
+class PpmFilterTest
+    : public test::FiltersTest
+    , public test::BootstrapFixture
+{
+public:
+    PpmFilterTest() : 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(PpmFilterTest);
+    CPPUNIT_TEST(testCVEs);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+bool PpmFilterTest::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 PpmFilterTest::testCVEs()
+{
+    testDir(OUString(),
+        getURLFromSrc("/filter/qa/cppunit/data/ppm/"),
+        OUString());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */