search: replace ->query with ->mset

Nearly all of the search uses in the production code rely on
a Xapian mset iterator being returned (instead of an array
of $smsg objects).  So default to returning the mset and move
the burden of smsg array conversion into the test cases.

1 files changed, 10 insertions, 7 deletions

diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t
index c2c096ae..12546418 100644
--- a/t/watch_maildir_v2.t
+++ b/t/watch_maildir_v2.t
@@ -130,12 +130,14 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
         $msg = do { local $/; <$fh> };
         PublicInbox::Emergency->new($maildir)->prepare(\$msg);
         PublicInbox::Watch->new($config)->scan('full');
-        my $msgs = $ibx->search->reopen->query('dfpost:6e006fd7');
-        is(scalar(@$msgs), 1, 'diff postimage found');
-        my $post = $msgs->[0];
-        $msgs = $ibx->search->query('dfpre:090d998b6c2c');
-        is(scalar(@$msgs), 1, 'diff preimage found');
-        is($post->{blob}, $msgs->[0]->{blob}, 'same message');
+        my $post = $ibx->search->reopen->mset('dfpost:6e006fd7');
+        is($post->size, 1, 'diff postimage found');
+        my $pre = $ibx->search->mset('dfpre:090d998b6c2c');
+        is($pre->size, 1, 'diff preimage found');
+        $pre = $ibx->search->mset_to_smsg($ibx, $pre);
+        $post = $ibx->search->mset_to_smsg($ibx, $post);
+        is(scalar(@$pre), 1, 'diff preimage found');
+        is($post->[0]->{blob}, $pre->[0]->{blob}, 'same message');
 }
 
 # multiple inboxes in the same maildir
@@ -161,7 +163,8 @@ both
 EOF
         PublicInbox::Emergency->new($maildir)->prepare(\$both);
         PublicInbox::Watch->new($config)->scan('full');
-        my $msgs = $ibx->search->reopen->query('m:both@b.com');
+        my $mset = $ibx->search->reopen->mset('m:both@b.com');
+        my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
         my $v1 = $config->lookup_name('v1');
         my $msg = $v1->git->cat_file($msgs->[0]->{blob});
         is($both, $$msg, 'got original message back from v1');