--- AnyEvent/t/handle/01_readline.t	2008/05/24 23:10:18	1.6
+++ AnyEvent/t/handle/01_readline.t	2008/08/21 23:48:35	1.12
@@ -1,11 +1,14 @@
 #!perl
 
+# actually tests a few other read/write types as well
+
 use strict;
 
 use AnyEvent::Impl::Perl;
 use AnyEvent::Handle;
-use Test::More tests => 4;
+use Test::More tests => 8;
 use Socket;
+use Errno;
 
 {
    my $cv = AnyEvent->condvar;
@@ -13,26 +16,32 @@
    socketpair my $rd, my $wr, AF_UNIX, SOCK_STREAM, PF_UNSPEC;
 
    my $rd_ae = AnyEvent::Handle->new (
-      fh     => $rd,
-      on_eof => sub { $cv->broadcast },
+      fh       => $rd,
+      on_error => sub {
+         ok ($! == &Errno::EPIPE);
+         $cv->broadcast;
+      },
+      on_eof   => sub {
+         ok (0, "got eof");
+      },
    );
 
    my $concat;
 
-   $rd_ae->push_read_line (sub {
+   $rd_ae->push_read (line => sub {
       is ($_[1], "A", 'A line was read correctly');
       my $cb; $cb = sub {
          $concat .= $_[1];
-         $_[0]->push_read_line ($cb);
+         $_[0]->push_read (line => $cb);
       };
-      $_[0]->push_read_line ($cb);
+      $_[0]->push_read (line => $cb);
    });
 
-   syswrite $wr, "A\nBC\nDEF\nG\n" . ("X" x 113) . "\n";
+   syswrite $wr, "A\012BC\012DEF\012G\012" . ("X" x 113) . "\012";
    close $wr;
 
    $cv->wait;
-   is ($concat, "BCDEFG" . ("X" x 113), 'first lines were read correctly');
+   is ($concat, "BCDEFG" . ("X" x 113), 'initial lines were read correctly');
 }
 
 {
@@ -55,16 +64,23 @@
 
    my $wr_ae = new AnyEvent::Handle fh  => $wr, on_eof => sub { die };
 
-   $wr_ae->push_write (netstring => "0:xx,,");
-   $wr_ae->push_write ("A\nBC\nDEF\nG\n" . ("X" x 113) . "\n");
    undef $wr;
+   undef $rd;
+
+   $wr_ae->push_write (netstring => "0:xx,,");
+   $wr_ae->push_write (netstring => "");
+   $wr_ae->push_write (storable => [4,3,2]);
+   $wr_ae->push_write (packstring => "w", "hallole" x 99999); # try to exhaust socket buffer here
+   $wr_ae->push_write ("A\012BC\012DEF\nG\012" . ("X" x 113) . "\012");
    undef $wr_ae;
 
-   $rd_ae->push_read (netstring => sub {
-      is ($_[1], "0:xx,,");
-   });
+   $rd_ae->push_read (netstring => sub { is ($_[1], "0:xx,,") });
+   $rd_ae->push_read (netstring => sub { is ($_[1], "") });
+   $rd_ae->push_read (storable => "w", sub { is ("@{$_[1]}", "4 3 2") });
+   $rd_ae->push_read (packstring => "w", sub { is ($_[1], "hallole" x 99999) });
 
    $cv->wait;
 
-   is ($concat, "A:BC:DEF:G:" . ("X" x 113) . ":", 'second lines were read correctly');
+   is ($concat, "A:BC:DEF:G:" . ("X" x 113) . ":", 'second set of lines were read correctly');
 }
+