--- trunk/t/2_soap.t	2006/12/19 10:32:18	92
+++ trunk/t/2_soap.t	2006/12/19 15:04:05	93
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 40;
+use Test::More tests => 44;
 
 BEGIN {
 	use_ok('Nos');
@@ -125,6 +125,12 @@
 
 cmp_ok($message_id, '==', $message_id2, "message_id: $message_id");
 
+ok(my $message_id3 = $soap->AddMessageToList({
+	list => $list_name,
+	message => "$msg\n and another one",
+})->result, "AddMessageToList named");
+
+cmp_ok($message_id, '!=', $message_id3, "new message_id: $message_id3");
 
 # ListMembers
 
@@ -146,6 +152,25 @@
 
 cmp_ok($arr->[1]->{'email'}, 'eq', 'nobody@example.com', "email");
 
+# test sending
+
+ok(my $sent = $soap->SendTest({
+	list => $list_name,
+	driver => 'Test',
+  	sleep => 0,
+})->result, "send_queued_messages for $list_name");
+
+cmp_ok($sent, '==', 4, 'messages sent');
+
+# replay to messages
+
+ok(my $received = $soap->MessagesReceived(
+	list => $list_name
+)->result, "MessagesReceived for $list_name");
+
+diag "received = ", dump($received) if ($debug);
+cmp_ok( $received, '==', 0, 'no messages' );
+
 # DeleteMember
 
 ok($soap->DeleteMemberFromList({
@@ -190,36 +215,6 @@
 
 diag "I should add e-mail send test!";
 
-=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");