Rework error handling in the service protocol and in Observatory.

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 124 matching lines @@
     expect(result['functions'][0]['type'], equals('@Function'));
     expect(result['classes'].length, isPositive);
     expect(result['classes'][0]['type'], equals('@Class'));
   },
 
   // invalid library.
   (Isolate isolate) async {
     var params = {
       'objectId': 'libraries/9999999',
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      caughtException = true;
+      expect(e.code, equals(ServerRpcException.kInvalidParams));
+      expect(e.message,
+             "getObject: invalid 'objectId' parameter: libraries/9999999");
+    }
+    expect(caughtException, isTrue);
   },
 
   // script.
   (Isolate isolate) async {
     // Get the library first.
     var params = {
       'objectId': isolate.rootLib.id,
     };
     var libResult = await isolate.invokeRpcNoUpgrade('getObject', params);
     // Get the first script.
@@ skipping 12 matching lines @@
     expect(result['tokenPosTable'][0], new isInstanceOf<List>());
     expect(result['tokenPosTable'][0].length, isPositive);
     expect(result['tokenPosTable'][0][0], new isInstanceOf<int>());
   },
 
   // invalid script.
   (Isolate isolate) async {
     var params = {
       'objectId': 'scripts/9999999',
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      caughtException = true;
+      expect(e.code, equals(ServerRpcException.kInvalidParams));
+      expect(e.message,
+             "getObject: invalid 'objectId' parameter: scripts/9999999");
+    }
+    expect(caughtException, isTrue);
   },
 
   // class
   (Isolate isolate) async {
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var params = {
       'objectId': evalResult['class']['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
@@ skipping 16 matching lines @@
     expect(result['functions'][0]['type'], equals('@Function'));
     expect(result['subclasses'].length, isPositive);
     expect(result['subclasses'][0]['type'], equals('@Class'));
   },
 
   // invalid class.
   (Isolate isolate) async {
     var params = {
       'objectId': 'classes/9999999',
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      caughtException = true;
+      expect(e.code, equals(ServerRpcException.kInvalidParams));
+      expect(e.message,
+             "getObject: invalid 'objectId' parameter: classes/9999999");
+    }
+    expect(caughtException, isTrue);
   },
 
   // 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['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.
   (Isolate isolate) async {
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/types/9999999";
     var params = {
       'objectId': id,
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      caughtException = true;
+      expect(e.code, equals(ServerRpcException.kInvalidParams));
+      expect(e.message,
+             startsWith("getObject: invalid 'objectId' parameter: "));
+    }
+    expect(caughtException, isTrue);
   },
 
   // function.
   (Isolate isolate) async {
     // 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,
     };
@@ skipping 15 matching lines @@
   },
 
   // invalid function.
   (Isolate isolate) async {
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/functions/invalid";
     var params = {
       'objectId': id,
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      caughtException = true;
+      expect(e.code, equals(ServerRpcException.kInvalidParams));
+      expect(e.message,
+             startsWith("getObject: invalid 'objectId' parameter: "));
+    }
+    expect(caughtException, isTrue);
   },
 
   // field
   (Isolate isolate) async {
     // 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,
     };
@@ skipping 13 matching lines @@
   },
 
   // 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";
     var params = {
       'objectId': id,
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      caughtException = true;
+      expect(e.code, equals(ServerRpcException.kInvalidParams));
+      expect(e.message,
+             startsWith("getObject: invalid 'objectId' parameter: "));
+    }
+    expect(caughtException, isTrue);
   },
 
   // code.
   (Isolate isolate) async {
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var funcId = "${evalResult['class']['id']}/functions/dummyFunction";
     var params = {
       'objectId': funcId,
     };
@@ skipping 12 matching lines @@
     expect(result['_endAddress'], new isInstanceOf<String>());
     expect(result['_objectPool'], isNotNull);
     expect(result['_disassembly'], isNotNull);
     expect(result['_descriptors'], isNotNull);
     expect(result['_inlinedFunctions'], anyOf([isNull, new isInstanceOf<List>()]));
     expect(result['_inlinedIntervals'], anyOf([isNull, new isInstanceOf<List>()]));
   },
 
   // invalid code.
   (Isolate isolate) async {
-    // Call eval to get a class id.
     var params = {
       'objectId': 'code/0',
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
-    expect(result['type'], equals('Error'));
-    expect(result['message'], startsWith('Unrecognized object id'));
+    bool caughtException;
+    try {
+      await isolate.invokeRpcNoUpgrade('getObject', params);
+      expect(false, isTrue, reason:'Unreachable');
+    } on ServerRpcException catch(e) {
+      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);