disambiguate OverIdx and Over by field name

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

diff --git a/t/v2writable.t b/t/v2writable.t
index e5a565cea23fa0a2ecd93b8eea017359a31d2299..9e4547ba63b7bd53968ae68a8e523788fb54c9cd 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Test::More;
 use PublicInbox::Eml;
-use PublicInbox::ContentId qw(content_digest content_id);
+use PublicInbox::ContentHash qw(content_digest content_hash);
 use PublicInbox::TestCommon;
 use Cwd qw(abs_path);
 require_git(2.6);
@@ -120,7 +120,9 @@ if ('ensure git configs are correct') {
        $mime->header_set('References', '<zz-mid@b>');
        ok($im->add($mime), 'message with multiple Message-ID');
        $im->done;
-       my ($total, undef) = $ibx->over->recent;
+       my $total = $ibx->over->dbh->selectrow_array(<<'');
+SELECT COUNT(*) FROM over WHERE num > 0
+
        is($ibx->mm->num_highwater, $total, 'got expected highwater value');
        my $srch = $ibx->search;
        my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 });
@@ -215,7 +217,7 @@ EOF
        $im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
        is($im->{shards}, 1, 'detected single shard from previous');
        my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
-       is(content_id($rm_mime), content_id($mime),
+       is(content_hash($rm_mime), content_hash($mime),
                        'removed object returned matches');
        ok(defined($mark), 'mark set');
        $im->done;
@@ -224,12 +226,13 @@ EOF
        like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
                'commit message propagated to git');
        is_deeply(\@after, \@before, 'only one commit written to git');
-       is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
+       my $mid = $smsg->{mid};
+       is($ibx->mm->num_for($mid), undef, 'no longer in Msgmap by mid');
        my $num = $smsg->{num};
        like($num, qr/\A\d+\z/, 'numeric number in return message');
        is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num');
        my $srch = $ibx->search->reopen;
-       my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
+       my $mset = $srch->query('m:'.$mid, { mset => 1});
        is($mset->size, 0, 'no longer found in Xapian');
        my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
        is($srch->{over_ro}->get_art($num), undef,