t/nntpd: reduce dependencies on internal API

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

diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index 4750503cafc52aa43dbccff880aa84ef11b5b015..6c564b19c0905b07687b8072c586652f5cd78b2f 100644 (file)
--- a/t/search-thr-index.t
+++ b/t/search-thr-index.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -9,11 +9,13 @@ use PublicInbox::MID qw(mids);
 use Email::MIME;
 require_mods(qw(DBD::SQLite Search::Xapian));
 require PublicInbox::SearchIdx;
+require PublicInbox::Smsg;
 require PublicInbox::Inbox;
+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");
@@ -45,7 +47,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);
 }
@@ -86,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");