treewide: replace {-inbox} with {ibx} for consistency

[public-inbox.git] / t / feed.t

diff --git a/t/feed.t b/t/feed.t
index ec8a5a42e9ae3ee635a6f592e64e8789efd66bfb..9f6a987bd82066ddc3efbe6171ffb12ccfb99f00 100644 (file)
--- 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>
@@ -77,14 +75,16 @@ EOF
 {
        # check initial feed
        {
-               my $feed = string_feed({ -inbox => $ibx });
+               my $feed = string_feed({ ibx => $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>
@@ -109,12 +109,14 @@ EOF
 
        # check spam shows up
        {
-               my $spammy_feed = string_feed({ -inbox => $ibx });
+               my $spammy_feed = string_feed({ ibx => $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 :<");
        }
@@ -125,12 +127,14 @@ EOF
 
        # spam no longer shows up
        {
-               my $feed = string_feed({ -inbox => $ibx });
+               my $feed = string_feed({ ibx => $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 :>");
        }