test for original createFileFilter

michaelkirk · michaelkirk · commit d6c969c02e30 · 2015-01-26T18:57:12.000-08:00
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 );
 }

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,8 @@ namespace QgisGui`
`182`	`182`
`183`	`183`	`QString createFileFilter_( QString const &format )`
`184`	`184`	`{`
`185`		`- QString longName = format + " format";`
`186`		`- QString glob = "*" + format;`
	`185`	`+ QString longName = format.toUpper() + " format";`
	`186`	`+ QString glob = "*." + format;`
`187`	`187`	`return createFileFilter_( longName, glob );`
`188`	`188`	`}`
`189`	`189`