Big merge from experimental to bleeding edge.

runtime/tests/vm/dart/isolate_mirror_local_test.dart

 // Copyright (c) 2012, 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.
 //
 // Dart test program for checking implemention of MirrorSystem when
 // inspecting the current isolate.
 //
 // VMOptions=--enable_type_checks
 
 library isolate_mirror_local_test;
 
+import 'dart:async';
 import 'dart:isolate';
 import 'dart:mirrors';
 
 ReceivePort exit_port;
 Set expectedTests;
 
 void testDone(String test) {
   if (!expectedTests.contains(test)) {
     throw "Unexpected test name '$test'";
   }
@@ skipping 96 matching lines @@
   lib_mirror.invoke('function', [ 123 ]).then(
       (InstanceMirror retval) {
         Expect.equals(123, global_var);
         Expect.equals('int', retval.type.simpleName);
         Expect.isTrue(retval.hasReflectee);
         Expect.equals(124, retval.reflectee);
         testDone('testRootLibraryMirror');
       });
 
   // Check that the members map is complete.
-  List keys = lib_mirror.members.keys;
+  List keys = lib_mirror.members.keys.toList();
   sort(keys);
   Expect.equals('['
                 'FuncType, '
                 'GenericClass, '
                 'MyClass, '
                 'MyException, '
                 'MyInterface, '
                 'MySuperClass, '
                 '_stringCompare, '
                 'buildMethodString, '
@@ skipping 16 matching lines @@
                 'testIntegerInstanceMirror, '
                 'testLibrariesMap, '
                 'testMirrorErrors, '
                 'testMirrorSystem, '
                 'testNullInstanceMirror, '
                 'testRootLibraryMirror, '
                 'testStringInstanceMirror]',
                 '$keys');
 
   // Check that the classes map is complete.
-  keys = lib_mirror.classes.keys;
+  keys = lib_mirror.classes.keys.toList();
   sort(keys);
   Expect.equals('['
                 'FuncType, '
                 'GenericClass, '
                 'MyClass, '
                 'MyException, '
                 'MyInterface, '
                 'MySuperClass]',
                 '$keys');
 
   // Check that the functions map is complete.
-  keys = lib_mirror.functions.keys;
+  keys = lib_mirror.functions.keys.toList();
   sort(keys);
   Expect.equals('['
                 '_stringCompare, '
                 'buildMethodString, '
                 'buildVariableString, '
                 'function, '
                 'main, '
                 'methodWithError, '
                 'methodWithException, '
                 'myVar, '
                 'myVar=, '
                 'sort, '
                 'testBoolInstanceMirror, '
                 'testCustomInstanceMirror, '
                 'testDone, '
                 'testIntegerInstanceMirror, '
                 'testLibrariesMap, '
                 'testMirrorErrors, '
                 'testMirrorSystem, '
                 'testNullInstanceMirror, '
                 'testRootLibraryMirror, '
                 'testStringInstanceMirror]',
                 '$keys');
 
   // Check that the getters map is complete.
-  keys = lib_mirror.getters.keys;
+  keys = lib_mirror.getters.keys.toList();
   sort(keys);
   Expect.equals('[myVar]', '$keys');
 
   // Check that the setters map is complete.
-  keys = lib_mirror.setters.keys;
+  keys = lib_mirror.setters.keys.toList();
   sort(keys);
   Expect.equals('[myVar=]', '$keys');
 
   // Check that the variables map is complete.
-  keys = lib_mirror.variables.keys;
+  keys = lib_mirror.variables.keys.toList();
   sort(keys);
   Expect.equals('['
                 'exit_port, '
                 'expectedTests, '
                 'final_global_var, '
                 'global_var, '
                 'myFunc]',
                 '$keys');
 
   ClassMirror cls_mirror = lib_mirror.members['MyClass'];
@@ skipping 227 matching lines @@
 }
 
 void methodWithError() {
   // We get a parse error when we try to run this function.
   +++;
 }
 
 void testMirrorErrors(MirrorSystem mirrors) {
   LibraryMirror lib_mirror = mirrors.isolate.rootLibrary;
 
-  Future<InstanceMirror> future =
-      lib_mirror.invoke('methodWithException', []);
-  future.handleException(
-      (MirroredError exc) {
-        Expect.isTrue(exc is MirroredUncaughtExceptionError);
+  lib_mirror.invoke('methodWithException', [])
+    .then((InstanceMirror retval) {
+      // Should not reach here.
+      Expect.isTrue(false);
+    })
+    .catchError((exc) {
+        Expect.isTrue(exc.error is MirroredUncaughtExceptionError);
         Expect.equals('MyException',
-                      exc.exception_mirror.type.simpleName);
+                      exc.error.exception_mirror.type.simpleName);
         Expect.equals('MyException: from methodWithException',
-                      exc.exception_string);
-        Expect.isTrue(exc.stacktrace.toString().contains(
+                      exc.error.exception_string);
+        Expect.isTrue(exc.error.stacktrace.toString().contains(
             'isolate_mirror_local_test.dart'));
         testDone('testMirrorErrors1');
-        return true;
-      });
-  future.then(
-      (InstanceMirror retval) {
-        // Should not reach here.
-        Expect.isTrue(false);
       });
 
-  Future<InstanceMirror> future2 =
-      lib_mirror.invoke('methodWithError', []);
-  future2.handleException(
-      (MirroredError exc) {
-        Expect.isTrue(exc is MirroredCompilationError);
-        Expect.isTrue(exc.message.contains('unexpected token'));
-        testDone('testMirrorErrors2');
-        return true;
-      });
-  future2.then(
-      (InstanceMirror retval) {
-        // Should not reach here.
-        Expect.isTrue(false);
-      });
+  lib_mirror.invoke('methodWithError', [])
+    .then((InstanceMirror retval) {
+      // Should not reach here.
+      Expect.isTrue(false);
+    })
+    .catchError((exc) {
+      Expect.isTrue(exc.error is MirroredCompilationError);
+      Expect.isTrue(exc.error.message.contains('unexpected token'));
+      testDone('testMirrorErrors2');
+    });
 
   // TODO(turnidge): When we call a method that doesn't exist, we
   // should probably call noSuchMethod().  I'm adding this test to
   // document the current behavior in the meantime.
-  Future<InstanceMirror> future3 =
-      lib_mirror.invoke('methodNotFound', []);
-  future3.handleException(
-      (MirroredError exc) {
-        Expect.isTrue(exc is MirroredCompilationError);
-        Expect.isTrue(exc.message.contains(
-            "did not find top-level function 'methodNotFound'"));
-        testDone('testMirrorErrors3');
-        return true;
-      });
-  future3.then(
-      (InstanceMirror retval) {
-        // Should not reach here.
-        Expect.isTrue(false);
-      });
+  lib_mirror.invoke('methodNotFound', [])
+    .then((InstanceMirror retval) {
+      // Should not reach here.
+      Expect.isTrue(false);
+    })
+    .catchError((exc) {
+      Expect.isTrue(exc.error is MirroredCompilationError);
+      Expect.isTrue(exc.error.message.contains(
+          "did not find top-level function 'methodNotFound'"));
+      testDone('testMirrorErrors3');
+    });
 }
 
 void main() {
   // When all of the expected tests complete, the exit_port is closed,
   // allowing the program to terminate.
   exit_port = new ReceivePort();
   expectedTests = new Set<String>.from(['testRootLibraryMirror',
                                         'testLibrariesMap',
                                         'testMirrorSystem',
                                         'testIntegerInstanceMirror',
                                         'testStringInstanceMirror',
                                         'testBoolInstanceMirror',
                                         'testNullInstanceMirror',
                                         'testCustomInstanceMirror',
                                         'testMirrorErrors1',
                                         'testMirrorErrors2',
                                         'testMirrorErrors3']);
 
   // Test that an isolate can reflect on itself.
   mirrorSystemOf(exit_port.toSendPort()).then(testMirrorSystem);
 
   testIntegerInstanceMirror(reflect(1001));
   testStringInstanceMirror(reflect('This\nis\na\nString'));
   testBoolInstanceMirror(reflect(true));
   testNullInstanceMirror(reflect(null));
   testCustomInstanceMirror(reflect(new MyClass(17)));
   testMirrorErrors(currentMirrorSystem());
 }