Maintain referential integrity of proxy instances in dart:js

tests/html/js_test.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 jsTest;
 
 import 'dart:async';
 import 'dart:html';
 import 'dart:js';
 
@@ skipping 85 matching lines @@
   }
   return result;
 }
 
 function getNewDivElement() {
   return document.createElement("div");
 }
 
 function testJsMap(callback) {
   var result = callback();
+  console.log('result = ' + result);

[alexandre.ardhuin, 2013/10/11 13:52:53]

To remove ?

[justinfagnani, 2013/10/11 18:47:09]

Done.

   return result['value'];
 }
 
 function Bar() {
   return "ret_value";
 }
 Bar.foo = "property_value";
 
 function Baz(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11) {
   this.f1 = p1;
   this.f2 = p2;
   this.f3 = p3;
   this.f4 = p4;
   this.f5 = p5;
   this.f6 = p6;
   this.f7 = p7;
   this.f8 = p8;
   this.f9 = p9;
   this.f10 = p10;
   this.f11 = p11;
 }
+
+function identical(o1, o2) {
+  return o1 === o2;
+}
 """;
   document.body.append(script);
 }
 
 class Foo implements Serializable<JsObject> {
   final JsObject _proxy;
 
   Foo(num a) : this._proxy = new JsObject(context['Foo'], [a]);
 
   JsObject toJs() => _proxy;
 
   num get a => _proxy['a'];
   num bar() => _proxy.callMethod('bar');
 }
 
 class Color implements Serializable<String> {
   static final RED = new Color._("red");
   static final BLUE = new Color._("blue");
   String _value;
   Color._(this._value);
   String toJs() => this._value;
 }
 
+class TestDartObject {}
+
 main() {
   _injectJs();
   useHtmlConfiguration();
 
-  test('context instances should be identical', () {
-    var c1 = context;
-    var c2 = context;
-    expect(identical(c1, c2), isTrue);
+  group('identity', () {
+
+    test('context instances should be identical', () {
+      var c1 = context;
+      var c2 = context;
+      expect(identical(c1, c2), isTrue);
+    });
+
+    test('identical JS objects should have identical proxies', () {
+      var o1 = context['location'];
+      var o2 = context['location'];
+      expect(identical(o1, o2), isTrue);
+    });
+
+    test('identical JS functions should have identical proxies', () {
+      var f1 = context['Object'];
+      var f2 = context['Object'];
+      expect(identical(f1, f2), isTrue);
+    });
+
+    test('identical Dart objects should have identical proxies', () {
+      var o1 = new TestDartObject();
+      expect(context.callMethod('identical', [o1, o1]), isTrue);
+    });
+
+    test('identical Dart functions should have identical proxies', () {
+      var f1 = () => print("I'm a Function!");
+      expect(context.callMethod('identical', [f1, f1]), isTrue);
+    });
+
+    // TODO(justinfagnani): old tests duplicate checks above, remove
+    // on test next cleanup pass
+    test('test proxy equality', () {
+      var foo1 = new JsObject(context['Foo'], [1]);
+      var foo2 = new JsObject(context['Foo'], [2]);
+      context['foo1'] = foo1;
+      context['foo2'] = foo2;
+      expect(foo1, isNot(equals(context['foo2'])));
+      expect(foo2, same(context['foo2']));
+      context.deleteProperty('foo1');
+      context.deleteProperty('foo2');
+    });
+
+    test('retrieve same dart Object', () {
+      final date = new DateTime.now();
+      context['dartDate'] = date;
+      expect(context['dartDate'], same(date));
+      context.deleteProperty('dartDate');
+    });
+
   });
 
   test('read global field', () {
     expect(context['x'], equals(42));
     expect(context['y'], isNull);
   });
 
   test('read global field with underscore', () {
     expect(context['_x'], equals(123));
     expect(context['y'], isNull);
@@ skipping 236 matching lines @@
         p8, p9, p10, p11) => '$p1$p2$p3$p4$p5$p6$p7$p8$p9$p10$p11');
     expect(context.callMethod('invokeCallbackWith11params'),
         equals('1234567891011'));
   });
 
   test('return a JS proxy to JavaScript', () {
     var result = context.callMethod('testJsMap', [() => jsify({'value': 42})]);
     expect(result, 42);
   });
 
-  test('test proxy equality', () {
-    var foo1 = new JsObject(context['Foo'], [1]);
-    var foo2 = new JsObject(context['Foo'], [2]);
-    context['foo'] = foo1;
-    context['foo'] = foo2;
-    expect(foo1, isNot(equals(context['foo'])));
-    expect(foo2, equals(context['foo']));
-  });
-
   test('test instanceof', () {
     var foo = new JsObject(context['Foo'], [1]);
     expect(foo.instanceof(context['Foo']), isTrue);
     expect(foo.instanceof(context['Object']), isTrue);
     expect(foo.instanceof(context['String']), isFalse);
   });
 
   test('test deleteProperty', () {
     var object = jsify({});
     object['a'] = 1;
@@ skipping 21 matching lines @@
     final foo = new JsObject(context['Foo'], [1]);
     foo["getAge"] = () => 10;
     expect(foo.callMethod('getAge'), equals(10));
   });
 
   test('access a property of a function', () {
     expect(context.callMethod('Bar'), "ret_value");
     expect(context['Bar']['foo'], "property_value");
   });
 
-  test('retrieve same dart Object', () {
-    final date = new DateTime.now();
-    context['dartDate'] = date;
-    expect(context['dartDate'], equals(date));
-  });
-
   test('usage of Serializable', () {
     final red = Color.RED;
     context['color'] = red;
     expect(context['color'], equals(red._value));
   });
 }