X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch-thr-index.t;h=f073304a2a5bc1869255af9f180095e500a49ef4;hb=2fc67a18b7ccd75ea6eb945f18203cbf4bcf228f;hp=0f593c2aa8a823fafcb91b5a469c2bb1a09ebae1;hpb=585314673236d664729fe3ab2d4fb229d1c0f2d5;p=public-inbox.git
diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index 0f593c2a..f073304a 100644
--- a/t/search-thr-index.t
+++ b/t/search-thr-index.t
@@ -1,24 +1,21 @@
-# Copyright (C) 2017-2018 all contributors
+# Copyright (C) 2017-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use bytes (); # only for bytes::length
use Test::More;
-use File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
use PublicInbox::MID qw(mids);
use Email::MIME;
-my @mods = qw(DBI DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "missing $mod for $0" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
require PublicInbox::SearchIdx;
+require PublicInbox::Smsg;
require PublicInbox::Inbox;
-my $tmpdir = tempdir('pi-search-thr-index.XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/a.git";
is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
-my $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir});
+my $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
my $rw = PublicInbox::SearchIdx->new($ibx, 1);
ok($rw, "search indexer created");
my $data = <<'EOF';
@@ -49,7 +46,13 @@ foreach (reverse split(/\n\n/, $data)) {
$mime->header_set('To' => 'git@vger.kernel.org');
my $bytes = bytes::length($mime->as_string);
my $mid = mids($mime->header_obj)->[0];
- my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored', $mid);
+ my $smsg = bless {
+ bytes => $bytes,
+ num => ++$num,
+ mid => $mid,
+ blob => '',
+ }, 'PublicInbox::Smsg';
+ my $doc_id = $rw->add_message($mime, $smsg);
push @mids, $mid;
ok($doc_id, 'message added: '. $mid);
}
@@ -90,7 +93,13 @@ SELECT tid FROM over WHERE num = ? LIMIT 1
my $bytes = bytes::length($mime->as_string);
my $mid = mids($mime->header_obj)->[0];
- my $doc_id = $rw->add_message($mime, $bytes, $num, 'ignored', $mid);
+ my $smsg = bless {
+ bytes => $bytes,
+ num => $num,
+ mid => $mid,
+ blob => '',
+ }, 'PublicInbox::Smsg';
+ my $doc_id = $rw->add_message($mime, $smsg);
ok($doc_id, 'message reindexed'. $mid);
is($doc_id, $num, "article number unchanged: $num");