replace Xapian skeleton with SQLite overview DB

[public-inbox.git] / t / search.t

diff --git a/t/search.t b/t/search.t
index ccf0f7463588eb6a68870c5cd67b049588a695b7..51adb9fbc5829689a6ce28d2d1e59ee32ac57ded 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -18,36 +18,36 @@ ok($@, "exception raised on non-existent DB");
 my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
 $rw->_xdb_acquire;
 $rw->_xdb_release;
+my $ibx = $rw->{-inbox};
 $rw = undef;
 my $ro = PublicInbox::Search->new($git_dir);
 my $rw_commit = sub {
-       $rw->{xdb}->commit_transaction if $rw && $rw->{xdb};
+       $rw->commit_txn_lazy if $rw;
        $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-       $rw->_xdb_acquire->begin_transaction;
+       $rw->begin_txn_lazy;
 };
 
 {
        # git repository perms
-       is(PublicInbox::SearchIdx->_git_config_perm(undef),
-          &PublicInbox::SearchIdx::PERM_GROUP,
+       is($ibx->_git_config_perm(), &PublicInbox::InboxWritable::PERM_GROUP,
           "undefined permission is group");
-       is(PublicInbox::SearchIdx::_umask_for(
-            PublicInbox::SearchIdx->_git_config_perm('0644')),
+       is(PublicInbox::InboxWritable::_umask_for(
+            PublicInbox::InboxWritable->_git_config_perm('0644')),
           0022, "644 => umask(0022)");
-       is(PublicInbox::SearchIdx::_umask_for(
-            PublicInbox::SearchIdx->_git_config_perm('0600')),
+       is(PublicInbox::InboxWritable::_umask_for(
+            PublicInbox::InboxWritable->_git_config_perm('0600')),
           0077, "600 => umask(0077)");
-       is(PublicInbox::SearchIdx::_umask_for(
-            PublicInbox::SearchIdx->_git_config_perm('0640')),
+       is(PublicInbox::InboxWritable::_umask_for(
+            PublicInbox::InboxWritable->_git_config_perm('0640')),
           0027, "640 => umask(0027)");
-       is(PublicInbox::SearchIdx::_umask_for(
-            PublicInbox::SearchIdx->_git_config_perm('group')),
+       is(PublicInbox::InboxWritable::_umask_for(
+            PublicInbox::InboxWritable->_git_config_perm('group')),
           0007, 'group => umask(0007)');
-       is(PublicInbox::SearchIdx::_umask_for(
-            PublicInbox::SearchIdx->_git_config_perm('everybody')),
+       is(PublicInbox::InboxWritable::_umask_for(
+            PublicInbox::InboxWritable->_git_config_perm('everybody')),
           0002, 'everybody => umask(0002)');
-       is(PublicInbox::SearchIdx::_umask_for(
-            PublicInbox::SearchIdx->_git_config_perm('umask')),
+       is(PublicInbox::InboxWritable::_umask_for(
+            PublicInbox::InboxWritable->_git_config_perm('umask')),
           umask, 'umask => existing umask');
 }
 
@@ -93,7 +93,6 @@ sub filter_mids {
        ok($found, "message found");
        is($root_id, $found->{doc_id}, 'doc_id set correctly');
        is($found->mid, 'root@s', 'mid set correctly');
-       ok(int($found->thread_id) > 0, 'thread_id is an integer');
 
        my ($res, @res);
        my @exp = sort qw(root@s last@s);
@@ -148,7 +147,13 @@ sub filter_mids {
 
        my $ghost_id = $rw->add_message($was_ghost);
        is($ghost_id, int($ghost_id), "ghost_id is an integer: $ghost_id");
-       ok($ghost_id < $reply_id, "ghost vivified from earlier message");
+       my $msgs = $rw->{over}->get_thread('ghost-message@s')->{msgs};
+       is(scalar(@$msgs), 2, 'got both messages in ghost thread');
+       foreach (qw(sid tid)) {
+               is($msgs->[0]->{$_}, $msgs->[1]->{$_}, "{$_} match");
+       }
+       isnt($msgs->[0]->{num}, $msgs->[1]->{num}, "num do not match");
+       ok($_->{num} > 0, 'positive art num') foreach @$msgs
 }
 
 # search thread on ghost
@@ -400,6 +405,7 @@ sub filter_mids {
        is($txt->{msgs}->[0]->mid, $res->{msgs}->[0]->mid,
                'search inside text attachments works');
 }
+$rw->commit_txn_lazy;
 
 done_testing();