Cleanup of mjsunit.js code and make assertEquals more strict.

test/mjsunit/mirror-object.js

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 20 matching lines @@
 function MirrorRefCache(json_refs) {
   var tmp = eval('(' + json_refs + ')');
   this.refs_ = [];
   for (var i = 0; i < tmp.length; i++) {
     this.refs_[tmp[i].handle] = tmp[i];
   }
 }
 
 MirrorRefCache.prototype.lookup = function(handle) {
   return this.refs_[handle];
-}
+};
 
 function testObjectMirror(obj, cls_name, ctor_name, hasSpecialProperties) {
   // Create mirror and JSON representation.
   var mirror = debug.MakeMirror(obj);
   var serializer = debug.MakeMirrorSerializer();
   var json = JSON.stringify(serializer.serializeValue(mirror));
   var refs = new MirrorRefCache(
       JSON.stringify(serializer.serializeReferencedObjects()));
 
   // Check the mirror hierachy.
   assertTrue(mirror instanceof debug.Mirror, 'Unexpected mirror hierachy');
   assertTrue(mirror instanceof debug.ValueMirror, 'Unexpected mirror hierachy');
   assertTrue(mirror instanceof debug.ObjectMirror, 'Unexpected mirror hierachy');
 
   // Check the mirror properties.
   assertTrue(mirror.isObject(), 'Unexpected mirror');
   assertEquals('object', mirror.type(), 'Unexpected mirror type');
   assertFalse(mirror.isPrimitive(), 'Unexpected primitive mirror');
   assertEquals(cls_name, mirror.className(), 'Unexpected mirror class name');
   assertTrue(mirror.constructorFunction() instanceof debug.ObjectMirror, 'Unexpected mirror hierachy');
   assertEquals(ctor_name, mirror.constructorFunction().name(), 'Unexpected constructor function name');
   assertTrue(mirror.protoObject() instanceof debug.Mirror, 'Unexpected mirror hierachy');
   assertTrue(mirror.prototypeObject() instanceof debug.Mirror, 'Unexpected mirror hierachy');
   assertFalse(mirror.hasNamedInterceptor(), 'No named interceptor expected');
   assertFalse(mirror.hasIndexedInterceptor(), 'No indexed interceptor expected');
 
   var names = mirror.propertyNames();
-  var properties = mirror.properties()
+  var properties = mirror.properties();
   assertEquals(names.length, properties.length);
   for (var i = 0; i < properties.length; i++) {
     assertTrue(properties[i] instanceof debug.Mirror, 'Unexpected mirror hierachy');
     assertTrue(properties[i] instanceof debug.PropertyMirror, 'Unexpected mirror hierachy');
     assertEquals('property', properties[i].type(), 'Unexpected mirror type');
     assertEquals(names[i], properties[i].name(), 'Unexpected property name');
   }
 
   for (var p in obj) {
     var property_mirror = mirror.property(p);
@@ skipping 43 matching lines @@
           assertTrue(typeof(fromJSON.properties[i].propertyType) === 'undefined', 'Unexpected serialized property type');
         }
 
         // If there are no attributes attributes are not serialized.
         if (properties[i].attributes() != debug.PropertyAttribute.None) {
           assertEquals(properties[i].attributes(), fromJSON.properties[i].attributes, 'Unexpected serialized attributes');
         } else {
           assertTrue(typeof(fromJSON.properties[i].attributes) === 'undefined', 'Unexpected serialized attributes');
         }
 
-        // Lookup the serialized object from the handle reference.        
+        // Lookup the serialized object from the handle reference.
         var o = refs.lookup(fromJSON.properties[i].ref);
         assertTrue(o != void 0, 'Referenced object is not serialized');
 
         assertEquals(properties[i].value().type(), o.type, 'Unexpected serialized property type for ' + name);
         if (properties[i].value().isPrimitive()) {
-          // Special check for NaN as NaN == NaN is false.
-          if (properties[i].value().isNumber() && isNaN(properties[i].value().value())) {
-            assertEquals('NaN', o.value, 'Unexpected serialized property value for ' + name);
-          } else {
+          if (!properties[i].value().type() == "null" &&
+              !properties[i].value().type() == "undefined") {
+            // Null and undefined has no value property.
             assertEquals(properties[i].value().value(), o.value, 'Unexpected serialized property value for ' + name);
           }

[Søren Thygesen Gjesse, 2011/04/15 10:20:51]

Should we test that there actually is no value property?

[Lasse Reichstein, 2011/04/15 11:33:54]

let's.
Also, it seems I need to handle that NaN and Infinity are strings.

         } else if (properties[i].value().isFunction()) {
           assertEquals(properties[i].value().source(), o.source, 'Unexpected serialized property value for ' + name);
         }
         found = true;
       }
     }
     assertTrue(found, '"' + name + '" not found (' + json + ')');
   }
 }
 
 
 function Point(x,y) {
   this.x_ = x;
   this.y_ = y;
-}
+}1

[Søren Thygesen Gjesse, 2011/04/15 10:20:51]

1 -> ;

[Lasse Reichstein, 2011/04/15 11:33:54]

Removed the spurious "1".

 
 // Test a number of different objects.
 testObjectMirror({}, 'Object', 'Object');
 testObjectMirror({'a':1,'b':2}, 'Object', 'Object');
 testObjectMirror({'1':void 0,'2':null,'f':function pow(x,y){return Math.pow(x,y);}}, 'Object', 'Object');
 testObjectMirror(new Point(-1.2,2.003), 'Object', 'Point');
 testObjectMirror(this, 'global', '', true);  // Global object has special properties
 testObjectMirror(this.__proto__, 'Object', '');
 testObjectMirror([], 'Array', 'Array');
 testObjectMirror([1,2], 'Array', 'Array');
@@ skipping 48 matching lines @@
 
 // Test objects with native accessors.
 mirror = debug.MakeMirror(new String('abc'));
 assertTrue(mirror instanceof debug.ObjectMirror);
 assertFalse(mirror.property('length').hasGetter());
 assertFalse(mirror.property('length').hasSetter());
 assertTrue(mirror.property('length').isNative());
 assertEquals('a', mirror.property(0).value().value());
 assertEquals('b', mirror.property(1).value().value());
 assertEquals('c', mirror.property(2).value().value());