Add more test cases and fix some found issues in link regex.

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index a72a06b9d19cbd39180e15ce0ded831226be3855..f574686289b06721425af9b65a8c99c4afd1e0b8 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -53,7 +53,7 @@
 #define SCHEMES   "([a-zA-Z\\+]+)"
 #define BODY_CHAR "[^\\ \\n\"\']"
 #define BODY      "("BODY_CHAR"+)"
-#define END_BODY  "("BODY_CHAR"*[^,;\?><()\\ \"\'\\.\\n])"
+#define END_BODY  "("BODY_CHAR"*[^,;\\:\?><(){}\\[\\]\\ \"\'\\.\\n])"
 #define URI_REGEX "("SCHEMES"://"END_BODY")" \
                  "|((mailto:)?"BODY"@"BODY"\\."END_BODY")"\
                  "|((www|ftp)\\."END_BODY")"

diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 30a28c58a685ac7ba10357397db13b87a24038e6..bbe7aad1638cfb0b264fece9b83fc3748885f3c6 100644 (file)
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -10,10 +10,10 @@
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 static void
-test_replace_link (const gchar *text,
-                   gssize len,
-                   gpointer match_data,
-                   gpointer user_data)
+test_replace_match (const gchar *text,
+                    gssize len,
+                    gpointer match_data,
+                    gpointer user_data)
 {
   GString *string = user_data;
 
@@ -22,19 +22,6 @@ test_replace_link (const gchar *text,
   g_string_append_c (string, ']');
 }
 
-static void
-test_replace_smiley (const gchar *text,
-                     gssize len,
-                     gpointer match_data,
-                     gpointer user_data)
-{
-  GString *string = user_data;
-
-  g_string_append_c (string, '<');
-  g_string_append_len (string, text, len);
-  g_string_append_c (string, '>');
-}
-
 static void
 test_replace_verbatim (const gchar *text,
                        gssize len,
@@ -52,14 +39,59 @@ test_parsers (void)
   guint i;
   gchar *tests[] =
     {
+      /* Basic link matches */
       "http://foo.com", "[http://foo.com]",
-      ":)http://foo.com :D", "<:)>[http://foo.com] <:D>",
+      "git://foo.com", "[git://foo.com]",
+      "git+ssh://foo.com", "[git+ssh://foo.com]",
+      "mailto:user@server.com", "[mailto:user@server.com]",
+      "www.foo.com", "[www.foo.com]",
+      "ftp.foo.com", "[ftp.foo.com]",
+      "user@server.com", "[user@server.com]",
+      "http://foo.com. bar", "[http://foo.com]. bar",
+      "http://foo.com; bar", "[http://foo.com]; bar",
+      "http://foo.com: bar", "[http://foo.com]: bar",
+      "http://foo.com:bar", "[http://foo.com:bar]",
+
+      /* They are not links! */
+      "http://", "http[:/]/", /* Hm... */
+      "www.", "www.",
+      "w.foo.com", "w.foo.com",
+      "@server.com", "@server.com",
+      "mailto:user@", "mailto:user@",
+      "mailto:user@.com", "mailto:user@.com",
+      "user@.com", "user@.com",
+
+      /* Links inside (), {}, [] or "" */
+      /* FIXME: How to test if the ending ] is matched or not? */
+      "Foo (www.foo.com)", "Foo ([www.foo.com])",
+      "Foo {www.foo.com}", "Foo {[www.foo.com]}",
+      "Foo [www.foo.com]", "Foo [[www.foo.com]]",
+      "Foo \"www.foo.com\"", "Foo \"[www.foo.com]\"",
+      "Foo (www.foo.com/bar(123)baz)", "Foo ([www.foo.com/bar(123)baz])",
+      "<a href=\"http://foo.com\">bar</a>", "<a href=\"[http://foo.com]\">bar</a>",
+
+      /* Basic smileys */
+      "a:)b", "a[:)]b",
+      ">:)", "[>:)]",
+      ">:(", ">[:(]",
+
+      /* Smileys and links mixed */
+      ":)http://foo.com", "[:)][http://foo.com]",
+      "a :) b http://foo.com c :( d www.test.com e", "a [:)] b [http://foo.com] c [:(] d [www.test.com] e",
+
+      /* FIXME: Known issues. Brackets should be counted by the parser */
+      //"Foo www.bar.com/test(123)", "Foo [www.bar.com/test(123)]",
+      //"Foo (www.bar.com/test(123))", "Foo ([www.bar.com/test(123)])",
+      //"Foo www.bar.com/test{123}", "Foo [www.bar.com/test{123}]",
+      //"Foo (:))", "Foo ([:)])",
+      //"Foo <a href=\"http://foo.com\">:)</a>", "Foo <a href=\"[http://foo.com]\">[:)]</a>",
+
       NULL, NULL
     };
   EmpathyStringParser parsers[] =
     {
-      {empathy_string_match_link, test_replace_link},
-      {empathy_string_match_smiley, test_replace_smiley},
+      {empathy_string_match_link, test_replace_match},
+      {empathy_string_match_smiley, test_replace_match},
       {empathy_string_match_all, test_replace_verbatim},
       {NULL, NULL}
     };