commit 5859f8c8f45839c6972e06f4aecad6b126fa87ed
author Kevin Moore <kevmoo@google.com> Fri Jun 29 16:57:05 2018 -0700
committer Kevin Moore <kevmoo@google.com> Fri Jun 29 16:57:05 2018 -0700
tree 8dd19bfc583102dfd71cb9582f74b1e21631b797
parent 9196951a2560b3f7742d0b0b75f9b2095d1ddc0e

dartfmt code and use latest pkg:test API

lib/src/copy/web_socket_impl.dart

diff --git a/lib/src/copy/web_socket_impl.dart b/lib/src/copy/web_socket_impl.dart
index 58bcaba..a11072d 100644
--- a/lib/src/copy/web_socket_impl.dart
+++ b/lib/src/copy/web_socket_impl.dart
@@ -467,12 +467,13 @@
 
   void addFrame(int opcode, List<int> data) {
     createFrame(
-        opcode,
-        data,
-        webSocket._serverSide,
-        // Logic around _deflateHelper was removed here, since ther ewill never
-        // be a deflate helper for a cross-platform WebSocket client.
-        false).forEach((e) {
+            opcode,
+            data,
+            webSocket._serverSide,
+            // Logic around _deflateHelper was removed here, since ther ewill never
+            // be a deflate helper for a cross-platform WebSocket client.
+            false)
+        .forEach((e) {
       _eventSink.add(e);
     });
   }

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index 32252a0..86236b7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,4 +13,4 @@
   stream_channel: '^1.2.0'
 
 dev_dependencies:
-  test: '^0.12.18'
+  test: ^1.2.0

test/html_test.dart

diff --git a/test/html_test.dart b/test/html_test.dart
index 83f112f..3ac49bc 100644
--- a/test/html_test.dart
+++ b/test/html_test.dart
@@ -113,7 +113,7 @@
     var channel = new HtmlWebSocketChannel.connect(
         "ws://localhost:${await serverChannel.stream.first}");
     expect(channel.stream.toList(),
-        throwsA(new isInstanceOf<WebSocketChannelException>()));
+        throwsA(new TypeMatcher<WebSocketChannelException>()));
   });
 }
 

test/io_test.dart

diff --git a/test/io_test.dart b/test/io_test.dart
index dfa718d..5d0d433 100644
--- a/test/io_test.dart
+++ b/test/io_test.dart
@@ -98,6 +98,6 @@
     var channel =
         new IOWebSocketChannel.connect("ws://localhost:${server.port}");
     expect(channel.stream.toList(),
-        throwsA(new isInstanceOf<WebSocketChannelException>()));
+        throwsA(new TypeMatcher<WebSocketChannelException>()));
   });
 }

test/web_socket_test.dart

diff --git a/test/web_socket_test.dart b/test/web_socket_test.dart
index 68d6b35..f2f263f 100644
--- a/test/web_socket_test.dart
+++ b/test/web_socket_test.dart
@@ -64,8 +64,8 @@
           ..set("Upgrade", "websocket")
           ..set(
               "Sec-WebSocket-Accept",
-              WebSocketChannel
-                  .signKey(request.headers.value('Sec-WebSocket-Key')));
+              WebSocketChannel.signKey(
+                  request.headers.value('Sec-WebSocket-Key')));
         response.contentLength = 0;
 
         var socket = await response.detachSocket();