Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1215)

Unified Diff: runtime/observatory/tests/service/get_object_rpc_test.dart

Issue 1120133002: Rework error handling in the service protocol and in Observatory. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: fix tests Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/observatory/tests/service/get_object_rpc_test.dart
diff --git a/runtime/observatory/tests/service/get_object_rpc_test.dart b/runtime/observatory/tests/service/get_object_rpc_test.dart
index d581f4c3118d3ac9e5fc9dcf055ce41a06258169..2c2ea0dccde428d35e600a4c34c90ab40f041733 100644
--- a/runtime/observatory/tests/service/get_object_rpc_test.dart
+++ b/runtime/observatory/tests/service/get_object_rpc_test.dart
@@ -108,7 +108,7 @@ var tests = [
};
var result = await isolate.invokeRpcNoUpgrade('getObject', params);
expect(result['type'], equals('Sentinel'));
- expect(result['id'], startsWith('objects/expired'));
+ expect(result['kind'], startsWith('Expired'));
expect(result['valueAsString'], equals('<expired>'));
expect(result['class'], isNull);
expect(result['size'], isNull);
@@ -142,9 +142,17 @@ var tests = [
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.
@@ -177,9 +185,17 @@ var tests = [
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
@@ -216,9 +232,17 @@ var tests = [
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.
@@ -247,9 +271,17 @@ var tests = [
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.
@@ -285,9 +317,17 @@ var tests = [
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
@@ -321,9 +361,17 @@ var tests = [
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.
@@ -356,13 +404,20 @@ var tests = [
// 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);
},
];

Powered by Google App Engine
This is Rietveld 408576698