Introduce Instance.kind.

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 22 matching lines @@
   return await isolate.invokeRpcNoUpgrade('evaluate', params);
 }
 
 var tests = [
   // null object.
   (Isolate isolate) async {
     var params = {
       'objectId': 'objects/null',
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('null'));
+    expect(result['type'], equals('Instance'));
+    expect(result['kind'], equals('Null'));
     expect(result['id'], equals('objects/null'));
     expect(result['valueAsString'], equals('null'));
     expect(result['class']['type'], equals('@Class'));
     expect(result['class']['name'], equals('Null'));
     expect(result['size'], isPositive);
   },
 
   // bool object.
   (Isolate isolate) async {
     var params = {
       'objectId': 'objects/bool-true',
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('bool'));
+    expect(result['type'], equals('Instance'));
+    expect(result['kind'], equals('Bool'));
     expect(result['id'], equals('objects/bool-true'));
     expect(result['valueAsString'], equals('true'));
     expect(result['class']['type'], equals('@Class'));
     expect(result['class']['name'], equals('bool'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
   },
 
   // int object.
   (Isolate isolate) async {
     var params = {
       'objectId': 'objects/int-123',
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('int'));
+    expect(result['type'], equals('Instance'));
+    expect(result['kind'], equals('Int'));
     expect(result['_vmType'], equals('Smi'));
     expect(result['id'], equals('objects/int-123'));
     expect(result['valueAsString'], equals('123'));
     expect(result['class']['type'], equals('@Class'));
     expect(result['class']['name'], equals('_Smi'));
     expect(result['size'], isZero);
     expect(result['fields'], isEmpty);
   },
 
-  // A general Dart object.
+  // A built-in List.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '[3, 2, 1]');
     var params = {
       'objectId': evalResult['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('List'));
+    expect(result['type'], equals('Instance'));
+    expect(result['kind'], equals('List'));
     expect(result['_vmType'], equals('GrowableObjectArray'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
     expect(result['class']['name'], equals('_GrowableList'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['elements'].length, equals(3));
     expect(result['elements'][0]['index'], equals(0));
-    expect(result['elements'][0]['value']['type'], equals('@int'));
+    expect(result['elements'][0]['value']['type'], equals('@Instance'));
+    expect(result['elements'][0]['value']['kind'], equals('Int'));
     expect(result['elements'][0]['value']['valueAsString'], equals('3'));
   },
 
   // An expired object.
   (Isolate isolate) async {
     var params = {
       'objectId': 'objects/99999999',
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Sentinel'));
@@ skipping 137 matching lines @@
 
   // type.
   (Isolate isolate) async {
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/types/0";
     var params = {
       'objectId': id,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Type'));
+    expect(result['type'], equals('Instance'));
+    expect(result['kind'], equals('Type'));
     expect(result['id'], equals(id));
     expect(result['class']['type'], equals('@Class'));
     expect(result['class']['name'], equals('_Type'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['typeClass']['type'], equals('@Class'));
     expect(result['typeClass']['name'], equals('_DummyClass'));
   },
 
   // invalid type.
@@ skipping 147 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);