X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=ec8a5a42e9ae3ee635a6f592e64e8789efd66bfb;hb=55b707d788ce13696e4411389583e720ea6dab01;hp=d16373ae0f40a8797d639d5d1bd254e376946b54;hpb=cf0a2370a57fe49d0fca149409f98d2907efeb15;p=public-inbox.git

diff --git a/t/feed.t b/t/feed.t
index d16373ae..ec8a5a42 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,68 +1,101 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Email::Simple;
+use Email::MIME;
 use PublicInbox::Feed;
-use File::Temp qw/tempdir/;
+use PublicInbox::Import;
+use PublicInbox::Inbox;
 my $have_xml_feed = eval { require XML::Feed; 1 };
+use PublicInbox::TestCommon;
+
+sub string_feed {
+	my $res = PublicInbox::Feed::generate($_[0]);
+	my $body = $res->[2];
+	my $str = '';
+	while (defined(my $chunk = $body->getline)) {
+		$str .= $chunk;
+	}
+	$body->close;
+	$str;
+}
 
-my $tmpdir = tempdir(CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/gittest";
+my $ibx = PublicInbox::Inbox->new({
+	address => 'test@example',
+	name => 'testbox',
+	inboxdir => $git_dir,
+	url => [ 'http://example.com/test' ],
+	feedmax => 3,
+});
+my $git = $ibx->git;
+my $im = PublicInbox::Import->new($git, $ibx->{name}, 'test@example');
 
 {
 	is(0, system(qw(git init -q --bare), $git_dir), "git init");
 	local $ENV{GIT_DIR} = $git_dir;
 
 	foreach my $i (1..6) {
-		my $pid = open(my $pipe, "|-");
-		defined $pid or die "fork/pipe failed: $!\n";
-		if ($pid == 0) {
-			exec("ssoma-mda", $git_dir);
-		}
-
-		my $simple = Email::Simple->new(<<EOF);
+		my $mime = Email::MIME->new(<<EOF);
 From: ME <me\@example.com>
 To: U <u\@example.com>
 Message-Id: <$i\@example.com>
 Subject: zzz #$i
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
-> drop me
+> This is a long multi line quote so it should not be allowed to
+> show up in its entirty in the Atom feed.  drop me
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
 
 msg $i
 
-> drop me again
+> inline me here
+> this is a short quote
 
 keep me
 EOF
-		print $pipe $simple->as_string or die "print failed: $!\n";
-		close $pipe or die "close pipe failed: $!\n";
+		like($im->add($mime), qr/\A:\d+/, 'added');
 	}
+	$im->done;
+}
 
+# spam check
+{
 	# check initial feed
 	{
-		my $feed = PublicInbox::Feed->generate($git_dir, 3);
-		if ($have_xml_feed) {
+		my $feed = string_feed({ -inbox => $ibx });
+		SKIP: {
+			skip 'XML::Feed missing', 2 unless $have_xml_feed;
 			my $p = XML::Feed->parse(\$feed);
 			is($p->format, "Atom", "parsed atom feed");
 			is(scalar $p->entries, 3, "parsed three entries");
+			is($p->id, 'mailto:test@example',
+				"id is set to default");
 		}
-		unlike($feed, qr/drop me/, "quoted text dropped");
+
+		like($feed, qr/drop me/, "long quoted text kept");
+		like($feed, qr/inline me here/, "short quoted text kept");
 		like($feed, qr/keep me/, "unquoted text saved");
 	}
 
 	# add a new spam message
 	my $spam;
 	{
-		my $pid = open(my $pipe, "|-");
-		defined $pid or die "fork/pipe failed: $!\n";
-		if ($pid == 0) {
-			exec("ssoma-mda", $git_dir);
-		}
-
-		$spam = Email::Simple->new(<<EOF);
+		$spam = Email::MIME->new(<<EOF);
 From: SPAMMER <spammer\@example.com>
 To: U <u\@example.com>
 Message-Id: <this-is-spam\@example.com>
@@ -70,14 +103,15 @@ Subject: SPAM!!!!!!!!
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-		print $pipe $spam->as_string or die "print failed: $!\n";
-		close $pipe or die "close pipe failed: $!\n";
+		$im->add($spam);
+		$im->done;
 	}
 
 	# check spam shows up
 	{
-		my $spammy_feed = PublicInbox::Feed->generate($git_dir, 3);
-		if ($have_xml_feed) {
+		my $spammy_feed = string_feed({ -inbox => $ibx });
+		SKIP: {
+			skip 'XML::Feed missing', 2 unless $have_xml_feed;
 			my $p = XML::Feed->parse(\$spammy_feed);
 			is($p->format, "Atom", "parsed atom feed");
 			is(scalar $p->entries, 3, "parsed three entries");
@@ -86,20 +120,14 @@ EOF
 	}
 
 	# nuke spam
-	{
-		my $pid = open(my $pipe, "|-");
-		defined $pid or die "fork/pipe failed: $!\n";
-		if ($pid == 0) {
-			exec("ssoma-rm", $git_dir);
-		}
-		print $pipe $spam->as_string or die "print failed: $!\n";
-		close $pipe or die "close pipe failed: $!\n";
-	}
+	$im->remove($spam);
+	$im->done;
 
 	# spam no longer shows up
 	{
-		my $feed = PublicInbox::Feed->generate($git_dir, 3);
-		if ($have_xml_feed) {
+		my $feed = string_feed({ -inbox => $ibx });
+		SKIP: {
+			skip 'XML::Feed missing', 2 unless $have_xml_feed;
 			my $p = XML::Feed->parse(\$feed);
 			is($p->format, "Atom", "parsed atom feed");
 			is(scalar $p->entries, 3, "parsed three entries");