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

Side by Side Diff: tests/standalone/io/tls_socket_test.dart

Issue 11417116: Fix secure socket tests to close sockets after writing. Fix handling of close events in TlsSocket … (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fixed issue with incomplete writes in socket tests. Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 // 4 //
5 // VMOptions= 5 // VMOptions=
6 // VMOptions=--short_socket_read 6 // VMOptions=--short_socket_read
7 // The --short_socket_write option does not work with external server 7 // The --short_socket_write option does not work with external server
8 // www.google.dk. Add this to the test when we have secure server sockets. 8 // www.google.dk. Add this to the test when we have secure server sockets.
9 // See TODO below. 9 // See TODO below.
10 10
11 #import("dart:isolate"); 11 #import("dart:isolate");
12 #import("dart:io"); 12 #import("dart:io");
13 13
14 void WriteAndClose(Socket socket, String message) {
15 var data = message.charCodes;
16 int written = 0;
17 void write() {
18 written += socket.writeList(data, written, data.length - written);
19 if (written < data.length) {
20 socket.onWrite = write;
21 } else {
22 socket.close(true);
23 }
24 }
25 write();
26 }
27
14 void main() { 28 void main() {
15 var testPkcertDatabase = 29 var testPkcertDatabase =
16 new Path.fromNative(new Options().script).directoryPath.append('pkcert/'); 30 new Path.fromNative(new Options().script).directoryPath.append('pkcert/');
17 TlsSocket.setCertificateDatabase(testPkcertDatabase.toNativePath()); 31 TlsSocket.setCertificateDatabase(testPkcertDatabase.toNativePath());
18 // TODO(3593): Use a Dart HTTPS server for this test using TLS server sockets. 32 // TODO(3593): Use a Dart HTTPS server for this test using TLS server sockets.
19 // When we use a Dart HTTPS server, allow --short_socket_write. The flag 33 // When we use a Dart HTTPS server, allow --short_socket_write. The flag
20 // causes fragmentation of the client hello message, which doesn't seem to 34 // causes fragmentation of the client hello message, which doesn't seem to
21 // work with www.google.dk. 35 // work with www.google.dk.
22 var tls = new TlsSocket("www.google.dk", 443); 36 var tls = new TlsSocket("www.google.dk", 443);
23 List<String> chunks = <String>[]; 37 List<String> chunks = <String>[];
24 tls.onConnect = () { 38 tls.onConnect = () {
25 var request_bytes = 39 WriteAndClose(tls, "GET / HTTP/1.0\r\nHost: www.google.dk\r\n\r\n");
26 "GET / HTTP/1.0\r\nHost: www.google.dk\r\n\r\n".charCodes;
27 tls.writeList(request_bytes, 0, 20);
28 tls.writeList(request_bytes, 20, request_bytes.length - 20);
29 }; 40 };
30 var useReadList; // Mutually recursive onData callbacks. 41 var useReadList; // Mutually recursive onData callbacks.
31 void useRead() { 42 void useRead() {
32 var data = tls.read(); 43 var data = tls.read();
33 var received = new String.fromCharCodes(data); 44 var received = new String.fromCharCodes(data);
34 chunks.add(received); 45 chunks.add(received);
35 tls.onData = useReadList; 46 tls.onData = useReadList;
36 } 47 }
37 useReadList = () { 48 useReadList = () {
38 var buffer = new List(2000); 49 var buffer = new List(2000);
39 int len = tls.readList(buffer, 0, 2000); 50 int len = tls.readList(buffer, 0, 2000);
40 var received = new String.fromCharCodes(buffer.getRange(0, len)); 51 var received = new String.fromCharCodes(buffer.getRange(0, len));
41 chunks.add(received); 52 chunks.add(received);
42 tls.onData = useRead; 53 tls.onData = useRead;
43 }; 54 };
44 tls.onData = useRead; 55 tls.onData = useRead;
45 tls.onClosed = () { 56 tls.onClosed = () {
46 String fullPage = Strings.concatAll(chunks); 57 String fullPage = Strings.concatAll(chunks);
47 Expect.isTrue(fullPage.contains('</body></html>')); 58 Expect.isTrue(fullPage.contains('</body></html>'));
48 tls.close();
49 }; 59 };
50 } 60 }
OLDNEW
« sdk/lib/io/tls_socket.dart ('K') | « tests/standalone/io/tls_server_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698