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

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

Issue 8662038: Refactor some of the duplicated code in the tests using a socket server (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Minor fix Created 9 years, 1 month 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/src/SocketManyConnectionsTest.dart
diff --git a/tests/standalone/src/SocketManyConnectionsTest.dart b/tests/standalone/src/SocketManyConnectionsTest.dart
index 2e09876a5f96ebd89c1b563aa4e35d37b6547efe..9b737e89e5bca4ea187145c1ac15d62e4bfd8555 100644
--- a/tests/standalone/src/SocketManyConnectionsTest.dart
+++ b/tests/standalone/src/SocketManyConnectionsTest.dart
@@ -4,10 +4,9 @@
//
// Test creating a large number of socket connections.
-final SERVERINIT = 0;
-final SERVERSHUTDOWN = -1;
+#source("TestingServer.dart");
+
final CONNECTIONS = 200;
-final HOST = "127.0.0.1";
class SocketManyConnectionsTest {
@@ -35,7 +34,7 @@ class SocketManyConnectionsTest {
}
for (int i = 0; i < CONNECTIONS; i++) {
- _sockets[i] = new Socket(HOST, _port);
+ _sockets[i] = new Socket(TestingServer.HOST, _port);
if (_sockets[i] !== null) {
_sockets[i].connectHandler = connectHandler;
} else {
@@ -49,11 +48,11 @@ class SocketManyConnectionsTest {
_port = message;
run();
});
- _sendPort.send(SERVERINIT, _receivePort.toSendPort());
+ _sendPort.send(TestingServer.INIT, _receivePort.toSendPort());
}
void shutdown() {
- _sendPort.send(SERVERSHUTDOWN, _receivePort.toSendPort());
+ _sendPort.send(TestingServer.SHUTDOWN, _receivePort.toSendPort());
_receivePort.close();
}
@@ -64,48 +63,26 @@ class SocketManyConnectionsTest {
int _connections;
}
-class TestServer extends Isolate {
-
- void main() {
+class TestServer extends TestingServer {
- void connectionHandler() {
- Socket _client;
+ void connectionHandler() {
+ Socket _client;
- void closeHandler() {
- _client.close();
- }
-
- void errorHandler() {
- print("Socket error");
- _client.close();
- }
-
- _client = _server.accept();
- _connections++;
- _client.closeHandler = closeHandler;
- _client.errorHandler = errorHandler;
+ void closeHandler() {
+ _client.close();
}
- void errorHandlerServer() {
- print("Server socket error");
- _server.close();
+ void errorHandler() {
+ print("Socket error");
+ _client.close();
}
- this.port.receive((message, SendPort replyTo) {
- if (message == SERVERINIT) {
- _server = new ServerSocket(HOST, 0, 10);
- Expect.equals(true, _server !== null);
- _server.connectionHandler = connectionHandler;
- _server.errorHandler = errorHandlerServer;
- replyTo.send(_server.port, null);
- } else if (message == SERVERSHUTDOWN) {
- _server.close();
- this.port.close();
- }
- });
+ _client = _server.accept();
+ _connections++;
+ _client.closeHandler = closeHandler;
+ _client.errorHandler = errorHandler;
}
- ServerSocket _server;
int _connections = 0;
}

Powered by Google App Engine
This is Rietveld 408576698