From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 0EA3E1F462
	for <meta@public-inbox.org>; Sun, 16 Jun 2019 00:57:37 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] t/psgi_search.t: use higher-level APIs
Date: Sun, 16 Jun 2019 00:57:36 +0000
Message-Id: <20190616005736.26324-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

No point in using lower-level APIs for a PSGI test.
---
 t/psgi_search.t | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/t/psgi_search.t b/t/psgi_search.t
index bbf5a96..0c40a7f 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -7,6 +7,7 @@ use File::Temp qw/tempdir/;
 use Email::MIME;
 use PublicInbox::Config;
 use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
 use PublicInbox::WWW;
 use bytes (); # only for bytes::length
 my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
@@ -15,14 +16,18 @@ foreach my $mod (@mods) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for psgi_search.t" if $@;
 }
+
 use_ok $_ foreach (@mods, qw(PublicInbox::SearchIdx));
 my $tmpdir = tempdir('pi-psgi-search.XXXXXX', TMPDIR => 1, CLEANUP => 1);
-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 $rw = PublicInbox::SearchIdx->new($ibx, 1);
-ok($rw, "search indexer created");
+my $ibx = PublicInbox::Inbox->new({
+	mainrepo => $tmpdir,
+	address => 'git@vger.kernel.org',
+	name => 'test',
+});
+$ibx = PublicInbox::InboxWritable->new($ibx);
+$ibx->init_inbox(1);
+my $im = $ibx->importer(0);
 my $digits = '10010260936330';
 my $ua = 'Pine.LNX.4.10';
 my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com";
@@ -34,24 +39,15 @@ To: git\@vger.kernel.org
 
 EOF
 
-my $num = 0;
-# nb. using internal API, fragile!
-$rw->begin_txn_lazy;
-
-foreach (reverse split(/\n\n/, $data)) {
-	$_ .= "\n";
-	my $mime = Email::MIME->new(\$_);
-	my $bytes = bytes::length($mime->as_string);
-	my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored');
-	ok($doc_id, 'message added');
-}
-
-$rw->commit_txn_lazy;
+my $mime = Email::MIME->new(\$data);
+$im->add($mime);
+$im->done;
+PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 
 my $cfgpfx = "publicinbox.test";
 my $config = PublicInbox::Config->new({
 	"$cfgpfx.address" => 'git@vger.kernel.org',
-	"$cfgpfx.mainrepo" => $git_dir,
+	"$cfgpfx.mainrepo" => $tmpdir,
 });
 my $www = PublicInbox::WWW->new($config);
 test_psgi(sub { $www->call(@_) }, sub {
-- 
EW