Version 1.1.0-dev.5.2

dart/tests/standalone/vmservice/test_helper.dart

 // Copyright (c) 2013, 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.
 
 library vmservice_test_helper;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:expect/expect.dart';
@@ skipping 168 matching lines @@
 
   IsolateListTester(this.isolateList) {
     // The reply is an IsolateList.
     Expect.equals('IsolateList', isolateList['type'], 'Not an IsolateList.');
   }
 
   void checkIsolateCount(int n) {
     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) {
         exists = true;
       }
     });
     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;
         id = isolate['id'];
       }
     });
     Expect.isTrue(exists, 'No isolate with name: $name');
     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) {
         exists = true;
         Expect.isTrue(isolate['name'].startsWith(name),
                       'Isolate $id does not have name prefix: $name'
                       ' (was ${isolate['name']})');
       }
     });
     Expect.isTrue(exists, 'No isolate with id: $id');
@@ skipping 11 matching lines @@
     List members = classTable['members'];
     for (var i = 0; i < members.length; i++) {
       Map klass = members[i];
       if (klass['user_name'] == user_name) {
         return true;
       }
     }
     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];
       if (klass['user_name'] == user_name) {
         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']);
     field = reply;
     return new Future.value(this);
   }
 }
 
 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;
   }
   final Map<String, Map> fields = new Map<String, Map>();
 
   onRequestCompleted(Map reply) {
     Expect.equals('Class', reply['type']);
     List<Map> class_fields = reply['fields'];
     List<Future> requests = new List<Future>();
     fieldNames.forEach((fn) {
       class_fields.forEach((f) {
         if (f['user_name'] == fn) {
           var request = new FieldRequestHelper(port_, isolate_id_, f['id']);
           requests.add(request.makeRequest());
         }
       });
     });
     return Future.wait(requests).then((a) {
       a.forEach((FieldRequestHelper field) {
         fields[field.field['user_name']] = field.field;
       });
       return this;
     });
   }
 }