Index: tests/standalone/src/SocketStreamCloseTest.dart |
diff --git a/tests/standalone/src/SocketStreamCloseTest.dart b/tests/standalone/src/SocketStreamCloseTest.dart |
index 0a91e322515e585627a87465d79115a4dd5293fe..0fecf931dd90fffaa200f38c8870686a6bfdb8d7 100644 |
--- a/tests/standalone/src/SocketStreamCloseTest.dart |
+++ b/tests/standalone/src/SocketStreamCloseTest.dart |
@@ -100,9 +100,9 @@ class SocketClose { |
} |
void connectHandler() { |
- _socket.inputStream.dataHandler = dataHandler; |
- _socket.inputStream.closeHandler = closeHandler; |
- _socket.errorHandler = errorHandler; |
+ _socket.inputStream.onData = dataHandler; |
+ _socket.inputStream.onClosed = closeHandler; |
+ _socket.onError = errorHandler; |
_iterations++; |
switch (_mode) { |
@@ -112,7 +112,7 @@ class SocketClose { |
break; |
case 1: |
_socket.outputStream.write("Hello".charCodes()); |
- _socket.outputStream.noPendingWriteHandler = () { |
+ _socket.outputStream.onNoPendingWrites = () { |
_socket.inputStream.close(); |
proceed(); |
}; |
@@ -124,7 +124,7 @@ class SocketClose { |
break; |
case 5: |
_socket.outputStream.write("Hello".charCodes()); |
- _socket.outputStream.noPendingWriteHandler = () { |
+ _socket.outputStream.onNoPendingWrites = () { |
_socket.outputStream.close(); |
}; |
break; |
@@ -134,7 +134,7 @@ class SocketClose { |
case 7: |
case 8: |
_socket.outputStream.write("Hello".charCodes()); |
- _socket.outputStream.noPendingWriteHandler = () { |
+ _socket.outputStream.onNoPendingWrites = () { |
_socket.outputStream.close(); |
}; |
break; |
@@ -145,7 +145,7 @@ class SocketClose { |
_socket = new Socket(SocketCloseServer.HOST, _port); |
Expect.equals(true, _socket !== null); |
- _socket.connectHandler = connectHandler; |
+ _socket.onConnect = connectHandler; |
} |
void start() { |
@@ -254,7 +254,7 @@ class SocketCloseServer extends Isolate { |
readBytes(() { |
_dataEvents++; |
connection.outputStream.write("Hello".charCodes()); |
- connection.outputStream.noPendingWriteHandler = () { |
+ connection.outputStream.onNoPendingWrites = () { |
connection.inputStream.close(); |
}; |
}); |
@@ -277,7 +277,7 @@ class SocketCloseServer extends Isolate { |
readBytes(() { |
_dataEvents++; |
connection.outputStream.write("Hello".charCodes()); |
- connection.outputStream.noPendingWriteHandler = () { |
+ connection.outputStream.onNoPendingWrites = () { |
connection.outputStream.close(); |
}; |
}); |
@@ -305,9 +305,9 @@ class SocketCloseServer extends Isolate { |
_iterations++; |
- connection.inputStream.dataHandler = dataHandler; |
- connection.inputStream.closeHandler = closeHandler; |
- connection.errorHandler = errorHandler; |
+ connection.inputStream.onData = dataHandler; |
+ connection.inputStream.onClosed = closeHandler; |
+ connection.onError = errorHandler; |
} |
void errorHandlerServer() { |
@@ -368,11 +368,11 @@ class SocketCloseServer extends Isolate { |
_mode = message; |
_server = new ServerSocket(HOST, 0, 10); |
Expect.equals(true, _server !== null); |
- _server.connectionHandler = (connection) { |
+ _server.onConnection = (connection) { |
var data = new ConnectionData(connection); |
connectionHandler(data); |
}; |
- _server.errorHandler = errorHandlerServer; |
+ _server.onError = errorHandlerServer; |
replyTo.send(_server.port, null); |
} else { |
new Timer(waitForResult, 0); |