From f31e4b1b6bc06f089e61540fdc85714ffdd1c217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= <ask@develooper.com>
Date: Fri, 16 Jul 2004 02:51:39 +0000
Subject: [PATCH] 100% test coverage of Qpsmtpd::Address

git-svn-id: https://svn.perl.org/qpsmtpd/trunk@265 958fd67b-6ff1-0310-b445-bb7760255be9
---
 lib/Qpsmtpd/Address.pm |  7 ++++---
 t/qpsmtpd-address.t    | 29 +++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/lib/Qpsmtpd/Address.pm b/lib/Qpsmtpd/Address.pm
index c5dcd2c..fd99fd6 100644
--- a/lib/Qpsmtpd/Address.pm
+++ b/lib/Qpsmtpd/Address.pm
@@ -126,14 +126,15 @@ sub canonify {
     $path = $1;
 
     # strip source route
-    $path =~ s/[EMAIL PROTECTED](?:,[EMAIL PROTECTED])*://;
+    $path =~ s/^\@$domain(?:,\@$domain)*://;
 
     # empty path is ok
     return "" if $path eq "";
 
     # 
     my ($localpart, $domainpart) = ($path =~ /^(.*)\@($domain)$/);
-    return undef unless (defined $localpart && defined $domainpart);
+    return undef unless defined $localpart;
+
     if ($localpart =~ /^$atom(\.$atom)*/) {
         # simple case, we are done
         return $path;
@@ -158,7 +159,7 @@ sub parse {
 sub address {
     my ($self, $val) = @_;
     my $oldval = $self->[0];
-    $self->[0] = $val if (defined($val));
+    return $self->[0] = $val if (defined($val));
     return $oldval;
 }
 
diff --git a/t/qpsmtpd-address.t b/t/qpsmtpd-address.t
index cf208ff..dae8677 100644
--- a/t/qpsmtpd-address.t
+++ b/t/qpsmtpd-address.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 11;
+use Test::More tests => 21;
 
 BEGIN {
     use_ok('Qpsmtpd::Address');
@@ -21,6 +21,9 @@ $ao = Qpsmtpd::Address->parse($as);
 ok ($ao, "parse $as");
 is ($ao->format, $as, "format $as");
 
+is ($ao->user, 'foo', 'user');
+is ($ao->host, 'example.com', 'host');
+
 # the \ before the @ in the local part is not required, but
 # allowed. For simplicity we add a backslash before all characters 
 # which are not allowed in a dot-string.
@@ -36,9 +39,31 @@ ok ($ao, "parse $as");
 is ($ao->format, '<"foo\ bar"@example.com>', "format $as");
 
 
+$as = 'foo@example.com';
+$ao = Qpsmtpd::Address->parse($as);
+is ($ao, undef, "can't parse $as");
+
+$as = '<@example.com>';
+is (Qpsmtpd::Address->parse($as), undef, "can't parse $as");
+
+$as = '<@123>';
+is (Qpsmtpd::Address->parse($as), undef, "can't parse $as");
+
+$as = '<user>';
+is (Qpsmtpd::Address->parse($as), undef, "can't parse $as");
+
+
 $as = 'foo@example.com';
 $ao = Qpsmtpd::Address->new($as);
-ok ($ao, "parse $as");
+ok ($ao, "new $as");
 is ($ao->address, $as, "address $as");
 
+$as = '<foo@example.com>';
+$ao = Qpsmtpd::Address->new($as);
+ok ($ao, "new $as");
+is ($ao->address, 'foo@example.com', "address $as");
+
+# Not sure why we can change the address like this, but we can so test it ...
+is ($ao->address('test@example.com'), 'test@example.com', 'address(test@example.com)');
+