--- AnyEvent/t/handle/04_listen.t	2008/05/21 14:37:55	1.11
+++ AnyEvent/t/handle/04_listen.t	2008/05/24 23:15:14	1.14
@@ -4,7 +4,7 @@
 
 use AnyEvent::Impl::Perl;
 use AnyEvent::Handle;
-use AnyEvent::Util;
+use AnyEvent::Socket;
 use AnyEvent;
 
 my $lbytes;
@@ -17,13 +17,13 @@
 my $hdl;
 my $port;
 
-my $w = AnyEvent::Util::tcp_server undef, undef,
+my $w = tcp_server undef, undef,
    sub {
       my ($fh, $host, $port) = @_;
 
       $hdl = AnyEvent::Handle->new (fh => $fh, on_eof => sub { $cv->broadcast });
 
-      $hdl->push_read_chunk (6, sub {
+      $hdl->push_read (chunk => 6, sub {
          my ($hdl, $data) = @_;
 
          if ($data eq "TEST\015\012") {
@@ -40,16 +40,15 @@
       0
    };
 
-
 my $clhdl;
-my $wc = AnyEvent::Util::tcp_connect localhost => $port, sub {
+my $wc = tcp_connect localhost => $port, sub {
    my ($fh) = @_
       or die "connect: $!";
 
    $clhdl = AnyEvent::Handle->new (fh => $fh, on_eof => sub { $cv->broadcast });
 
    $clhdl->push_write ("TEST\015\012");
-   $clhdl->push_read_line (sub {
+   $clhdl->push_read (line => sub {
       my ($clhdl, $line) = @_;
 
       if ($line eq 'BLABLABLA') {