Changeset 2142bb1f97bcd9f2283306e84852774fef71d55e

Timestamp:

04/27/08 17:26:02 (8 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

cf8e43eb3296c5f2e2681f89658e5b9b3c0dd263

Children:

15dee3043d3e551973defb68d67022123989c1fa

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-27T17:26:02Z+1000

Message:

Improved PrefixQuery? coverage to 100% and minor tidy up

* improved gcov coverage of PrefixQuery? to 100%
* tidied up FuzzyQuery? tests
* tidied sort results from rake gcov. Now equal results are lexically sorted

Location:

c

Files:

• .rake/gcov.history (modified) (previous)
• Rakefile (modified) (1 diff)
• test/test_q_fuzzy.c (modified) (4 diffs)
• test/test_search.c (modified) (1 diff)

c/Rakefile

@@ -115 +115 @@
 $gcov_results   = OpenStruct.new(:files => {})
 def gcov_sorted_keys
-  $gcov_results.files.keys.sort_by {|fn|
-      $gcov_results.files[fn].percent
+  $gcov_results.files.keys.sort {|fn1, fn2|
+      res = $gcov_results.files[fn1].percent <=>
+            $gcov_results.files[fn2].percent
+      res = fn2 <=> fn1 if res == 0
+      res
   }.reverse
 end

c/test/test_q_fuzzy.c

@@ -169 +169 @@
 
 /**
- * Test query hashing to to_s functionality
+ * Test query->to_s functionality
+ */
+static void test_fuzzy_query_to_s(TestCase *tc, void *data)
+{
+    Query *q;
+    (void)data;
+
+    q = fuzq_new_conf(I("A"), "a", 0.4f, 2, 100);
+    check_to_s(tc, q, I("A"), "a~0.4");
+    check_to_s(tc, q, I("B"), "A:a~0.4");
+    q_deref(q);
+
+    q = fuzq_new_conf(I("field"), "mispell", 0.5f, 2, 100);
+    check_to_s(tc, q, I("field"), "mispell~");
+    check_to_s(tc, q, I("notfield"), "field:mispell~");
+    q_deref(q);
+
+}
+
+/**
+ * Test query hashing functionality
  */
 static void test_fuzzy_query_hash(TestCase *tc, void *data)
@@ -178 +198 @@
     q1 = fuzq_new_conf(I("A"), "a", 0.4f, 2, 100);
     q2 = fuzq_new_conf(I("A"), "a", 0.4f, 2, 100);
-    check_to_s(tc, q1, I("A"), "a~0.4");
-    check_to_s(tc, q1, I("B"), "A:a~0.4");
 
     Assert(q_eq(q1, q1), "Test same queries are equal");
@@ -206 +224 @@
     q_deref(q2);
 
-    q2 = fuzq_new_conf(I("field"), "mispell", 0.5f, 2, 100);
-    check_to_s(tc, q2, I("field"), "mispell~");
-    check_to_s(tc, q2, I("notfield"), "field:mispell~");
-    q_deref(q2);
-
     q_deref(q1);
 }
@@ -225 +238 @@
     tst_run_test(suite, test_fuzziness_long, (void *)store);
     tst_run_test(suite, test_fuzzy_query_hash, (void *)store);
+    tst_run_test(suite, test_fuzzy_query_to_s, (void *)store);
 
     store_deref(store);

c/test/test_search.c

@@ -844 +844 @@
     prq = prefixq_new(cat, "cat1/sub2");
     check_to_s(tc, prq, cat, "cat1/sub2*");
+    prq->boost = 20.0f;
+    check_to_s(tc, prq, cat, "cat1/sub2*^20.0");
     check_hits(tc, searcher, prq, "3, 4, 13, 15", -1);
     q_deref(prq);