X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fview.t;h=114c330466042c0008a42540097e103fc131e8eb;hp=3332fb48b14bb82eaf01220a98b79743479c1668;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=3f779258173530ca88f31e1dc5332f951d2c44cd

diff --git a/t/view.t b/t/view.t
index 3332fb48..114c3304 100644
--- a/t/view.t
+++ b/t/view.t
@@ -1,151 +1,31 @@
-# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2021 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::View;
-
-sub msg_html ($) {
-	my ($mime) = @_;
-
-	PublicInbox::View::msg_html(undef, $mime);
-}
-
-# plain text
-{
-	my $body = <<EOF;
-So and so wrote:
-> keep this inline
-
-OK
-
-> Long and wordy reply goes here and it is split across multiple lines.
-> We generate links to a separate full page where quoted-text is inline.
-> This is
->
-> Currently 12 lines
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-
-hello world
-EOF
-	my $s = Email::Simple->create(
-		header => [
-			From => 'a@example.com',
-			To => 'b@example.com',
-			'Content-Type' => 'text/plain',
-			'Message-ID' => '<hello@example.com>',
-			Subject => 'this is a subject',
-		],
-		body => $body,
-	)->as_string;
-	my $mime = Email::MIME->new($s);
-	my $html = msg_html($mime);
-
-	# ghetto tests
-	like($html, qr!<a\nhref="raw"!s, "raw link present");
-	like($html, qr/hello world\b/, "body present");
-	like($html, qr/&gt; keep this inline/, "short quoted text is inline");
-}
-
-# multipart crap
-{
-	my $parts = [
-		Email::MIME->create(
-			attributes => { content_type => 'text/plain', },
-			body => 'hi',
-		),
-		Email::MIME->create(
-			attributes => { content_type => 'text/plain', },
-			body => 'bye',
-		)
-	];
-	my $mime = Email::MIME->create(
-		header_str => [
-			From => 'a@example.com',
-			Subject => 'blargh',
-			'Message-ID' => '<blah@example.com>',
-			'In-Reply-To' => '<irp@example.com>',
-			],
-		parts => $parts,
-	);
-
-	my $html = msg_html($mime);
-	like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split");
-}
-
-# multipart email with attached patch
-{
-	my $parts = [
-		Email::MIME->create(
-			attributes => { content_type => 'text/plain', },
-			body => 'hi, see attached patch',
-		),
-		Email::MIME->create(
-			attributes => {
-				content_type => 'text/plain',
-				filename => "foo.patch",
-			},
-			body => "--- a/file\n+++ b/file\n" .
-			        "@@ -49, 7 +49,34 @@\n",
-		),
-	];
-	my $mime = Email::MIME->create(
-		header_str => [
-			From => 'a@example.com',
-			Subject => '[PATCH] asdf',
-			'Message-ID' => '<patch@example.com>',
-			],
-		parts => $parts,
-	);
-
-	my $html = msg_html($mime);
-	like($html, qr!.*Attachment #2: foo\.patch --!,
-		"parts split with filename");
-}
-
-# multipart collapsed to single quoted-printable text/plain
-{
-	my $parts = [
-		Email::MIME->create(
-			attributes => {
-				content_type => 'text/plain',
-				encoding => 'quoted-printable',
-			},
-			body => 'hi = bye',
-		)
-	];
-	my $mime = Email::MIME->create(
-		header_str => [
-			From => 'qp@example.com',
-			Subject => 'QP',
-			'Message-ID' => '<qp@example.com>',
-			],
-		parts => $parts,
-	);
-
-	my $orig = $mime->body_raw;
-	my $html = msg_html($mime);
-	like($orig, qr/hi =3D bye=/, "our test used QP correctly");
-	like($html, qr/\bhi = bye\b/, "HTML output decoded QP");
-}
-
-{
-	use PublicInbox::MID qw/id_compress/;
-
-	# n.b: this is probably invalid since we dropped CGI for PSGI:
-	like(id_compress('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
-		"percent always converted to sha1 to workaround buggy httpds");
-
-	is(id_compress('foobar-wtf'), 'foobar-wtf',
-		'regular ID not compressed');
+use PublicInbox::TestCommon;
+require_mods('Plack::Util');
+use_ok 'PublicInbox::View';
+
+# this only tests View.pm internals which are subject to change,
+# see t/plack.t for tests against the PSGI interface.
+
+my $cols = PublicInbox::View::COLS();
+my @addr;
+until (length(join(', ', @addr)) > ($cols * 2)) {
+	push @addr, '"l, f" <a@a>';
+	my $n = int(rand(20)) + 1;
+	push @addr, ('x'x$n).'@x';
 }
+my $orig = join(', ', @addr);
+my $res = PublicInbox::View::fold_addresses($orig.'');
+isnt($res, $orig, 'folded result');
+unlike($res, qr/l,\n\tf/s, '"last, first" no broken');
+my @nospc = ($res, $orig);
+s/\s+//g for @nospc;
+is($nospc[0], $nospc[1], 'no addresses lost in translation');
+my $tws = PublicInbox::View::fold_addresses($orig.' ');
+# (Email::Simple drops leading whitespace, but not trailing)
+$tws =~ s/ \z//;
+is($tws, $res, 'not thrown off by trailing whitespace');
 
 done_testing();