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

Unified Diff: tests/standalone/io/raw_socket_test.dart

Issue 23886004: Update dart:io tests to use asyncStart/asyncEnd (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Addressed review comments Created 7 years, 3 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
Index: tests/standalone/io/raw_socket_test.dart
diff --git a/tests/standalone/io/raw_socket_test.dart b/tests/standalone/io/raw_socket_test.dart
index a61bccfe9114e3abb91be6f70854df8b43ae41bd..dfd41508d1170879fa20aa115b46114054a1595f 100644
--- a/tests/standalone/io/raw_socket_test.dart
+++ b/tests/standalone/io/raw_socket_test.dart
@@ -7,10 +7,11 @@
// VMOptions=--short_socket_write
// VMOptions=--short_socket_read --short_socket_write
-import "package:expect/expect.dart";
import "dart:async";
import "dart:io";
-import "dart:isolate";
+
+import "package:async_helper/async_helper.dart";
+import "package:expect/expect.dart";
void testArguments() {
Expect.throws(() => RawServerSocket.bind("127.0.0.1", 65536));
@@ -19,35 +20,34 @@ void testArguments() {
}
void testSimpleBind() {
- ReceivePort port = new ReceivePort();
+ asyncStart();
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0).then((s) {
Expect.isTrue(s.port > 0);
- port.close();
+ asyncEnd();
});
}
void testInvalidBind() {
- int count = 0;
- ReceivePort port = new ReceivePort();
- port.receive((_, __) { count++; if (count == 3) port.close(); });
-
// Bind to a unknown DNS name.
+ asyncStart();
RawServerSocket.bind("ko.faar.__hest__", 0)
.then((_) { Expect.fail("Failure expected"); } )
.catchError((error) {
Expect.isTrue(error is SocketException);
- port.toSendPort().send(1);
+ asyncEnd();
});
// Bind to an unavaliable IP-address.
+ asyncStart();
RawServerSocket.bind("8.8.8.8", 0)
.then((_) { Expect.fail("Failure expected"); } )
.catchError((error) {
Expect.isTrue(error is SocketException);
- port.toSendPort().send(1);
+ asyncEnd();
});
// Bind to a port already in use.
+ asyncStart();
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0)
.then((s) {
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, s.port)
@@ -57,30 +57,30 @@ void testInvalidBind() {
})
.catchError((error) {
Expect.isTrue(error is SocketException);
- port.toSendPort().send(1);
+ asyncEnd();
});
});
}
void testSimpleConnect() {
- ReceivePort port = new ReceivePort();
+ asyncStart();
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0).then((server) {
server.listen((_) { });
RawSocket.connect("127.0.0.1", server.port).then((_) {
server.close();
- port.close();
+ asyncEnd();
});
});
}
void testCloseOneEnd(String toClose) {
- ReceivePort port = new ReceivePort();
+ asyncStart();
Completer serverDone = new Completer();
Completer serverEndDone = new Completer();
Completer clientEndDone = new Completer();
Future.wait([serverDone.future, serverEndDone.future, clientEndDone.future])
.then((_) {
- port.close();
+ asyncEnd();
});
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0).then((server) {
server.listen((serverConnection) {
@@ -111,13 +111,13 @@ void testCloseOneEnd(String toClose) {
}
void testServerListenAfterConnect() {
- ReceivePort port = new ReceivePort();
+ asyncStart();
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0).then((server) {
Expect.isTrue(server.port > 0);
RawSocket.connect("127.0.0.1", server.port).then((_) {
server.listen((_) {
server.close();
- port.close();
+ asyncEnd();
});
});
});
@@ -128,7 +128,7 @@ void testSimpleReadWrite({bool dropReads}) {
// writes and the server echos. When the server has finished its
// echo it half-closes. When the client gets the close event is
// closes fully.
- ReceivePort port = new ReceivePort();
+ asyncStart();
const messageSize = 1000;
int serverReadCount = 0;
@@ -245,7 +245,7 @@ void testSimpleReadWrite({bool dropReads}) {
},
onDone: () {
Expect.isTrue(closedEventReceived);
- port.close();
+ asyncEnd();
});
});
});
@@ -256,15 +256,14 @@ testPauseServerSocket() {
var acceptCount = 0;
var resumed = false;
- ReceivePort port = new ReceivePort();
-
+ asyncStart();
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0).then((server) {
Expect.isTrue(server.port > 0);
var subscription = server.listen((_) {
Expect.isTrue(resumed);
if (++acceptCount == socketCount) {
server.close();
- port.close();
+ asyncEnd();
}
});
@@ -297,8 +296,7 @@ void testPauseSocket() {
var writeSubscription;
var readSubscription;
- ReceivePort port = new ReceivePort();
-
+ asyncStart();
RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0).then((server) {
Expect.isTrue(server.port > 0);
server.listen((client) {
@@ -351,7 +349,7 @@ void testPauseSocket() {
if (bytesRead == messageSize) {
if (++pauseResumeCount == loopCount) {
socket.close();
- port.close();
+ asyncEnd();
} else {
readSubscription.pause();
}
@@ -380,6 +378,7 @@ void testPauseSocket() {
}
main() {
+ asyncStart();
testArguments();
testSimpleBind();
testCloseOneEnd("client");
@@ -391,4 +390,5 @@ main() {
testSimpleReadWrite(dropReads: true);
testPauseServerSocket();
testPauseSocket();
+ asyncEnd();
}
« no previous file with comments | « tests/standalone/io/raw_server_socket_cancel_test.dart ('k') | tests/standalone/io/raw_socket_typed_data_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698