Sundry service protocol cleanups before version 1.0.

runtime/observatory/tests/service/get_object_rpc_test.dart

 // Copyright (c) 2015, 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=--compile-all --error_on_bad_type --error_on_bad_override
 
 library get_object_rpc_test;
 
 import 'package:observatory/service_io.dart';
 import 'package:unittest/unittest.dart';
 
@@ skipping 194 matching lines @@
     var params = {
       'objectId': evalResult['class']['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Class'));
     expect(result['id'], startsWith('classes/'));
     expect(result['name'], equals('_DummyClass'));
     expect(result['_vmName'], startsWith('_DummyClass@'));
     expect(result['abstract'], equals(false));
     expect(result['const'], equals(false));
-    expect(result['finalized'], equals(true));
-    expect(result['implemented'], equals(false));
-    expect(result['patch'], equals(false));
+    expect(result['_finalized'], equals(true));
+    expect(result['_implemented'], equals(false));
+    expect(result['_patch'], equals(false));
     expect(result['library']['type'], equals('@Library'));
     expect(result['script']['type'], equals('@Script'));
     expect(result['super']['type'], equals('@Class'));
     expect(result['interfaces'].length, isZero);
     expect(result['fields'].length, isPositive);
     expect(result['fields'][0]['type'], equals('@Field'));
     expect(result['functions'].length, isPositive);
     expect(result['functions'][0]['type'], equals('@Function'));
     expect(result['subclasses'].length, isPositive);
     expect(result['subclasses'][0]['type'], equals('@Class'));
@@ skipping 61 matching lines @@
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/functions/dummyFunction";
     var params = {
       'objectId': id,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Function'));
     expect(result['id'], equals(id));
     expect(result['name'], equals('dummyFunction'));
-    expect(result['kind'], equals('RegularFunction'));
+    expect(result['_kind'], equals('RegularFunction'));
     expect(result['static'], equals(false));
     expect(result['const'], equals(false));
     expect(result['script']['type'], equals('@Script'));
     expect(result['tokenPos'], isPositive);
     expect(result['code']['type'], equals('@Code'));
     expect(result['_optimizable'], equals(true));
     expect(result['_inlinable'], equals(true));
     expect(result['_usageCounter'], isPositive);
     expect(result['_optimizedCallSiteCount'], isZero);
     expect(result['_deoptimizations'], isZero);
@@ skipping 25 matching lines @@
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/fields/0";
     var params = {
       'objectId': id,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Field'));
     expect(result['id'], equals(id));
     expect(result['name'], equals('dummyVar'));
-    expect(result['value']['valueAsString'], equals('11'));
     expect(result['const'], equals(false));
     expect(result['static'], equals(true));
     expect(result['final'], equals(false));
     expect(result['script']['type'], equals('@Script'));
     expect(result['tokenPos'], isPositive);
+    expect(result['staticValue']['valueAsString'], equals('11'));
     expect(result['_guardNullable'], isNotNull);
     expect(result['_guardClass'], isNotNull);
     expect(result['_guardLength'], isNotNull);
   },
 
   // invalid field.
   (Isolate isolate) async {
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/fields/9999";
@@ skipping 54 matching lines @@
       caughtException = true;
       expect(e.code, equals(ServerRpcException.kInvalidParams));
       expect(e.message,
              "getObject: invalid 'objectId' parameter: code/0");
     }
     expect(caughtException, isTrue);
   },
 ];
 
 main(args) async => runIsolateTests(args, tests, testeeBefore:warmup);