--- trunk/t/2_soap.t	2005/08/25 00:56:06	78
+++ trunk/t/2_soap.t	2006/12/18 19:35:04	90
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 39;
+use Test::More tests => 40;
 
 BEGIN {
 	use_ok('Nos');
@@ -12,6 +12,8 @@
 	use_ok('Cwd');
 };
 
+use Data::Dump qw/dump/;
+
 my $debug = 0;
 my $list_name = 'SOAP test';
 
@@ -23,10 +25,10 @@
 
 ok($aliases, "using aliases file $aliases");
 
-ok(new Nos::SOAP(
+ok(my $nos = new Nos::SOAP(
 	'dsn' => 'dbi:Pg:dbname=notices',
 	'aliases' => $aliases,
-), "new");
+), "new Nos::SOAP");
 
 ok(my $daemon = new SOAP::Transport::HTTP::Daemon(LocalAddr => 'localhost')->dispatch_to('Nos::SOAP'), "SOAP daemon");
 
@@ -138,10 +140,11 @@
 
 cmp_ok($#{$arr}, '==', 1, "member count ok");
 
-cmp_ok($arr->[0]->{'full_name'}, '==', 'Dobrica Pavlinusic', "full_name");
-cmp_ok($arr->[0]->{'email'}, '==', 'dpavlin@rot13.org', "email");
+diag "arr = ", dump($arr) if ($debug);
+cmp_ok($arr->[0]->{'name'}, 'eq', 'Dobrica Pavlinusic', "name");
+cmp_ok($arr->[0]->{'email'}, 'eq', 'dpavlin@rot13.org', "email");
 
-cmp_ok($arr->[1]->{'email'}, '==', 'nobody@example.com', "email");
+cmp_ok($arr->[1]->{'email'}, 'eq', 'nobody@example.com', "email");
 
 # DeleteMember
 
@@ -187,10 +190,36 @@
 
 diag "I should add e-mail send test!";
 
-ok(! $soap->MessagesReceived({
+=for next_version
+
+ok(my $nos = new Nos(
+	'dsn' => 'dbi:Pg:dbname=notices',
+	'aliases' => $aliases,
+), "new NOS");
+
+# or
+
+ok(my $sent = $nos->_nos_object->send_queued_messages(
+	list => $list_name,
+	driver => 'Test',
+  	sleep => 0,
+), "send_queued_messages for $list_name");
+
+my @emails = Email::Send::Test->emails;
+
+diag "emails = ", dump( @emails );
+
+=cut
+
+# replay to messages
+
+ok(my $received = $soap->MessagesReceived({
 	list => $list_name,
 })->result, "MessagesReceived for $list_name");
 
+diag "received = ", dump($received) if ($debug);
+cmp_ok( scalar @$received, '==', 0, 'no messages' );
+
 # kill server
 
 ok(kill('HUP' => $pid), "kill $pid");