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

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

Issue 1426043002: Revert "Web Socket compression - take two" (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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 | « sdk/lib/io/websocket_impl.dart ('k') | tests/standalone/io/web_socket_typed_data_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/standalone/io/web_socket_compression_test.dart
diff --git a/tests/standalone/io/web_socket_compression_test.dart b/tests/standalone/io/web_socket_compression_test.dart
deleted file mode 100644
index 265c9534b9b8ab0be392af6a2de2e02bf37574ad..0000000000000000000000000000000000000000
--- a/tests/standalone/io/web_socket_compression_test.dart
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// VMOptions=
-// VMOptions=--short_socket_read
-// VMOptions=--short_socket_write
-// VMOptions=--short_socket_read --short_socket_write
-
-import "dart:async";
-import "dart:convert";
-import "dart:io";
-import "dart:typed_data";
-
-import "package:async_helper/async_helper.dart";
-import "package:crypto/crypto.dart";
-import "package:expect/expect.dart";
-import "package:path/path.dart";
-
-const WEB_SOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-
-const String HOST_NAME = 'localhost';
-
-class SecurityConfiguration {
- final bool secure;
-
- SecurityConfiguration({bool this.secure});
-
- Future<HttpServer> createServer({int backlog: 0}) =>
- secure ? HttpServer.bindSecure(HOST_NAME,
- 0,
- serverContext,
- backlog: backlog)
- : HttpServer.bind(HOST_NAME,
- 0,
- backlog: backlog);
-
- Future<WebSocket> createClient(int port) =>
- // TODO(whesse): Add client context argument to WebSocket.connect
- WebSocket.connect('${secure ? "wss" : "ws"}://$HOST_NAME:$port/');
-
- void testCompressionSupport({server: false,
- client: false,
- contextTakeover: false}) {
- asyncStart();
-
- var clientOptions = new CompressionOptions(
- enabled: client,
- serverNoContextTakeover: contextTakeover,
- clientNoContextTakeover: contextTakeover);
- var serverOptions = new CompressionOptions(
- enabled: server,
- serverNoContextTakeover: contextTakeover,
- clientNoContextTakeover: contextTakeover);
-
- createServer().then((server) {
- server.listen((request) {
- Expect.isTrue(WebSocketTransformer.isUpgradeRequest(request));
- WebSocketTransformer.upgrade(request, compression: serverOptions)
- .then((webSocket) {
- webSocket.listen((message) {
- Expect.equals("Hello World", message);
-
- webSocket.add(message);
- webSocket.close();
- });
- webSocket.add("Hello World");
- });
- });
-
- var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
- WebSocket.connect(url, compression: clientOptions).then((websocket) {
- var future = websocket.listen((message) {
- Expect.equals("Hello World", message);
- }).asFuture();
- websocket.add("Hello World");
- return future;
- }).then((_) {
- server.close();
- asyncEnd();
- });
- });
- }
-
- void testCompressionHeaders() {
- asyncStart();
- createServer().then((server) {
- server.listen((request) {
- Expect.equals('Upgrade', request.headers.value(HttpHeaders.CONNECTION));
- Expect.equals('websocket', request.headers.value(HttpHeaders.UPGRADE));
-
- var key = request.headers.value('Sec-WebSocket-Key');
- var sha1 = new SHA1()..add("$key$WEB_SOCKET_GUID".codeUnits);
- var accept = CryptoUtils.bytesToBase64(sha1.close());
- request.response
- ..statusCode = HttpStatus.SWITCHING_PROTOCOLS
- ..headers.add(HttpHeaders.CONNECTION, "Upgrade")
- ..headers.add(HttpHeaders.UPGRADE, "websocket")
- ..headers.add("Sec-WebSocket-Accept", accept)
- ..headers.add("Sec-WebSocket-Extensions",
- "permessage-deflate;"
- // Test quoted values and space padded =
- 'server_max_window_bits="10"; client_max_window_bits = 12'
- 'client_no_context_takeover; server_no_context_takeover');
- request.response.contentLength = 0;
- request.response.detachSocket().then((socket) {
- return new WebSocket.fromUpgradedSocket(socket, serverSide: true);
- }).then((websocket) {
- websocket.add("Hello");
- websocket.close();
- asyncEnd();
- });
- });
-
- var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
-
- WebSocket.connect(url).then((websocket) {
- return websocket.listen((message) {
- Expect.equals("Hello", message);
- websocket.close();
- }).asFuture();
- }).then((_) => server.close());
- });
- }
-
- void runTests() {
- // No compression or takeover
- testCompressionSupport();
- // compression no takeover
- testCompressionSupport(server: true, client: true);
- // compression and context takeover.
- testCompressionSupport(server: true, client: true, contextTakeover: true);
- // Compression on client but not server. No take over
- testCompressionSupport(client: true);
- // Compression on server but not client.
- testCompressionSupport(server: true);
-
- testCompressionHeaders();
- }
-}
-
-main() {
- new SecurityConfiguration(secure: false).runTests();
- // TODO(whesse): Make WebSocket.connect() take an optional context: parameter.
- // new SecurityConfiguration(secure: true).runTests();
-}
« no previous file with comments | « sdk/lib/io/websocket_impl.dart ('k') | tests/standalone/io/web_socket_typed_data_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698