Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1757)

Unified Diff: tests/standalone/src/HttpTest.dart

Issue 9500002: Rename blahHandler to onBlah throughout dart:io. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/standalone/src/FileTest.dart ('k') | tests/standalone/src/ListInputStreamTest.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/standalone/src/HttpTest.dart
diff --git a/tests/standalone/src/HttpTest.dart b/tests/standalone/src/HttpTest.dart
index 62e2585be8af3b67097e0f6cbc27439bfdea8d6e..62c5bcdd0fad69e6ab791abfd748dd85b18d3289 100644
--- a/tests/standalone/src/HttpTest.dart
+++ b/tests/standalone/src/HttpTest.dart
@@ -102,8 +102,8 @@ class TestServer extends Isolate {
// Echo the request content back to the response.
void _zeroToTenHandler(HttpRequest request, HttpResponse response) {
Expect.equals("GET", request.method);
- request.inputStream.dataHandler = () {};
- request.inputStream.closeHandler = () {
+ request.inputStream.onData = () {};
+ request.inputStream.onClosed = () {
response.writeString("01234567890");
response.outputStream.close();
};
@@ -144,7 +144,7 @@ class TestServer extends Isolate {
_server = new HttpServer();
try {
_server.listen("127.0.0.1", 0);
- _server.requestHandler = (HttpRequest req, HttpResponse rsp) {
+ _server.onRequest = (HttpRequest req, HttpResponse rsp) {
_requestReceivedHandler(req, rsp);
};
replyTo.send(new TestServerStatus.started(_server.port), null);
@@ -191,12 +191,12 @@ void testGET() {
HttpClient httpClient = new HttpClient();
HttpClientConnection conn =
httpClient.get("127.0.0.1", port, "/0123456789");
- conn.responseHandler = (HttpClientResponse response) {
+ conn.onResponse = (HttpClientResponse response) {
Expect.equals(HttpStatus.OK, response.statusCode);
StringInputStream stream = new StringInputStream(response.inputStream);
StringBuffer body = new StringBuffer();
- stream.dataHandler = () => body.add(stream.read());
- stream.closeHandler = () {
+ stream.onData = () => body.add(stream.read());
+ stream.onClosed = () {
Expect.equals("01234567890", body.toString());
httpClient.shutdown();
testServerMain.shutdown();
@@ -219,7 +219,7 @@ void testPOST(bool chunkedEncoding) {
void sendRequest() {
HttpClientConnection conn =
httpClient.post("127.0.0.1", port, "/echo");
- conn.requestHandler = (HttpClientRequest request) {
+ conn.onRequest = (HttpClientRequest request) {
if (chunkedEncoding) {
request.writeString(data.substring(0, 10));
request.writeString(data.substring(10, data.length));
@@ -229,12 +229,12 @@ void testPOST(bool chunkedEncoding) {
}
request.outputStream.close();
};
- conn.responseHandler = (HttpClientResponse response) {
+ conn.onResponse = (HttpClientResponse response) {
Expect.equals(HttpStatus.OK, response.statusCode);
StringInputStream stream = new StringInputStream(response.inputStream);
StringBuffer body = new StringBuffer();
- stream.dataHandler = () => body.add(stream.read());
- stream.closeHandler = () {
+ stream.onData = () => body.add(stream.read());
+ stream.onClosed = () {
Expect.equals(data, body.toString());
count++;
if (count < kMessageCount) {
@@ -270,7 +270,7 @@ void testReadInto(bool chunkedEncoding) {
void sendRequest() {
HttpClientConnection conn =
httpClient.post("127.0.0.1", port, "/echo");
- conn.requestHandler = (HttpClientRequest request) {
+ conn.onRequest = (HttpClientRequest request) {
if (chunkedEncoding) {
request.writeString(data.substring(0, 10));
request.writeString(data.substring(10, data.length));
@@ -280,16 +280,16 @@ void testReadInto(bool chunkedEncoding) {
}
request.outputStream.close();
};
- conn.responseHandler = (HttpClientResponse response) {
+ conn.onResponse = (HttpClientResponse response) {
Expect.equals(HttpStatus.OK, response.statusCode);
InputStream stream = response.inputStream;
List<int> body = new List<int>();
- stream.dataHandler = () {
+ stream.onData = () {
List tmp = new List(3);
int bytes = stream.readInto(tmp);
body.addAll(tmp.getRange(0, bytes));
};
- stream.closeHandler = () {
+ stream.onClosed = () {
Expect.equals(data, new String.fromCharCodes(body));
count++;
if (count < kMessageCount) {
@@ -325,7 +325,7 @@ void testReadShort(bool chunkedEncoding) {
void sendRequest() {
HttpClientConnection conn =
httpClient.post("127.0.0.1", port, "/echo");
- conn.requestHandler = (HttpClientRequest request) {
+ conn.onRequest = (HttpClientRequest request) {
if (chunkedEncoding) {
request.writeString(data.substring(0, 10));
request.writeString(data.substring(10, data.length));
@@ -335,15 +335,15 @@ void testReadShort(bool chunkedEncoding) {
}
request.outputStream.close();
};
- conn.responseHandler = (HttpClientResponse response) {
+ conn.onResponse = (HttpClientResponse response) {
Expect.equals(HttpStatus.OK, response.statusCode);
InputStream stream = response.inputStream;
List<int> body = new List<int>();
- stream.dataHandler = () {
+ stream.onData = () {
List tmp = stream.read(2);
body.addAll(tmp);
};
- stream.closeHandler = () {
+ stream.onClosed = () {
Expect.equals(data, new String.fromCharCodes(body));
count++;
if (count < kMessageCount) {
@@ -373,7 +373,7 @@ void test404() {
HttpClient httpClient = new HttpClient();
HttpClientConnection conn =
httpClient.get("127.0.0.1", port, "/thisisnotfound");
- conn.responseHandler = (HttpClientResponse response) {
+ conn.onResponse = (HttpClientResponse response) {
Expect.equals(HttpStatus.NOT_FOUND, response.statusCode);
httpClient.shutdown();
testServerMain.shutdown();
@@ -389,7 +389,7 @@ void testReasonPhrase() {
HttpClient httpClient = new HttpClient();
HttpClientConnection conn =
httpClient.get("127.0.0.1", port, "/reasonformoving");
- conn.responseHandler = (HttpClientResponse response) {
+ conn.onResponse = (HttpClientResponse response) {
Expect.equals(HttpStatus.MOVED_PERMANENTLY, response.statusCode);
Expect.equals("Don't come looking here any more", response.reasonPhrase);
httpClient.shutdown();
« no previous file with comments | « tests/standalone/src/FileTest.dart ('k') | tests/standalone/src/ListInputStreamTest.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698