test for original createFileFilter

qgis · Jan 27, 2015 · d6c969c · d6c969c
1 parent d7bef1c
commit d6c969c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -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 );
 }