Merge lp:~ted/hud/lp1193700 into lp:hud/13.10

[Ted Gould]

Handle searches that result in no tokens as NULL searches

Searching for "-" was apparently causing problems. Not sure why people were doing this, perhaps they were looking for the dash? ;-)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/hud-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/79

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/118/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/hud-autolanding/76/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-autolanding/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-autolanding/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-autolanding/59

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

Weird. Unable to a DBus name. Trying again for that one. Seems odd.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/token.c'
--- src/token.c	2013-06-03 03:15:56 +0000
+++ src/token.c	2013-09-04 03:25:47 +0000
@@ -272,6 +272,13 @@
 
   array = g_ptr_array_new ();
   hud_token_list_add_string_to_array (array, string);
+
+  if (array->len == 0)
+  {
+    g_ptr_array_free (array, TRUE);
+  	return NULL;
+  }
+
   return hud_token_list_new_consume_array (array);
 }
 
@@ -291,6 +298,9 @@
 {
   gint i;
 
+  if (list == NULL)
+    return;
+
   for (i = 0; i < list->length; i++)
     hud_token_free (list->tokens[i]);
 
@@ -307,6 +317,9 @@
   static guint d[32][32];
   gint i, j;
 
+  if (needle == NULL || haystack == NULL)
+    return G_MAXUINT;
+
   if (needle->length > haystack->length)
     return G_MAXUINT;
 

=== modified file 'tests/test-distance.c'
--- tests/test-distance.c	2013-06-03 03:27:33 +0000
+++ tests/test-distance.c	2013-09-04 03:25:47 +0000
@@ -240,6 +240,22 @@
                    calculate_distance ("save", (GStrv) save_as, NULL));
 }
 
+/* Checking to ensure that we can put separators in and don't screw things up */
+static void
+test_distance_separator_only (void)
+{
+	gchar * teststrings[] = {"One", "Two", NULL};
+
+	g_assert(calculate_distance("-", (GStrv) teststrings, NULL) != 0);
+	g_assert(calculate_distance(">", (GStrv) teststrings, NULL) != 0);
+	g_assert(calculate_distance(".", (GStrv) teststrings, NULL) != 0);
+	g_assert(calculate_distance(" ", (GStrv) teststrings, NULL) != 0);
+	g_assert(calculate_distance(" .->", (GStrv) teststrings, NULL) != 0);
+	g_assert(calculate_distance("", (GStrv) teststrings, NULL) != 0);
+
+	return;
+}
+
 /* Build the test suite */
 static void
 test_distance_suite (void)
@@ -252,6 +268,7 @@
 	g_test_add_func ("/hud/distance/variety",       test_distance_variety);
 	g_test_add_func ("/hud/distance/french_pref",   test_distance_french_pref);
 	g_test_add_func ("/hud/distance/extra_terms",   test_distance_extra_terms);
+	g_test_add_func ("/hud/distance/separator_only",test_distance_separator_only);
 	return;
 }