| Index: pkg/analysis_server/test/channel/byte_stream_channel_test.dart
|
| diff --git a/pkg/analysis_server/test/channel/byte_stream_channel_test.dart b/pkg/analysis_server/test/channel/byte_stream_channel_test.dart
|
| index 297a3a017203117de46f8cc8a34084bf70fdddb0..4a5631b04414036ba3db42a9fa42008941fdc9f6 100644
|
| --- a/pkg/analysis_server/test/channel/byte_stream_channel_test.dart
|
| +++ b/pkg/analysis_server/test/channel/byte_stream_channel_test.dart
|
| @@ -20,19 +20,16 @@ main() {
|
| setUp(ByteStreamClientChannelTest.setUp);
|
| test('close', ByteStreamClientChannelTest.close);
|
| test(
|
| - 'listen_notification',
|
| - ByteStreamClientChannelTest.listen_notification);
|
| + 'listen_notification', ByteStreamClientChannelTest.listen_notification);
|
| test('listen_response', ByteStreamClientChannelTest.listen_response);
|
| test('sendRequest', ByteStreamClientChannelTest.sendRequest);
|
| });
|
| group('ByteStreamServerChannel', () {
|
| setUp(ByteStreamServerChannelTest.setUp);
|
| test('closed', ByteStreamServerChannelTest.closed);
|
| - test(
|
| - 'listen_wellFormedRequest',
|
| + test('listen_wellFormedRequest',
|
| ByteStreamServerChannelTest.listen_wellFormedRequest);
|
| - test(
|
| - 'listen_invalidRequest',
|
| + test('listen_invalidRequest',
|
| ByteStreamServerChannelTest.listen_invalidRequest);
|
| test('listen_invalidJson', ByteStreamServerChannelTest.listen_invalidJson);
|
| test('listen_streamError', ByteStreamServerChannelTest.listen_streamError);
|
| @@ -65,7 +62,7 @@ class ByteStreamClientChannelTest {
|
| bool doneCalled = false;
|
| bool closeCalled = false;
|
| // add listener so that outputSink will trigger done/close futures
|
| - outputLineStream.listen((_) { /* no-op */ });
|
| + outputLineStream.listen((_) {/* no-op */});
|
| outputSink.done.then((_) {
|
| doneCalled = true;
|
| });
|
| @@ -119,8 +116,9 @@ class ByteStreamClientChannelTest {
|
| var inputStream = new StreamController<List<int>>();
|
| inputSink = new IOSink(inputStream);
|
| var outputStream = new StreamController<List<int>>();
|
| - outputLineStream = outputStream.stream.transform(
|
| - (new Utf8Codec()).decoder).transform(new LineSplitter());
|
| + outputLineStream = outputStream.stream
|
| + .transform((new Utf8Codec()).decoder)
|
| + .transform(new LineSplitter());
|
| outputSink = new IOSink(outputStream);
|
| channel = new ByteStreamClientChannel(inputStream.stream, outputSink);
|
| }
|
| @@ -156,16 +154,17 @@ class ByteStreamServerChannelTest {
|
| static Future doneFuture;
|
|
|
| static Future closed() {
|
| - return inputSink.close().then(
|
| - (_) => channel.closed.timeout(new Duration(seconds: 1)));
|
| + return inputSink
|
| + .close()
|
| + .then((_) => channel.closed.timeout(new Duration(seconds: 1)));
|
| }
|
|
|
| static Future listen_invalidJson() {
|
| inputSink.writeln('{"id":');
|
| - return inputSink.flush().then(
|
| - (_) =>
|
| - outputLineStream.first.timeout(
|
| - new Duration(seconds: 1))).then((String response) {
|
| + return inputSink
|
| + .flush()
|
| + .then((_) => outputLineStream.first.timeout(new Duration(seconds: 1)))
|
| + .then((String response) {
|
| var jsonResponse = new JsonCodec().decode(response);
|
| expect(jsonResponse, isMap);
|
| expect(jsonResponse, contains('error'));
|
| @@ -175,10 +174,10 @@ class ByteStreamServerChannelTest {
|
|
|
| static Future listen_invalidRequest() {
|
| inputSink.writeln('{"id":"0"}');
|
| - return inputSink.flush().then(
|
| - (_) =>
|
| - outputLineStream.first.timeout(
|
| - new Duration(seconds: 1))).then((String response) {
|
| + return inputSink
|
| + .flush()
|
| + .then((_) => outputLineStream.first.timeout(new Duration(seconds: 1)))
|
| + .then((String response) {
|
| var jsonResponse = new JsonCodec().decode(response);
|
| expect(jsonResponse, isMap);
|
| expect(jsonResponse, contains('error'));
|
| @@ -187,25 +186,28 @@ class ByteStreamServerChannelTest {
|
| }
|
|
|
| static Future listen_streamDone() {
|
| - return inputSink.close().then(
|
| - (_) => doneFuture.timeout(new Duration(seconds: 1)));
|
| + return inputSink
|
| + .close()
|
| + .then((_) => doneFuture.timeout(new Duration(seconds: 1)));
|
| }
|
|
|
| static Future listen_streamError() {
|
| var error = new Error();
|
| inputSink.addError(error);
|
| - return inputSink.flush().then(
|
| - (_) =>
|
| - errorStream.first.timeout(new Duration(seconds: 1))).then((var receivedError) {
|
| + return inputSink
|
| + .flush()
|
| + .then((_) => errorStream.first.timeout(new Duration(seconds: 1)))
|
| + .then((var receivedError) {
|
| expect(receivedError, same(error));
|
| });
|
| }
|
|
|
| static Future listen_wellFormedRequest() {
|
| inputSink.writeln('{"id":"0","method":"server.version"}');
|
| - return inputSink.flush().then(
|
| - (_) =>
|
| - requestStream.first.timeout(new Duration(seconds: 1))).then((Request request) {
|
| + return inputSink
|
| + .flush()
|
| + .then((_) => requestStream.first.timeout(new Duration(seconds: 1)))
|
| + .then((Request request) {
|
| expect(request.id, equals("0"));
|
| expect(request.method, equals("server.version"));
|
| });
|
| @@ -213,8 +215,8 @@ class ByteStreamServerChannelTest {
|
|
|
| static Future sendNotification() {
|
| channel.sendNotification(new Notification('foo'));
|
| - return outputLineStream.first.timeout(
|
| - new Duration(seconds: 1)).then((String notification) {
|
| + return outputLineStream.first.timeout(new Duration(seconds: 1)).then(
|
| + (String notification) {
|
| var jsonNotification = new JsonCodec().decode(notification);
|
| expect(jsonNotification, isMap);
|
| expect(jsonNotification, contains('event'));
|
| @@ -224,8 +226,8 @@ class ByteStreamServerChannelTest {
|
|
|
| static Future sendResponse() {
|
| channel.sendResponse(new Response('foo'));
|
| - return outputLineStream.first.timeout(
|
| - new Duration(seconds: 1)).then((String response) {
|
| + return outputLineStream.first.timeout(new Duration(seconds: 1)).then(
|
| + (String response) {
|
| var jsonResponse = new JsonCodec().decode(response);
|
| expect(jsonResponse, isMap);
|
| expect(jsonResponse, contains('id'));
|
| @@ -238,13 +240,12 @@ class ByteStreamServerChannelTest {
|
| inputSink = new IOSink(inputStream);
|
| StreamController<List<int>> outputStream =
|
| new StreamController<List<int>>();
|
| - outputLineStream = outputStream.stream.transform(
|
| - (new Utf8Codec()).decoder).transform(new LineSplitter());
|
| + outputLineStream = outputStream.stream
|
| + .transform((new Utf8Codec()).decoder)
|
| + .transform(new LineSplitter());
|
| IOSink outputSink = new IOSink(outputStream);
|
| channel = new ByteStreamServerChannel(
|
| - inputStream.stream,
|
| - outputSink,
|
| - InstrumentationService.NULL_SERVICE);
|
| + inputStream.stream, outputSink, InstrumentationService.NULL_SERVICE);
|
| StreamController<Request> requestStreamController =
|
| new StreamController<Request>();
|
| requestStream = requestStreamController.stream;
|
|
|