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

[Michael Meeks]

 filter/CppunitTest_filter_priority.mk |   42 +++++++++++++++
 filter/CppunitTest_filter_xslt.mk     |    6 --
 filter/Module_filter.mk               |    1 
 filter/qa/cppunit/priority-test.cxx   |   94 ++++++++++++++++++++++++++++++++++
 4 files changed, 138 insertions(+), 5 deletions(-)

New commits:
commit 0f8cf397d4de28ab9e16d4d1c6ca408323d7e189
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Jul 7 18:04:33 2014 +0100

    fdo#80955 - add a unit test.
    
    Change-Id: Ie79a86827c4ee9feabcabf2530b30466f95905ed

diff --git a/filter/CppunitTest_filter_priority.mk b/filter/CppunitTest_filter_priority.mk
new file mode 100644
index 0000000..e5046ac
--- /dev/null
+++ b/filter/CppunitTest_filter_priority.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_priority))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_priority))
+$(eval $(call gb_CppunitTest_use_ure,filter_priority))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_priority))
+
+$(eval $(call gb_CppunitTest_use_external,filter_priority,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_priority, \
+	comphelper \
+	unotest \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,filter_priority,\
+	configmgr/source/configmgr \
+	filter/source/config/cache/filterconfig1 \
+	framework/util/fwk \
+	framework/util/fwl \
+	i18npool/util/i18npool \
+	ucb/source/core/ucb1 \
+	ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_priority, \
+	filter/qa/cppunit/priority-test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/CppunitTest_filter_xslt.mk b/filter/CppunitTest_filter_xslt.mk
index feaf502..1231490 100644
--- a/filter/CppunitTest_filter_xslt.mk
+++ b/filter/CppunitTest_filter_xslt.mk
@@ -9,11 +9,7 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,filter_xslt))
 
-$(eval $(call gb_CppunitTest_use_api,filter_xslt,\
-	offapi \
-	udkapi \
-))
-
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_xslt))
 $(eval $(call gb_CppunitTest_use_ure,filter_xslt))
 $(eval $(call gb_CppunitTest_use_vcl,filter_xslt))
 
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 3558f44..79100a7 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -80,6 +80,7 @@ endif
 
 $(eval $(call gb_Module_add_check_targets,filter,\
     CppunitTest_filter_xslt \
+    CppunitTest_filter_priority \
 ))
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
diff --git a/filter/qa/cppunit/priority-test.cxx b/filter/qa/cppunit/priority-test.cxx
new file mode 100644
index 0000000..70093fb
--- /dev/null
+++ b/filter/qa/cppunit/priority-test.cxx
@@ -0,0 +1,94 @@
+/* -*- 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/.
+ */
+
+// Unit test to check that we get the right filters for the right extensions.
+
+#include <limits>
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <sal/types.h>
+#include <rtl/ustrbuf.hxx>
+
+#include <com/sun/star/document/XTypeDetection.hpp>
+#include <comphelper/processfactory.hxx>
+
+#include <unotest/bootstrapfixturebase.hxx>
+
+
+using namespace std;
+using namespace css;
+
+namespace {
+
+class PriorityFilterTest
+    : public test::BootstrapFixtureBase
+{
+public:
+    void testPriority();
+
+    CPPUNIT_TEST_SUITE(PriorityFilterTest);
+    CPPUNIT_TEST(testPriority);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+void PriorityFilterTest::testPriority()
+{
+    uno::Reference<document::XTypeDetection> xDetection(
+        comphelper::getProcessServiceFactory()->createInstance("com.sun.star.document.TypeDetection"), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_MESSAGE("No type detection component", xDetection.is());
+
+    static struct {
+        const char *pURL;
+        const char *pFormat;
+    } aToCheck[] = {
+        { "file:///tmp/foo.xls", "calc_MS_Excel_97" }
+        // TODO: expand this to check more of these priorities
+    };
+
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aToCheck); i++)
+    {
+        OUString aURL = OUString::createFromAscii(aToCheck[i].pURL);
+        try
+        {
+            OUString aTypeName = xDetection->queryTypeByURL(aURL);
+
+            OUString aFormatCorrect = OUString::createFromAscii(aToCheck[i].pFormat);
+            OUStringBuffer aMsg("Mis-matching formats ");
+            aMsg.append("'");
+            aMsg.append(aTypeName);
+            aMsg.append("' should be '");
+            aMsg.append(aFormatCorrect);
+            aMsg.append("'");
+            CPPUNIT_ASSERT_MESSAGE(rtl::OUStringToOString(aMsg.makeStringAndClear(),
+                                                          RTL_TEXTENCODING_UTF8).getStr(),
+                                   aTypeName == aFormatCorrect);
+        }
+        catch (const uno::Exception &e)
+        {
+            OUStringBuffer aMsg("Exception querying for type: ");
+            aMsg.append("'");
+            aMsg.append(e.Message);
+            aMsg.append("'");
+            CPPUNIT_FAIL(rtl::OUStringToOString(aMsg.makeStringAndClear(),
+                                                RTL_TEXTENCODING_UTF8).getStr());
+        }
+    }
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PriorityFilterTest);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */