about summary refs log tree commit homepage
path: root/t/search.t
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-08-20 20:24:54 +0000
committerEric Wong <e@yhbt.net>2020-08-20 21:11:22 +0000
commit4c7baaa7dcacf1108c7db6e0ce484ab76c4a018a (patch)
treeb4450e989f7af9a574b3da98829e840c1b8318ca /t/search.t
parentb63ffbe2b634daedb05b1e27fc272e2708c2bf90 (diff)
downloadpublic-inbox-4c7baaa7dcacf1108c7db6e0ce484ab76c4a018a.tar.gz
We no longer read docdata.glass from anywhere in our code base.

Some adjustments were needed to t/search.t to deal with the
Xapian::WritableDatabase committing at different times, since
our ->query is avoided from PublicInbox::SearchIdx to avoid
needing a {over_ro} field.
Diffstat (limited to 't/search.t')
-rw-r--r--t/search.t34
1 files changed, 19 insertions, 15 deletions
diff --git a/t/search.t b/t/search.t
index 299f57c8..e2290ecd 100644
--- a/t/search.t
+++ b/t/search.t
@@ -263,13 +263,14 @@ To: list@example.com
 theatre
 fade
 EOF
-        my $res = $rw->query("theatre");
+        $rw_commit->();
+        my $res = $ro->reopen->query("theatre");
         is(scalar(@$res), 2, "got both matches");
         if (@$res == 2) {
                 is($res->[0]->{mid}, 'nquote@a', 'non-quoted scores higher');
                 is($res->[1]->{mid}, 'quote@a', 'quoted result still returned');
         }
-        $res = $rw->query("illusions");
+        $res = $ro->query("illusions");
         is(scalar(@$res), 1, "got a match for quoted text");
         is($res->[0]->{mid}, 'quote@a',
                 "quoted result returned if nothing else") if scalar(@$res);
@@ -290,7 +291,8 @@ To: list\@example.com
 LOOP!
 EOF
         ok($doc_id > 0, "doc_id defined with circular reference");
-        my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
+        $rw_commit->();
+        my $smsg = $ro->reopen->query('m:circle@a', {limit=>1})->[0];
         is(defined($smsg), 1, 'found m:circl@a');
         if (defined $smsg) {
                 is($smsg->{references}, '', "no references created");
@@ -298,11 +300,22 @@ EOF
         }
 });
 
+{
+        my $msgs = $ro->query('d:19931002..20101002');
+        ok(scalar(@$msgs) > 0, 'got results within range');
+        $msgs = $ro->query('d:20101003..');
+        is(scalar(@$msgs), 0, 'nothing after 20101003');
+        $msgs = $ro->query('d:..19931001');
+        is(scalar(@$msgs), 0, 'nothing before 19931001');
+}
+
 $ibx->with_umask(sub {
         my $mime = eml_load 't/utf8.eml';
         my $doc_id = $rw->add_message($mime);
         ok($doc_id > 0, 'message indexed doc_id with UTF-8');
-        my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
+        $rw_commit->();
+        my $msg = $ro->reopen->
+                query('m:testmessage@example.com', {limit => 1})->[0];
         is(defined($msg), 1, 'found testmessage@example.com');
         if (defined $msg) {
                 is($mime->header('Subject'), $msg->{subject},
@@ -310,19 +323,10 @@ $ibx->with_umask(sub {
         }
 });
 
-{
-        my $msgs = $ro->query('d:19931002..20101002');
-        ok(scalar(@$msgs) > 0, 'got results within range');
-        $msgs = $ro->query('d:20101003..');
-        is(scalar(@$msgs), 0, 'nothing after 20101003');
-        $msgs = $ro->query('d:..19931001');
-        is(scalar(@$msgs), 0, 'nothing before 19931001');
-}
-
 # names and addresses
 {
         my $mset = $ro->query('t:list@example.com', {mset => 1});
-        is($mset->size, 6, 'searched To: successfully');
+        is($mset->size, 9, 'searched To: successfully');
         foreach my $m ($mset->items) {
                 my $smsg = $ro->{over_ro}->get_art($m->get_docid);
                 like($smsg->{to}, qr/\blist\@example\.com\b/, 'to appears');
@@ -340,7 +344,7 @@ $ibx->with_umask(sub {
         }
 
         $mset = $ro->query('tc:list@example.com', {mset => 1});
-        is($mset->size, 6, 'searched To+Cc: successfully');
+        is($mset->size, 9, 'searched To+Cc: successfully');
         foreach my $m ($mset->items) {
                 my $smsg = $ro->{over_ro}->get_art($m->get_docid);
                 my $tocc = join("\n", $smsg->{to}, $smsg->{cc});