X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch-thr-index.t;h=b5a5ff1fbb9b9651e6211f9dca031d38e5b47654;hb=03c9119ec613fa43dcf0a50b5f35754f13228bc8;hp=4f7936579776b11d5401708c04d1049b5ca165f6;hpb=ad6f26f3b9f0e428020d05667987556f8fcbec2f;p=public-inbox.git
diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index 4f793657..b5a5ff1f 100644
--- a/t/search-thr-index.t
+++ b/t/search-thr-index.t
@@ -1,23 +1,21 @@
-# Copyright (C) 2017-2019 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 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 $@;
-}
+use PublicInbox::Eml;
+require_mods(qw(DBD::SQLite Search::Xapian));
require PublicInbox::SearchIdx;
+require PublicInbox::Smsg;
require PublicInbox::Inbox;
-require './t/common.perl';
+use PublicInbox::Import;
my ($tmpdir, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/a.git";
-is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
+PublicInbox::Import::init_bare($git_dir);
my $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
my $rw = PublicInbox::SearchIdx->new($ibx, 1);
ok($rw, "search indexer created");
@@ -44,19 +42,25 @@ my @mids;
foreach (reverse split(/\n\n/, $data)) {
$_ .= "\n";
- my $mime = Email::MIME->new(\$_);
+ my $mime = PublicInbox::Eml->new(\$_);
$mime->header_set('From' => 'bw@g');
$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);
}
my $prev;
my %tids;
-my $dbh = $rw->{over}->connect;
+my $dbh = $rw->{over}->dbh;
foreach my $mid (@mids) {
my $msgs = $rw->{over}->get_thread($mid);
is(3, scalar(@$msgs), "got all messages from $mid");
@@ -74,13 +78,13 @@ $rw->commit_txn_lazy;
$xdb = $rw->begin_txn_lazy;
{
- my $mime = Email::MIME->new(<<'');
+ my $mime = PublicInbox::Eml->new(<<'');
Subject: [RFC 00/14]
Message-Id: <1-bw@g>
From: bw@g
To: git@vger.kernel.org
- my $dbh = $rw->{over}->connect;
+ my $dbh = $rw->{over}->dbh;
my ($id, $prev);
my $reidx = $rw->{over}->next_by_mid('1-bw@g', \$id, \$prev);
ok(defined $reidx);
@@ -90,7 +94,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");