Finish modifying analysis server to make use of code generation.

pkg/analysis_server/test/protocol_test.dart

 // Copyright (c) 2014, 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.
 
 library test.protocol;
 
 import 'dart:convert';
 
 import 'package:analysis_server/src/protocol.dart';
-import 'package:analysis_server/src/services/json.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:unittest/unittest.dart';
 
 
 Matcher _throwsRequestFailure = throwsA(new isInstanceOf<RequestFailure>());
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(NotificationTest);
@@ skipping 31 matching lines @@
   }
 }
 
 
 @ReflectiveTestCase()
 class NotificationTest {
   void test_fromJson() {
     Notification original = new Notification('foo');
     Notification notification = new Notification.fromJson(original.toJson());
     expect(notification.event, equals('foo'));
-    expect(notification.params, isNull);
+    expect(notification.toJson().keys, isNot(contains('params')));
   }
 
   void test_fromJson_withParams() {
-    Notification original = new Notification('foo');
-    original.setParameter('x', 'y');
+    Notification original = new Notification('foo', {'x': 'y'});
     Notification notification = new Notification.fromJson(original.toJson());
     expect(notification.event, equals('foo'));
-    expect(notification.params, equals({'x': 'y'}));
+    expect(notification.toJson()['params'], equals({'x': 'y'}));
   }
 
   void test_toJson_withParams() {
-    Notification notification = new Notification('foo');
-    notification.setParameter('x', 'y');
+    Notification notification = new Notification('foo', {'x': 'y'});
     expect(notification.event, equals('foo'));
-    expect(notification.params, equals({'x': 'y'}));
+    expect(notification.toJson()['params'], equals({'x': 'y'}));
     expect(notification.toJson(), equals({
       'event': 'foo',
       'params': {
         'x': 'y'
       }
     }));
   }
 
   void test_toJson_noParams() {
     Notification notification = new Notification('foo');
     expect(notification.event, equals('foo'));
-    expect(notification.params, isNull);
+    expect(notification.toJson().keys, isNot(contains('params')));
     expect(notification.toJson(), equals({
       'event': 'foo'
     }));
   }
-
-  void test_setParameter_HasToJson() {
-    Notification notification = new Notification('foo');
-    notification.setParameter('my', new _MyHasToJsonObject(42));
-    expect(notification.toJson(), equals({
-      'event': 'foo',
-      'params': {
-        'my': {
-          'offset': 42
-        }
-      }
-    }));
-  }
-
-  void test_setParameter_Iterable_HasToJson() {
-    Notification notification = new Notification('foo');
-    notification.setParameter('my', [
-      new _MyHasToJsonObject(1),
-      new _MyHasToJsonObject(2),
-      new _MyHasToJsonObject(3)]);
-    expect(notification.toJson(), equals({
-      'event': 'foo',
-      'params': {
-        'my': [{'offset': 1}, {'offset': 2}, {'offset': 3}]
-      }
-    }));
-  }
 }
 
 
-class _MyHasToJsonObject implements HasToJson {
-  int offset;
-  _MyHasToJsonObject(this.offset);
-  Map<String, Object> toJson() => {'offset': offset};
-}
-
-
 @ReflectiveTestCase()
 class RequestErrorTest {
   void test_create() {
     RequestError error = new RequestError('ERROR_CODE', 'msg');
     expect(error.code, 'ERROR_CODE');
     expect(error.message, "msg");
     expect(error.toJson(), equals({
       RequestError.CODE: 'ERROR_CODE',
       RequestError.MESSAGE: "msg"
     }));
@@ skipping 95 matching lines @@
     Request request = new Request.fromString(json);
     expect(request, isNull);
   }
 
   void test_fromJson_withParams() {
     Request original = new Request('one', 'aMethod', {'foo': 'bar'});
     String json = JSON.encode(original.toJson());
     Request request = new Request.fromString(json);
     expect(request.id, equals('one'));
     expect(request.method, equals('aMethod'));
-    expect(request.params, equals({'foo': 'bar'}));
+    expect(request.toJson()['params'], equals({'foo': 'bar'}));
   }
 
   void test_toJson() {
     Request request = new Request('one', 'aMethod');
     expect(request.toJson(), equals({
       Request.ID: 'one',
       Request.METHOD: 'aMethod'
     }));
   }
 
@@ skipping 106 matching lines @@
     expect(response.error, isNotNull);
     RequestError error = response.error;
     expect(error.code, equals('INVALID_REQUEST'));
     expect(error.message, equals('Invalid request'));
   }
 
   void test_fromJson_withResult() {
     Response original = new Response('myId', result: {'foo': 'bar'});
     Response response = new Response.fromJson(original.toJson());
     expect(response.id, equals('myId'));
-    Map<String, Object> result = response.result;
+    Map<String, Object> result = response.toJson()['result'];
     expect(result.length, equals(1));
     expect(result['foo'], equals('bar'));
   }
 }