X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Faddress.t;h=6aa94628dc8f943cccf1bf626e39098b87d49ad5;hp=be0fc5b7b41aa1eec50e8a130e7c8ace619cf4e4;hb=refs%2Fheads%2Fmaster;hpb=5cbb8df04448baf6c07c3de652d287bd2a0a3299

diff --git a/t/address.t b/t/address.t
index be0fc5b7..6aa94628 100644
--- a/t/address.t
+++ b/t/address.t
@@ -1,36 +1,79 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-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_ok 'PublicInbox::Address';
 
-is_deeply([qw(e@example.com e@example.org)],
-	[PublicInbox::Address::emails('User <e@example.com>, e@example.org')],
-	'address extraction works as expected');
+sub test_pkg {
+	my ($pkg) = @_;
+	my $emails = $pkg->can('emails');
+	my $names = $pkg->can('names');
+	my $pairs = $pkg->can('pairs');
 
-is_deeply([PublicInbox::Address::emails('"ex@example.com" <ex@example.com>')],
-	[qw(ex@example.com)]);
+	is_deeply([qw(e@example.com e@example.org)],
+		[$emails->('User <e@example.com>, e@example.org')],
+		'address extraction works as expected');
 
-my @names = PublicInbox::Address::names(
-	'User <e@e>, e@e, "John A. Doe" <j@d>, <x@x>');
-is_deeply(['User', 'e', 'John A. Doe', 'x'], \@names,
-	'name extraction works as expected');
+	is_deeply($pairs->('User <e@example.com>, e@example.org'),
+			[[qw(User e@example.com)], [undef, 'e@example.org']],
+		"pair extraction works ($pkg)");
 
-@names = PublicInbox::Address::names('"user@example.com" <user@example.com>');
-is_deeply(['user'], \@names, 'address-as-name extraction works as expected');
+	is_deeply(['user@example.com'],
+		[$emails->('<user@example.com (Comment)>')],
+		'comment after domain accepted before >');
+	is_deeply($pairs->('<user@example.com (Comment)>'),
+		[[qw(Comment user@example.com)]], "comment as name ($pkg)");
 
+	my $s = 'User <e@e>, e@e, "John A. Doe" <j@d>, <x@x>, <y@x> (xyz), '.
+		'U Ser <u@x> (do not use)';
+	my @names = $names->($s);
+	is_deeply(\@names, ['User', 'e', 'John A. Doe', 'x', 'xyz', 'U Ser'],
+		'name extraction works as expected');
+	is_deeply($pairs->($s), [ [ 'User', 'e@e' ], [ undef, 'e@e' ],
+			[ 'John A. Doe', 'j@d' ], [ undef, 'x@x' ],
+			[ 'xyz', 'y@x' ], [ 'U Ser', 'u@x' ] ],
+		"pairs extraction works for $pkg");
 
-{
-	my $backwards = 'u@example.com (John Q. Public)';
-	@names = PublicInbox::Address::names($backwards);
-	is_deeply(\@names, ['u'], 'backwards name OK');
-	my @emails = PublicInbox::Address::emails($backwards);
-	is_deeply(\@emails, ['u@example.com'], 'backwards emails OK');
+	@names = $names->('"user@example.com" <user@example.com>');
+	is_deeply(['user'], \@names,
+		'address-as-name extraction works as expected');
+	is_deeply($pairs->('"user@example.com" <user@example.com>'),
+		[ [ 'user@example.com', 'user@example.com' ] ],
+		"pairs for $pkg");
+
+	{
+		my $backwards = 'u@example.com (John Q. Public)';
+		@names = $names->($backwards);
+		is_deeply(\@names, ['John Q. Public'], 'backwards name OK');
+		my @emails = $emails->($backwards);
+		is_deeply(\@emails, ['u@example.com'], 'backwards emails OK');
+
+		is_deeply($pairs->($backwards),
+			[ [ 'John Q. Public', 'u@example.com' ] ],
+			"backwards pairs $pkg");
+	}
+
+	$s = '"Quote Unneeded" <user@example.com>';
+	@names = $names->($s);
+	is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+	is_deeply($pairs->($s), [ [ 'Quote Unneeded', 'user@example.com' ] ],
+		"extra quotes dropped in pairs $pkg");
+
+	my @emails = $emails->('Local User <user>');
+	is_deeply([], \@emails , 'no address for local address');
+	@names = $emails->('Local User <user>');
+	is_deeply([], \@names, 'no address, no name');
 }
 
+test_pkg('PublicInbox::Address');
 
-@names = PublicInbox::Address::names('"Quote Unneeded" <user@example.com>');
-is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+SKIP: {
+	if ($INC{'PublicInbox/AddressPP.pm'}) {
+		skip 'Email::Address::XS missing', 8;
+	}
+	use_ok 'PublicInbox::AddressPP';
+	test_pkg('PublicInbox::AddressPP');
+}
 
 done_testing;