X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch.t;h=0301fd90b6289f379063400ac888343f7ed9d433;hb=5d8dbb4aca5afcc6b98a4d951f03003fb7eaf356;hp=240139b08f7a205f12ccdf87cba29f68ec803e45;hpb=3f76a9cd37c2685cb240b4b8894be93ee7171a25;p=public-inbox.git diff --git a/t/search.t b/t/search.t index 240139b0..0301fd90 100644 --- a/t/search.t +++ b/t/search.t @@ -1,19 +1,20 @@ -# Copyright (C) 2015-2019 all contributors +# Copyright (C) 2015-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use PublicInbox::TestCommon; -require_mods(qw(DBD::SQLite Search::Xapian)); +require_mods(qw(DBD::SQLite Search::Xapian Email::MIME)); require PublicInbox::SearchIdx; require PublicInbox::Inbox; -use Email::MIME; +require PublicInbox::InboxWritable; +use PublicInbox::MIME; my ($tmpdir, $for_destroy) = tmpdir(); my $git_dir = "$tmpdir/a.git"; my $ibx = PublicInbox::Inbox->new({ inboxdir => $git_dir }); my ($root_id, $last_id); -is(0, system(qw(git init --shared -q --bare), $git_dir), "git init (main)") +is(0, xsys(qw(git init --shared -q --bare), $git_dir), "git init (main)") or BAIL_OUT("`git init --shared' failed, weird FS or seccomp?"); eval { PublicInbox::Search->new($ibx)->xdb }; ok($@, "exception raised on non-existent DB"); @@ -59,27 +60,26 @@ sub oct_is ($$$) { } $ibx->with_umask(sub { - my $root = Email::MIME->create( - header_str => [ - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - Subject => 'Hello world', - 'Message-ID' => '', - From => 'John Smith ', - To => 'list@example.com', - ], - body => "\\m/\n"); - my $last = Email::MIME->create( - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:00 +0000', - Subject => 'Re: Hello world', - 'In-Reply-To' => '', - 'Message-ID' => '', - From => 'John Smith ', - To => 'list@example.com', - Cc => 'foo@example.com', - ], - body => "goodbye forever :<\n"); - + my $root = PublicInbox::MIME->new(<<'EOF'); +Date: Fri, 02 Oct 1993 00:00:00 +0000 +Subject: Hello world +Message-ID: +From: John Smith +To: list@example.com + +\m/ +EOF + my $last = PublicInbox::MIME->new(<<'EOF'); +Date: Sat, 02 Oct 2010 00:00:00 +0000 +Subject: Re: Hello world +In-Reply-To: +Message-ID: +From: John Smith +To: list@example.com +Cc: foo@example.com + +goodbye forever :< +EOF my $rv; $rw_commit->(); $root_id = $rw->add_message($root); @@ -126,31 +126,29 @@ sub filter_mids { $ibx->with_umask(sub { $rw_commit->(); my $rmid = ''; - my $reply_to_ghost = Email::MIME->create( - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:00 +0000', - Subject => 'Re: ghosts', - 'Message-ID' => '', - 'In-Reply-To' => $rmid, - From => 'Time Traveler ', - To => 'list@example.com', - ], - body => "-_-\n"); - + my $reply_to_ghost = PublicInbox::MIME->new(<<"EOF"); +Date: Sat, 02 Oct 2010 00:00:00 +0000 +Subject: Re: ghosts +Message-ID: +In-Reply-To: $rmid +From: Time Traveler +To: list\@example.com + +-_- +EOF my $rv; my $reply_id = $rw->add_message($reply_to_ghost); is($reply_id, int($reply_id), "reply_id is an integer: $reply_id"); - my $was_ghost = Email::MIME->create( - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:01 +0000', - Subject => 'ghosts', - 'Message-ID' => $rmid, - From => 'Laggy Sender ', - To => 'list@example.com', - ], - body => "are real\n"); + my $was_ghost = PublicInbox::MIME->new(<<"EOF"); +Date: Sat, 02 Oct 2010 00:00:01 +0000 +Subject: ghosts +Message-ID: $rmid +From: Laggy Sender +To: list\@example.com +are real +EOF my $ghost_id = $rw->add_message($was_ghost); is($ghost_id, int($ghost_id), "ghost_id is an integer: $ghost_id"); my $msgs = $rw->{over}->get_thread('ghost-message@s'); @@ -191,18 +189,17 @@ $ibx->with_umask(sub { $rw_commit->(); $ro->reopen; my $long_mid = 'last' . ('x' x 60). '@s'; - - my $long = Email::MIME->create( - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:00 +0000', - Subject => 'long message ID', - 'References' => ' ', - 'In-Reply-To' => '', - 'Message-ID' => "<$long_mid>", - From => '"Long I.D." ', - To => 'list@example.com', - ], - body => "wut\n"); + my $long = PublicInbox::MIME->new(< +In-Reply-To: +Message-ID: <$long_mid>, +From: "Long I.D." +To: list\@example.com + +wut +EOF my $long_id = $rw->add_message($long); is($long_id, int($long_id), "long_id is an integer: $long_id"); @@ -212,24 +209,22 @@ $ibx->with_umask(sub { my @res; my $long_reply_mid = 'reply-to-long@1'; - my $long_reply = Email::MIME->create( - header_str => [ - Subject => 'I break references', - Date => 'Sat, 02 Oct 2010 00:00:00 +0000', - 'Message-ID' => "<$long_reply_mid>", - # No References: - # 'References' => ' <'.$long_mid.'>', - 'In-Reply-To' => "<$long_mid>", - From => 'no1 ', - To => 'list@example.com', - ], - body => "no References\n"); + my $long_reply = PublicInbox::MIME->new(< +In-Reply-To: <$long_mid> +From: no1 +To: list\@example.com + +no References +EOF ok($rw->add_message($long_reply) > $long_id, "inserted long reply"); $rw_commit->(); $ro->reopen; my $t = $ro->{over_ro}->get_thread('root@s'); - is(scalar(@$t), 4, "got all 4 mesages in thread"); + is(scalar(@$t), 4, "got all 4 messages in thread"); my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_mid); @res = filter_mids($t); is_deeply(\@res, \@exp, "get_thread works"); @@ -238,25 +233,26 @@ $ibx->with_umask(sub { # quote prioritization $ibx->with_umask(sub { $rw_commit->(); - $rw->add_message(Email::MIME->create( - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:01 +0000', - Subject => 'Hello', - 'Message-ID' => '', - From => 'Quoter ', - To => 'list@example.com', - ], - body => "> theatre illusions\nfade\n")); - - $rw->add_message(Email::MIME->create( - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:02 +0000', - Subject => 'Hello', - 'Message-ID' => '', - From => 'Non-Quoter', - To => 'list@example.com', - ], - body => "theatre\nfade\n")); + $rw->add_message(PublicInbox::MIME->new(<<'EOF')); +Date: Sat, 02 Oct 2010 00:00:01 +0000 +Subject: Hello +Message-ID: +From: Quoter +To: list@example.com + +> theatre illusions +fade +EOF + $rw->add_message(PublicInbox::MIME->new(<<'EOF')); +Date: Sat, 02 Oct 2010 00:00:02 +0000 +Subject: Hello +Message-ID: +From: Non-Quoter +To: list@example.com + +theatre +fade +EOF my $res = $rw->query("theatre"); is(scalar(@$res), 2, "got both matches"); is($res->[0]->mid, 'nquote@a', "non-quoted scores higher") if scalar(@$res); @@ -271,17 +267,17 @@ $ibx->with_umask(sub { # circular references $ibx->with_umask(sub { my $s = 'foo://'. ('Circle' x 15).'/foo'; - my $doc_id = $rw->add_message(Email::MIME->create( - header => [ Subject => $s ], - header_str => [ - Date => 'Sat, 02 Oct 2010 00:00:01 +0000', - 'Message-ID' => '', - 'References' => '', - 'In-Reply-To' => '', - From => 'Circle ', - To => 'list@example.com', - ], - body => "LOOP!\n")); + my $doc_id = $rw->add_message(PublicInbox::MIME->new(< +References: +In-Reply-To: +From: Circle +To: list\@example.com + +LOOP! +EOF ok($doc_id > 0, "doc_id defined with circular reference"); my $smsg = $rw->query('m:circle@a', {limit=>1})->[0]; is(defined($smsg), 1, 'found m:circl@a'); @@ -290,14 +286,9 @@ $ibx->with_umask(sub { }); $ibx->with_umask(sub { - my $str = eval { - my $mbox = 't/utf8.mbox'; - open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n"; - local $/; - <$fh> - }; - $str =~ s/\AFrom [^\n]+\n//s; - my $mime = Email::MIME->new($str); + my $eml = 't/utf8.eml'; + my $mime = PublicInbox::InboxWritable::mime_from_path($eml) or + die "open $eml: $!"; my $doc_id = $rw->add_message($mime); ok($doc_id > 0, 'message indexed doc_id with UTF-8'); my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0]; @@ -380,6 +371,7 @@ $ibx->with_umask(sub { } $ibx->with_umask(sub { + my $amsg = mime_load 't/search-amsg.eml', sub { my $part1 = Email::MIME->create( attributes => { content_type => 'text/plain', @@ -400,7 +392,7 @@ $ibx->with_umask(sub { }, body_str => 'inside another', ); - my $amsg = Email::MIME->create( + Email::MIME->create( header_str => [ Subject => 'see attachment', 'Message-ID' => '', @@ -408,7 +400,8 @@ $ibx->with_umask(sub { To => 'list@example.com', ], parts => [ $part1, $part2 ], - ); + )}; # mime_load sub + ok($rw->add_message($amsg), 'added attachment'); $rw_commit->(); $ro->reopen; @@ -466,15 +459,13 @@ $ibx->with_umask(sub { my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com"; is($ro->reopen->query("m:$digits", { mset => 1})->size, 0, 'no results yet'); - my $pine = Email::MIME->create( - header_str => [ - Subject => 'blah', - 'Message-ID' => "<$mid>", - From => 'torvalds@transmeta', - To => 'list@example.com', - ], - body => "" - ); + my $pine = PublicInbox::MIME->new(< +From: torvalds\@transmeta +To: list\@example.com + +EOF my $x = $rw->add_message($pine); $rw->commit_txn_lazy; is($ro->reopen->query("m:$digits", { mset => 1})->size, 1,