Replaced simpleValue with more general reflectee. hasSimpleValue is retained internally for the sak…

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 IsolateMirror when
 // inspecting the current isolate.
 
 #library('isolate_mirror_local_test');
 
 #import('dart:isolate');
@@ skipping 83 matching lines @@
   Expect.isTrue(lib_mirror.url.contains('isolate_mirror_local_test.dart'));
   Expect.equals("LibraryMirror on 'isolate_mirror_local_test'",
                 lib_mirror.toString());
 
   // Test library invocation by calling function(123).
   Expect.equals(0, global_var);
   lib_mirror.invoke('function', [ 123 ]).then(
       (InstanceMirror retval) {
         Expect.equals(123, global_var);
         Expect.equals('Smi', retval.getClass().simpleName);
-        Expect.isTrue(retval.hasSimpleValue);
-        Expect.equals(124, retval.simpleValue);
+        Expect.isTrue(retval.hasReflectee);
+        Expect.equals(124, retval.reflectee);
         testDone('testRootLibraryMirror');
       });
 
   // Check that the members map is complete.
   List keys = lib_mirror.members().getKeys();
   sort(keys);
   Expect.equals('['
                 'MyClass, '
                 'MyException, '
                 'MyInterface, '
@@ skipping 145 matching lines @@
   Expect.isTrue(mirror.debugName.contains('main'));
   testRootLibraryMirror(mirror.rootLibrary);
   testLibrariesMap(mirror.libraries());
   testDone('testIsolateMirror');
 }
 
 void testIntegerInstanceMirror(InstanceMirror mirror) {
   // TODO(turnidge): The mirrors api exposes internal vm
   // implementation class names.  Is this okay?
   Expect.equals('Smi', mirror.getClass().simpleName);
-  Expect.isTrue(mirror.hasSimpleValue);
-  Expect.equals(1001, mirror.simpleValue);
+  Expect.isTrue(mirror.hasReflectee);
+  Expect.equals(1001, mirror.reflectee);
   Expect.equals("InstanceMirror on <1001>", mirror.toString());
 
   // Invoke (mirror + mirror).
   mirror.invoke('+', [ mirror ]).then(
       (InstanceMirror retval) {
         Expect.equals('Smi', retval.getClass().simpleName);
-        Expect.isTrue(retval.hasSimpleValue);
-        Expect.equals(2002, retval.simpleValue);
+        Expect.isTrue(retval.hasReflectee);
+        Expect.equals(2002, retval.reflectee);
         testDone('testIntegerInstanceMirror');
       });
 }
 
 void testStringInstanceMirror(InstanceMirror mirror) {
   // TODO(turnidge): The mirrors api exposes internal vm
   // implementation class names.  Is this okay?
   Expect.equals('OneByteString', mirror.getClass().simpleName);
-  Expect.isTrue(mirror.hasSimpleValue);
-  Expect.equals('This\nis\na\nString', mirror.simpleValue);
+  Expect.isTrue(mirror.hasReflectee);
+  Expect.equals('This\nis\na\nString', mirror.reflectee);
   Expect.equals("InstanceMirror on <'This\\nis\\na\\nString'>",
                 mirror.toString());
 
   // Invoke mirror[0].
   mirror.invoke('[]', [ 0 ]).then(
       (InstanceMirror retval) {
         Expect.equals('OneByteString', retval.getClass().simpleName);
-        Expect.isTrue(retval.hasSimpleValue);
-        Expect.equals('T', retval.simpleValue);
+        Expect.isTrue(retval.hasReflectee);
+        Expect.equals('T', retval.reflectee);
         testDone('testStringInstanceMirror');
       });
 }
 
 void testBoolInstanceMirror(InstanceMirror mirror) {
   Expect.equals('Bool', mirror.getClass().simpleName);
-  Expect.isTrue(mirror.hasSimpleValue);
-  Expect.equals(true, mirror.simpleValue);
+  Expect.isTrue(mirror.hasReflectee);
+  Expect.equals(true, mirror.reflectee);
   Expect.equals("InstanceMirror on <true>", mirror.toString());
   testDone('testBoolInstanceMirror');
 }
 
 void testNullInstanceMirror(InstanceMirror mirror) {
   // TODO(turnidge): This is returning the wrong class.  Fix it.
   Expect.equals('Object', mirror.getClass().simpleName);
-  Expect.isTrue(mirror.hasSimpleValue);
-  Expect.equals(null, mirror.simpleValue);
+  Expect.isTrue(mirror.hasReflectee);
+  Expect.equals(null, mirror.reflectee);
   Expect.equals("InstanceMirror on <null>", mirror.toString());
   testDone('testNullInstanceMirror');
 }
 
 class MySuperClass {
 }
 
 class MyInterface {
 }
 
 class MyClass extends MySuperClass implements MyInterface {
   MyClass(this.value) {}
 
   final value;
 
   int method(int arg) {
     return arg + value;
   }
 }
 
 void testCustomInstanceMirror(InstanceMirror mirror) {
-  Expect.isFalse(mirror.hasSimpleValue);
+  Expect.isTrue(mirror.hasReflectee);
   bool saw_exception = false;
   try {
-    // mirror.simpleValue;
+    mirror.reflectee;
   } catch (MirrorException me) {
     saw_exception = true;
   }
-  //Expect.isTrue(saw_exception);
+  Expect.isFalse(saw_exception);
   Expect.equals("InstanceMirror on instance of 'MyClass'", mirror.toString());
 
   InterfaceMirror cls = mirror.getClass();
   Expect.isTrue(cls is InterfaceMirror);
   Expect.equals('MyClass', cls.simpleName);
   Expect.equals('MySuperClass', cls.superclass().simpleName);
   Expect.isTrue(cls.defaultFactory() === null);
   Expect.equals('isolate_mirror_local_test', cls.library.simpleName);
   Expect.isTrue(cls.isClass);
   Expect.equals('MyInterface', cls.superinterfaces()[0].simpleName);
   Expect.equals("InterfaceMirror on 'MyClass'",
                 cls.toString());
 
   // Invoke mirror.method(1000).
   mirror.invoke('method', [ 1000 ]).then(
       (InstanceMirror retval) {
         Expect.equals('Smi', retval.getClass().simpleName);
-        Expect.isTrue(retval.hasSimpleValue);
-        Expect.equals(1017, retval.simpleValue);
+        Expect.isTrue(retval.hasReflectee);
+        Expect.equals(1017, retval.reflectee);
         testDone('testCustomInstanceMirror');
       });
 
 }
 
 class MyException implements Exception {
   MyException(this._message);
   final String _message;
   String toString() { return 'MyException: $_message'; }
 }
@@ skipping 84 matching lines @@
   // Test that an isolate can reflect on itself.
   isolateMirrorOf(exit_port.toSendPort()).then(testIsolateMirror);
 
   testIntegerInstanceMirror(mirrorOf(1001));
   testStringInstanceMirror(mirrorOf('This\nis\na\nString'));
   testBoolInstanceMirror(mirrorOf(true));
   testNullInstanceMirror(mirrorOf(null));
   testCustomInstanceMirror(mirrorOf(new MyClass(17)));
   testMirrorErrors(currentIsolateMirror());
 }