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

diff --git a/t/feed.t b/t/feed.t
index ec8a5a42..5ad90a07 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,13 +1,13 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 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::MIME;
+use PublicInbox::Eml;
 use PublicInbox::Feed;
 use PublicInbox::Import;
 use PublicInbox::Inbox;
-my $have_xml_feed = eval { require XML::Feed; 1 };
+my $have_xml_treepp = eval { require XML::TreePP; 1 };
 use PublicInbox::TestCommon;
 
 sub string_feed {
@@ -34,11 +34,9 @@ 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;
-
+	$im->init_bare;
 	foreach my $i (1..6) {
-		my $mime = Email::MIME->new(<<EOF);
+		my $mime = PublicInbox::Eml->new(<<EOF);
 From: ME <me\@example.com>
 To: U <u\@example.com>
 Message-Id: <$i\@example.com>
@@ -79,12 +77,14 @@ EOF
 	{
 		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");
+			skip 'XML::TreePP missing', 3 unless $have_xml_treepp;
+			my $t = XML::TreePP->new->parse($feed);
+			like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+				'looks like an an Atom feed');
+			is(scalar @{$t->{feed}->{entry}}, 3,
+				'parsed three entries');
+			is($t->{feed}->{id}, 'mailto:test@example',
+				'id is set to default');
 		}
 
 		like($feed, qr/drop me/, "long quoted text kept");
@@ -95,7 +95,7 @@ EOF
 	# add a new spam message
 	my $spam;
 	{
-		$spam = Email::MIME->new(<<EOF);
+		$spam = PublicInbox::Eml->new(<<EOF);
 From: SPAMMER <spammer\@example.com>
 To: U <u\@example.com>
 Message-Id: <this-is-spam\@example.com>
@@ -111,10 +111,12 @@ EOF
 	{
 		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");
+			skip 'XML::TreePP missing', 2 unless $have_xml_treepp;
+			my $t = XML::TreePP->new->parse($spammy_feed);
+			like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+				'looks like an an Atom feed');
+			is(scalar @{$t->{feed}->{entry}}, 3,
+				'parsed three entries');
 		}
 		like($spammy_feed, qr/SPAM/s, "spam showed up :<");
 	}
@@ -127,10 +129,12 @@ EOF
 	{
 		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");
+			skip 'XML::TreePP missing', 2 unless $have_xml_treepp;
+			my $t = XML::TreePP->new->parse($feed);
+			like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+				'looks like an an Atom feed');
+			is(scalar @{$t->{feed}->{entry}}, 3,
+				'parsed three entries');
 		}
 		unlike($feed, qr/SPAM/, "spam gone :>");
 	}