Changeset 8d89448795e517f0f1afd9bb633dc677fde09712

Timestamp:

04/29/08 20:45:14 (8 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

2ac444617a25eb599de0faec801ffa532425f554

Children:

76d73d55aa0ba896da711c5ed3d0e2b3e236ef3e

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-29T20:45:14Z+1000

Message:

Full gcov test coverage for TermQuery?

Location:

c

Files:

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

c/src/q_term.c

@@ -147 +147 @@
     TermQuery *tq = TQ(self->query);
     TermDocEnum *tde = ir_term_docs_for(ir, tq->field, tq->term);
-    if (!tde) {
-        return NULL;
-    }
+    /* ir_term_docs_for should always return a TermDocEnum */
+    assert(NULL != tde);
 
     return tsc_new(self, tde, ir_get_norms(ir, tq->field));

c/test/test_search.c

@@ -168 +168 @@
     {"20051003", "word1 word3 one two",
         "cat1/sub2",            "3999"},
-    {"20051004", "word1 word2",
+    /* we have 33 * "word2" below to cause cache miss in TermQuery */
+    {"20051004", "word1 word2 word2 word2 word2 word2 word2 word2 word2 "
+                 "word2 word2 word2 word2 word2 word2 word2 word2 word2 "
+                 "word2 word2 word2 word2 word2 word2 word2 word2 word2 "
+                 "word2 word2 word2 word2 word2 word2 word2",
         "cat1/sub2/subsub2",    "+.3413"},
     {"20051005", "word1 one two x x x x x one two",
@@ -331 +335 @@
 static void test_term_query(TestCase *tc, void *data)
 {
+    MatchVector *mv;
+    HashSet *hs;
     Searcher *searcher = (Searcher *)data;
     TopDocs *top_docs;
+    Weight *w;
+    char *t, e[100];
     Query *tq = tq_new(field, "word2");
     check_to_s(tc, tq, field, "word2");
@@ -340 +348 @@
     check_to_s(tc, tq, field, "word2^100.0");
     check_to_s(tc, tq, NULL, "field:word2^100.0");
+
+    /* test PhraseWeight.to_s */
+    w = searcher->create_weight(searcher, tq);
+    sprintf(e, "TermWeight(%f)", w->value);
+    t = w->to_s(w); Asnequal(e, t, 17); free(t);
+    tq->boost = 10.5f;
+    sprintf(e, "TermWeight(%f)", w->value);
+    t = w->to_s(w); Asnequal(e, t, 17); free(t);
+    w->destroy(w);
+
     q_deref(tq);
 
@@ -369 +387 @@
     Aiequal(SEARCH_DOCS_SIZE - 10, top_docs->size);
     td_destroy(top_docs);
+    q_deref(tq);
+
+    tq = tq_new(field, "quick");
+    /* test get_matchv_i */
+    check_hits(tc, searcher, tq, "1,11,14,16,17", -1);
+    mv = searcher_get_match_vector(searcher, tq, 1, field);
+    if (Aiequal(2, mv->size)) {
+        Aiequal(3, mv->matches[0].start);
+        Aiequal(3, mv->matches[0].end);
+        Aiequal(7, mv->matches[1].start);
+        Aiequal(7, mv->matches[1].end);
+    }
+    matchv_destroy(mv);
+
+    /* test extract_terms */
+    hs = hs_new((hash_ft)&term_hash, (eq_ft)&term_eq, (free_ft)&term_destroy);
+    tq->extract_terms(tq, hs);
+    Aiequal(1, hs->size);
+    Asequal("quick", ((Term *)hs->first->elem)->text);
+    Apequal(field, ((Term *)hs->first->elem)->field);
+    hs_destroy(hs);
     q_deref(tq);
 }