X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Freplace.t;h=7135c863d3287980f2254c3f762893e4d62376f2;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=c4dcb89dec1673f02def9001d299e6f71e14dd19;hpb=8722adec7acac538c1cb92de6d53002a4e4e33b8;p=public-inbox.git
diff --git a/t/replace.t b/t/replace.t
index c4dcb89d..7135c863 100644
--- a/t/replace.t
+++ b/t/replace.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -74,7 +74,7 @@ EOF
for my $tip (@$cmts) {
next if !defined $tip;
$changed_epochs++;
- like($tip, qr/\A[a-f0-9]{40}\z/,
+ like($tip, qr/\A[a-f0-9]{40,}\z/,
'replace returned current commit');
}
is($changed_epochs, 1, 'only one epoch changed');
@@ -106,8 +106,8 @@ EOF
if (my $srch = $ibx->search) {
for my $q ('f:streisand', 's:confidential', 'malibu') {
- my $msgs = $srch->query($q);
- is_deeply($msgs, [], "no match for $q");
+ my $mset = $srch->mset($q);
+ is($mset->size, 0, "no match for $q");
}
my @ok = ('f:redactor', 's:redacted', 'nothing to see');
if ($opt->{pre}) {
@@ -119,8 +119,8 @@ EOF
's:message3', 's:message4';
}
for my $q (@ok) {
- my $msgs = $srch->query($q);
- ok($msgs->[0], "got match for $q");
+ my $mset = $srch->mset($q);
+ ok($mset->size, "got match for $q");
}
}
@@ -179,10 +179,10 @@ EOF
}
}
-my $opt = { pre => *pad_msgs };
+my $opt = { pre => \&pad_msgs };
test_replace(2, 'basic', {});
test_replace(2, 'basic', $opt);
-test_replace(2, 'basic', $opt = { %$opt, post => *pad_msgs });
+test_replace(2, 'basic', $opt = { %$opt, post => \&pad_msgs });
test_replace(2, 'basic', $opt = { %$opt, rotate_bytes => 1 });
SKIP: {
@@ -190,9 +190,9 @@ SKIP: {
PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 8;
for my $l (qw(medium)) {
test_replace(2, $l, {});
- $opt = { pre => *pad_msgs };
+ $opt = { pre => \&pad_msgs };
test_replace(2, $l, $opt);
- test_replace(2, $l, $opt = { %$opt, post => *pad_msgs });
+ test_replace(2, $l, $opt = { %$opt, post => \&pad_msgs });
test_replace(2, $l, $opt = { %$opt, rotate_bytes => 1 });
}
};