[gtksourceview/wip/fix-utils] Fix bug in gtk_source_utils_escape_search_text()

[Sébastien Wilmet <swilmet src gnome org>]

commit 2497272b262e713d125b3aabee8a2080df3c7395
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Jul 17 23:43:09 2013 +0200

    Fix bug in gtk_source_utils_escape_search_text()
    
    And add unit tests.

 gtksourceview/gtksourceutils.c |   11 +----
 tests/Makefile.am              |    7 +++
 tests/test-utils.c             |   89 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 10 deletions(-)
---
diff --git a/gtksourceview/gtksourceutils.c b/gtksourceview/gtksourceutils.c
index c589031..4023ef3 100644
--- a/gtksourceview/gtksourceutils.c
+++ b/gtksourceview/gtksourceutils.c
@@ -147,14 +147,6 @@ gtk_source_utils_escape_search_text (const gchar* text)
 
        length = strlen (text);
 
-       /* no escape when typing.
-        * The short circuit works only for ascii, but we only
-        * care about not escaping a single '\' */
-       if (length == 1)
-       {
-               return g_strdup (text);
-       }
-
        str = g_string_new ("");
 
        p = text;
@@ -162,8 +154,7 @@ gtk_source_utils_escape_search_text (const gchar* text)
 
        while (p != end)
        {
-               const gchar *next;
-               next = g_utf8_next_char (p);
+               const gchar *next = g_utf8_next_char (p);
 
                switch (*p)
                {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 332989b..814be07 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -148,6 +148,13 @@ test_search_LDADD =                                                        \
        $(DEP_LIBS)                                                     \
        $(TESTS_LIBS)
 
+UNIT_TEST_PROGS += test-utils
+test_utils_SOURCES = test-utils.c
+test_utils_LDADD =                                             \
+       $(top_builddir)/gtksourceview/libgtksourceview-3.0.la   \
+       $(DEP_LIBS)                                             \
+       $(TESTS_LIBS)
+
 python_tests =                 \
        test-completion.py      \
        test-widget.py
diff --git a/tests/test-utils.c b/tests/test-utils.c
new file mode 100644
index 0000000..37cbecd
--- /dev/null
+++ b/tests/test-utils.c
@@ -0,0 +1,89 @@
+/*
+ * test-utils.c
+ * This file is part of GtkSourceView
+ *
+ * Copyright (C) 2013 - Sébastien Wilmet <swilmet gnome org>
+ *
+ * GtkSourceView is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * GtkSourceView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <gtksourceview/gtksource.h>
+
+static void
+test_unescape_search_text (void)
+{
+       gchar *unescaped_text;
+
+       unescaped_text = gtk_source_utils_unescape_search_text ("\\n");
+       g_assert_cmpstr (unescaped_text, ==, "\n");
+       g_free (unescaped_text);
+
+       unescaped_text = gtk_source_utils_unescape_search_text ("\\r");
+       g_assert_cmpstr (unescaped_text, ==, "\r");
+       g_free (unescaped_text);
+
+       unescaped_text = gtk_source_utils_unescape_search_text ("\\t");
+       g_assert_cmpstr (unescaped_text, ==, "\t");
+       g_free (unescaped_text);
+
+       unescaped_text = gtk_source_utils_unescape_search_text ("\\\\");
+       g_assert_cmpstr (unescaped_text, ==, "\\");
+       g_free (unescaped_text);
+
+       unescaped_text = gtk_source_utils_unescape_search_text ("foo\\n bar\\r ß\\t hello\\\\blah");
+       g_assert_cmpstr (unescaped_text, ==, "foo\n bar\r ß\t hello\\blah");
+       g_free (unescaped_text);
+
+       unescaped_text = gtk_source_utils_unescape_search_text ("foo\n bar\r ß\t hello\\blah");
+       g_assert_cmpstr (unescaped_text, ==, "foo\n bar\r ß\t hello\\blah");
+       g_free (unescaped_text);
+}
+
+static void
+test_escape_search_text (void)
+{
+       gchar *escaped_text;
+
+       escaped_text = gtk_source_utils_escape_search_text ("\n");
+       g_assert_cmpstr (escaped_text, ==, "\\n");
+       g_free (escaped_text);
+
+       escaped_text = gtk_source_utils_escape_search_text ("\r");
+       g_assert_cmpstr (escaped_text, ==, "\\r");
+       g_free (escaped_text);
+
+       escaped_text = gtk_source_utils_escape_search_text ("\t");
+       g_assert_cmpstr (escaped_text, ==, "\\t");
+       g_free (escaped_text);
+
+       escaped_text = gtk_source_utils_escape_search_text ("\\");
+       g_assert_cmpstr (escaped_text, ==, "\\\\");
+       g_free (escaped_text);
+
+       escaped_text = gtk_source_utils_escape_search_text ("foo\n bar\r ß\t hello\\blah");
+       g_assert_cmpstr (escaped_text, ==, "foo\\n bar\\r ß\\t hello\\\\blah");
+       g_free (escaped_text);
+}
+
+int
+main (int argc, char **argv)
+{
+       gtk_test_init (&argc, &argv);
+
+       g_test_add_func ("/Utils/unescape_search_text", test_unescape_search_text);
+       g_test_add_func ("/Utils/escape_search_text", test_escape_search_text);
+
+       return g_test_run ();
+}