X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_search.t;h=5310e5aba9553bbabf252da82c97d3a520c9165e;hb=62f28026e624ed30d620063a0fa92cbedb7f6673;hp=1df38691c1c07a1b3eb825683d691325c3be1316;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git
diff --git a/t/psgi_search.t b/t/psgi_search.t
index 1df38691..5310e5ab 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -1,55 +1,50 @@
-# Copyright (C) 2017-2018 all contributors
+# Copyright (C) 2017-2019 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use File::Temp qw/tempdir/;
use Email::MIME;
use PublicInbox::Config;
-use PublicInbox::WWW;
-my @mods = qw(PublicInbox::SearchIdx HTTP::Request::Common Plack::Test
+use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
+use bytes (); # only for bytes::length
+use PublicInbox::TestCommon;
+my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
URI::Escape Plack::Builder);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for psgi_search.t" if $@;
-}
-use_ok $_ foreach @mods;
-my $tmpdir = tempdir('pi-psgi-search.XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $git_dir = "$tmpdir/a.git";
+require_mods(@mods);
+use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
+use_ok 'PublicInbox::WWW';
+my ($tmpdir, $for_destroy) = tmpdir();
-is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
-my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-ok($rw, "search indexer created");
-my $data = <<'EOF';
+my $ibx = PublicInbox::Inbox->new({
+ inboxdir => $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";
+my $data = <<"EOF";
Subject: test
-Message-Id:
-From: Ãvar Arnfjörð Bjarmason
-To: git@vger.kernel.org
+Message-ID: <$mid>
+From: Ãvar Arnfjörð Bjarmason
+To: git\@vger.kernel.org
EOF
-my $num = 0;
-# nb. using internal API, fragile!
-my $xdb = $rw->_xdb_acquire;
-$xdb->begin_transaction;
-
-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');
- my $mid = $mime->header('Message-Id');
- ok($doc_id, 'message added: '. $mid);
-}
-
-$xdb->commit_transaction;
-$rw = undef;
+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,
-});
+my $config = PublicInbox::Config->new(\<new($config);
test_psgi(sub { $www->call(@_) }, sub {
my ($cb) = @_;
@@ -64,6 +59,25 @@ test_psgi(sub { $www->call(@_) }, sub {
is('%C3%86var', (keys %uniq)[0], 'matches original query');
ok(index($html, 'by Ævar Arnfjörð Bjarmason') >= 0,
"displayed Ãvar's name properly in HTML");
+
+ my $warn = [];
+ local $SIG{__WARN__} = sub { push @$warn, @_ };
+ $res = $cb->(GET('/test/?q=s:test&l=5e'));
+ is($res->code, 200, 'successful search result');
+ is_deeply([], $warn, 'no warnings from non-numeric comparison');
+
+ $res = $cb->(POST('/test/?q=s:bogus&x=m'));
+ is($res->code, 404, 'failed search result gives 404');
+ is_deeply([], $warn, 'no warnings');
+
+ my $mid_re = qr/\Q$mid\E/o;
+ while (length($digits) > 8) {
+ $res = $cb->(GET("/test/$ua.$digits/"));
+ is($res->code, 300, 'partial match found while truncated');
+ like($res->content, qr/\b1 partial match found\b/);
+ like($res->content, $mid_re, 'found mid in response');
+ chop($digits);
+ }
});
done_testing();