X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faddress.t;h=6f4bff6c42928f4707355d9c25b286f1e6dac042;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=e35e4f8b0a1eb2d45032fb4ed37cef48802aac4b;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git

diff --git a/t/address.t b/t/address.t
index e35e4f8b..6f4bff6c 100644
--- a/t/address.t
+++ b/t/address.t
@@ -1,36 +1,58 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-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_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');
-
-is_deeply([PublicInbox::Address::emails('"ex@example.com" <ex@example.com>')],
-	[qw(ex@example.com)]);
-
-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');
-
-@names = PublicInbox::Address::names('"user@example.com" <user@example.com>');
-is_deeply(['user'], \@names, 'address-as-name extraction works as expected');
-
-
-{
-	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');
+sub test_pkg {
+	my ($pkg) = @_;
+	my $emails = \&{"${pkg}::emails"};
+	my $names = \&{"${pkg}::names"};
+
+	is_deeply([qw(e@example.com e@example.org)],
+		[$emails->('User <e@example.com>, e@example.org')],
+		'address extraction works as expected');
+
+	is_deeply(['user@example.com'],
+		[$emails->('<user@example.com (Comment)>')],
+		'comment after domain accepted before >');
+
+	my @names = $names->(
+		'User <e@e>, e@e, "John A. Doe" <j@d>, <x@x>, <y@x> (xyz), '.
+		'U Ser <u@x> (do not use)');
+	is_deeply(\@names, ['User', 'e', 'John A. Doe', 'x', 'xyz', 'U Ser'],
+		'name extraction works as expected');
+
+	@names = $names->('"user@example.com" <user@example.com>');
+	is_deeply(['user'], \@names,
+		'address-as-name extraction works as expected');
+
+	{
+		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');
+	}
+
+	@names = $names->('"Quote Unneeded" <user@example.com>');
+	is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+
+	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;