--- trunk/t/1_nos.t	2005/05/18 13:12:54	45
+++ jifty-dbi/t/1_nos.t	2006/12/18 19:38:50	91
@@ -3,26 +3,63 @@
 use strict;
 use blib;
 
-use Test::More tests => 38;
+use Test::More tests => 118;
+use Cwd qw/abs_path/;
+use Data::Dumper;
 
-BEGIN { use_ok('Nos') };
+BEGIN {
+	use_ok('Nos');
+	use_ok('Mail::Alias');
+};
 
-ok(my $nos = new Nos('dsn' => 'dbi:Pg:dbname=notices'), "new");
+my $self_path = abs_path($0);
+$self_path =~ s#/[^/]+$##;
+ok($self_path, "self_path: $self_path");
 
-ok($nos->new_list( list => 'My list', email => 'my-list@example.com'), "new_list my-list");
-ok($nos->new_list( list => 'another', email => 'another@example.com'), "new_list another");
-ok($nos->new_list( list => 'test', email => 'test@example.com'), "new_list test");
+ok(my $nos = new Nos('dsn' => 'dbi:Pg:dbname=notices', full_hostname_in_aliases => 1), "new");
+
+my $aliases = $self_path . '/aliases';
+
+ok(! -e $aliases or unlink $aliases, "$aliases doesn't exist");
+
+open(my $a, "> $aliases") || die "can't create empty $aliases: $!";
+ok(close($a), "empty $aliases created");
+
+ok(check_aliases(), "aliases $aliases exist");
+
+sub check_aliases {
+	return 0 unless (-e $aliases);
+
+	my $email = shift || return 1;
+
+	my $a = new Mail::Alias($aliases);
+	return $a->exists($email);
+}
+
+ok($nos->create_list( list => 'My list', email => 'my-list@example.com', aliases => $aliases), "create_list my-list");
+ok(check_aliases('my-list@example.com'), "alias added");
+
+ok($nos->create_list( list => 'another', email => 'another@example.com', aliases => $aliases), "create_list another");
+ok(check_aliases('another@example.com'), "alias added");
+
+ok($nos->create_list( list => 'test', email => 'test@example.com', aliases => $aliases), "create_list test");
+ok(check_aliases('test@example.com'), "alias added");
 
 ok($nos->_get_list('My list'), "_get_list");
 ok($nos->_get_list('another'), "_get_list");
 ok($nos->_get_list('test'), "_get_list");
 
+ok(-e $aliases, "$aliases exist");
+
+my %ext_id;
+
 my $i = 0;
 foreach my $email (qw(foo@example.com bar@example.com baz@example.com)) {
 	my $full_name = uc($1)." Doe" if ($email =~ m/^([^@]+)@/);
-	ok($nos->add_member_to_list( list => 'My list', email => $email, name => $full_name ), "add_member_to_list $email");
+	ok($nos->add_member_to_list( list => 'My list', email => $email, name => $full_name, ext_id => $i ), "add_member_to_list $email, ext_id = $i");
 	ok($nos->add_member_to_list( list => 'another', email => $email ), "add_member_to_list $email") if ($i % 2 == 0);
-	ok($nos->add_member_to_list( list => 'test', email => $email ), "add_member_to_list $email") if ($i % 3 == 0);
+	ok($nos->add_member_to_list( list => 'test', email => $email, ext_id => $i ), "add_member_to_list $email, ext_id = $i") if ($i % 3 == 0);
+	$ext_id{$email} = $i;
 	$i++;
 }
 
@@ -37,6 +74,78 @@
 cmp_ok(scalar $nos->list_members( list => 'another' ), '==', 2, 'members of another');
 cmp_ok(scalar $nos->list_members( list => 'test' ), '==', 1, 'members of test');
 
+foreach my $list (('My list', 'another', 'test')) {
+	diag "checking list $list";
+	foreach my $m ( $nos->list_members( list => $list ) ) {
+		ok(my $email = $m->{'email'}, "have email");
+		cmp_ok($m->{'ext_id'}, 'eq', $ext_id{$email}, "ext_id($email)=$ext_id{$email}");
+	}
+}
+
+# test sending
+
+ok(my $sent = $nos->send_queued_messages(
+	list => 'My list',
+	driver => 'Test',
+  	sleep => 0,
+), 'send_queued_messages for My list');
+
+# replay to messages
+
+my @emails = Email::Send::Test->emails;
+
+cmp_ok( scalar( @emails ), '==', $sent, "sent $sent emails" );
+
+for (my $i = 0; $i < $sent; $i++) {
+	ok(my $msg = $emails[$i], "email $i");
+	isa_ok($msg, 'Email::Simple');
+	my ($from, $to);
+	ok($from = $msg->header("From"), "found From: $from");
+	ok($to = $msg->header("To"), "found To: $to");
+
+	ok($nos->inbox_message(
+		list => 'My list',
+		message => "From: $to
+To: $from
+Subject: reply $i
+X-Mailer: test of notice-sender
+Mailer: just to make Mail::Alias happy
+
+test reply $i",
+	), "inbox_message $i");
+
+}
+
+my @r = $nos->received_messages();
+cmp_ok(scalar @r, '==', $sent, "received_messages() = $sent");
+
+@r = $nos->received_messages( list => 'My list' );
+cmp_ok(scalar @r, '==', $sent, "received_messages(My list) = $sent");
+
+foreach my $email (qw(foo bar baz)) {
+	my @r = $nos->received_messages( email => $email . '@example.com' );
+	cmp_ok(scalar @r, '==', 1, "received_messages($email) = 1");
+}
+
+# test optional parametars
+
+@r = $nos->received_messages(message => 1);
+#diag "received_messages = ",Dumper(\@r);
+foreach (my $i = 0; $i <= $#r; $i++) {
+	like($r[$i]->{'message'}, qr/Subject: reply/, "message $i have content");
+}
+
+@r = $nos->received_messages(message => 1);
+for (my $i = 0; $i <= $#r; $i++) {
+	my $date = $r[$i]->{'date'};
+	my @r_from = $nos->received_messages( date_from => $date );
+	cmp_ok(scalar @r_from, '==', ($sent - $i), "received_messages( '$date' - )");
+	my @r_to = $nos->received_messages( date_to => $date );
+	cmp_ok(scalar @r_to, '==', ($i + 1), "received_messages( - '$date')");
+}
+
+# do some changes
+
 ok($nos->delete_member( email => 'foo@example.com' ), "delete");
 
 cmp_ok(scalar $nos->list_members( list => 'My list' ), '==', 2, 'members of My list');
@@ -47,3 +156,43 @@
 
 cmp_ok(scalar $nos->list_members( list => 'My list' ), '==', 1, 'members of My list');
 cmp_ok(scalar $nos->list_members( list => 'another' ), '==', 0, 'members of another');
+
+ok($nos->delete_member( email => 'bar@example.com' ), "delete");
+cmp_ok(scalar $nos->list_members( list => 'My list' ), '==', 0, 'members of My list');
+
+# now test delete
+
+ok($nos->create_list( list => 'delete', email => 'delete@example.com', aliases => $aliases), "create_list error");
+
+ok($nos->add_member_to_list( list => 'delete', email => 'delete_me@example.com' ), "add test member");
+
+my $nr;
+ok($nr = scalar $nos->list_members( list => 'delete' ), "get delete list members");
+
+foreach my $i (1 .. 5) {
+	ok($nos->add_member_to_list( list => 'delete', 'email' => 'delete_'.$i.'@example.com'), "add bogus member $i");
+}
+
+cmp_ok(scalar $nos->list_members( list => 'delete' ), '==', $nr + 5, "new member");
+
+ok($nos->delete_member_from_list( list => 'delete', email => 'delete_me@example.com'), "delete_memeber_from_list");
+
+cmp_ok(scalar $nos->list_members( list => 'delete' ), '==', $nr + 4, 'member deleted');
+
+ok(! $nos->delete_member_from_list( list => 'delete', email => 'delete_me@example.com'), "delete non-existant member");
+
+foreach my $i (1 .. 5) {
+	ok($nos->delete_member( email => 'delete_'.$i.'@example.com'), "delete_member $i");
+}
+
+cmp_ok(scalar $nos->list_members( list => 'delete' ), '==', 0, "list empty");
+
+# test delete lists
+
+foreach my $list (( 'My list', 'test', 'another', 'delete' )) {
+	ok($nos->drop_list( list => $list, aliases => $aliases ), "drop $list");
+	ok(! $nos->_get_list($list), "$list doesn't exist");
+}
+
+exit;
+