--- trunk/t/1_nos.t	2005/05/17 21:37:06	38
+++ trunk/t/1_nos.t	2005/06/21 20:49:27	59
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 31;
+use Test::More tests => 68;
 
 BEGIN { use_ok('Nos') };
 
@@ -17,16 +17,72 @@
 ok($nos->_get_list('another'), "_get_list");
 ok($nos->_get_list('test'), "_get_list");
 
+my %ext_id;
+
 my $i = 0;
 foreach my $email (qw(foo@example.com bar@example.com baz@example.com)) {
-	ok($nos->add_member_to_list( list => 'My list', email => $email ), "add_member_to_list $email");
+	my $full_name = uc($1)." Doe" if ($email =~ m/^([^@]+)@/);
+	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++;
 }
 
 ok($nos->add_message_to_list( list => 'My list', message => "Subject: test\n\nJust a test\n\n" ), "add_message_to_list");
 
 foreach my $i ( 1 .. 10 ) {
-	ok($nos->add_message_to_list( list => 'another', message => "Subject: test $i" ), "add_message_to_list");
-	ok($nos->add_message_to_list( list => 'test', message => "Subject: test e-mail $i\n\nIsn't life great?\n" ), "add_message_to_list") if ($i % 3 == 0);
+	ok($nos->add_message_to_list( list => 'another', message => "Subject: test $i" ), "add_message_to_list another $i");
+	ok($nos->add_message_to_list( list => 'test', message => "Subject: test e-mail $i\n\nIsn't life great?\n" ), "add_message_to_list test $i") if ($i % 3 == 0);
+}
+
+cmp_ok(scalar $nos->list_members( list => 'My list' ), '==', 3, 'members of My list');
+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}");
+	}
 }
+
+
+ok($nos->delete_member( email => 'foo@example.com' ), "delete");
+
+cmp_ok(scalar $nos->list_members( list => 'My list' ), '==', 2, 'members of My list');
+cmp_ok(scalar $nos->list_members( list => 'another' ), '==', 1, 'members of another');
+cmp_ok(scalar $nos->list_members( list => 'test' ), '==', 0, 'members of test');
+
+ok($nos->delete_member( name => 'BAZ Doe' ), "delete");
+
+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');
+
+# now test delete
+
+ok($nos->new_list( list => 'delete', email => 'delete@example.com'), "new_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");