From d6c969c02e30f8a6efc7245c0a90c7db81eed3cb Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.john.kirk@gmail.com>
Date: Mon, 26 Jan 2015 18:52:07 -0800
Subject: [PATCH] test for original createFileFilter

---
 src/gui/qgisgui.cpp          |  4 ++--
 tests/src/gui/testqgsgui.cpp | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/gui/qgisgui.cpp b/src/gui/qgisgui.cpp
index 654f64e94fb2..be8a52e82edd 100644
--- a/src/gui/qgisgui.cpp
+++ b/src/gui/qgisgui.cpp
@@ -182,8 +182,8 @@ namespace QgisGui
 
   QString createFileFilter_( QString const &format )
   {
-    QString longName = format + " format";
-    QString glob = "*" + format;
+    QString longName = format.toUpper() + " format";
+    QString glob = "*." + format;
     return createFileFilter_( longName, glob );
   }
 
diff --git a/tests/src/gui/testqgsgui.cpp b/tests/src/gui/testqgsgui.cpp
index 8bef09c5eaa1..ca86afe232d5 100644
--- a/tests/src/gui/testqgsgui.cpp
+++ b/tests/src/gui/testqgsgui.cpp
@@ -20,14 +20,23 @@ class TestQgsGui : public QObject
 {
     Q_OBJECT
   private slots:
+    void createFileFilterForFormat();
     void createFileFilter();
 
 };
 
-void TestQgsGui::createFileFilter()
+void TestQgsGui::createFileFilterForFormat()
 {
   QString expected = "FOO format (*.foo *.FOO)";
-  QString actual = QgisGui::createFileFilter_("foo");;
+  QString actual = QgisGui::createFileFilter_("foo");
+
+  QCOMPARE( actual, expected );
+}
+
+void TestQgsGui::createFileFilter()
+{
+  QString expected = "My Description (my_regex MY_REGEX)";
+  QString actual = QgisGui::createFileFilter_("My Description", "my_regex");
 
   QCOMPARE( actual, expected );
 }