Version 1.1.0-dev.5.2

dart/tests/standalone/vmservice/test_helper.dart

Index: dart/tests/standalone/vmservice/test_helper.dart
===================================================================
--- dart/tests/standalone/vmservice/test_helper.dart	(revision 31530)
+++ dart/tests/standalone/vmservice/test_helper.dart	(working copy)
@@ -186,7 +186,7 @@
     Expect.equals(n, isolateList['members'].length, 'Isolate count not $n');
   }
 
-  void checkIsolateIdExists(int id) {
+  void checkIsolateIdExists(String id) {
     var exists = false;
     isolateList['members'].forEach((isolate) {
       if (isolate['id'] == id) {
@@ -196,9 +196,9 @@
     Expect.isTrue(exists, 'No isolate with id: $id');
   }
 
-  int checkIsolateNameContains(String name) {
+  String checkIsolateNameContains(String name) {
     var exists = false;
-    int id;
+    String id;
     isolateList['members'].forEach((isolate) {
       if (isolate['name'].contains(name)) {
         exists = true;
@@ -209,7 +209,7 @@
     return id;
   }
 
-  void checkIsolateNamePrefix(int id, String name) {
+  void checkIsolateNamePrefix(String id, String name) {
     var exists = false;
     isolateList['members'].forEach((isolate) {
       if (isolate['id'] == id) {
@@ -241,7 +241,7 @@
     return false;
   }
 
-  int classId(String user_name) {
+  String classId(String user_name) {
     List members = classTable['members'];
     for (var i = 0; i < members.length; i++) {
       Map klass = members[i];
@@ -249,13 +249,13 @@
         return klass['id'];
       }
     }
-    return -1;
+    return null;
   }
 }
 
 class FieldRequestHelper extends VmServiceRequestHelper {
   FieldRequestHelper(port, isolate_id, field_id) :
-      super('http://127.0.0.1:$port/isolates/$isolate_id/objects/$field_id');
+      super('http://127.0.0.1:$port/$isolate_id/$field_id');
   Map field;
   onRequestCompleted(Map reply) {
     Expect.equals('Field', reply['type']);
@@ -267,9 +267,9 @@
 class ClassFieldRequestHelper extends VmServiceRequestHelper {
   final List<String> fieldNames;
   int port_;
-  int isolate_id_;
+  String isolate_id_;
   ClassFieldRequestHelper(port, isolate_id, class_id, this.fieldNames) :
-      super('http://127.0.0.1:$port/isolates/$isolate_id/classes/$class_id') {
+      super('http://127.0.0.1:$port/$isolate_id/$class_id') {
     port_ = port;
     isolate_id_ = isolate_id;
   }