Factored the generation of JSON serialization from beeing part of the mirror...

Factored the generation of JSON serialization from beeing part of the mirror objects into a seperate class. The purpose of this is to make it easier to change the serialization to contain object identification and references.

Added a test case for the script mirror and modified a number of the other mirror tests.
Review URL: http://codereview.chromium.org/16539

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1035 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

test/mjsunit/mirror-array.js

@@ -47,7 +47,7 @@ function testArrayMirror(a, names) {
   assertTrue(mirror.constructorFunction() instanceof debug.ObjectMirror);
   assertTrue(mirror.protoObject() instanceof debug.Mirror);
   assertTrue(mirror.prototypeObject() instanceof debug.Mirror);
-  assertEquals(mirror.length(), a.length);
+  assertEquals(mirror.length(), a.length, "Length mismatch");
   
   var indexedValueMirrors = mirror.indexedPropertiesFromRange();
   assertEquals(indexedValueMirrors.length, a.length);
@@ -64,7 +64,7 @@ function testArrayMirror(a, names) {
   assertEquals('Array', fromJSON.className);
   assertEquals('function', fromJSON.constructorFunction.type);
   assertEquals('Array', fromJSON.constructorFunction.name);
-  assertEquals(a.length, fromJSON.length);
+  assertEquals(a.length, fromJSON.length, "Length mismatch in parsed JSON");
 
   // Check that the serialization contains all indexed properties.
   for (var i = 0; i < fromJSON.indexedProperties.length; i++) {

test/mjsunit/mirror-function.js

@@ -31,7 +31,6 @@
 function testFunctionMirror(f) {
   // Create mirror and JSON representation.
   var mirror = debug.MakeMirror(f);
-  print(mirror.toJSONProtocol(true));
   var json = mirror.toJSONProtocol(true);
 
   // Check the mirror hierachy.

test/mjsunit/mirror-object.js

@@ -119,7 +119,7 @@ function testObjectMirror(o, cls_name, ctor_name, hasSpecialProperties) {
         found = true;
       }
     }
-    assertTrue(found, '"' + name + '" not found');
+    assertTrue(found, '"' + name + '" not found (' + json + ')');
   }
 }
 
@@ -139,6 +139,11 @@ testObjectMirror(this, 'global', undefined, true);  // Global object has special
 testObjectMirror([], 'Array', 'Array');
 testObjectMirror([1,2], 'Array', 'Array');
 
+// Test circular references.
+o = {};
+o.o = o;
+testObjectMirror(o, 'Object', 'Object');
+
 // Test that non enumerable properties are part of the mirror
 global_mirror = debug.MakeMirror(this);
 assertEquals('property', global_mirror.property("Math").type());

test/mjsunit/mirror-script.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
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Flags: --expose-debug-as debug
+// Test the mirror object for scripts.
+
+function testScriptMirror(f, file_name, file_lines, script_type) {
+  // Create mirror and JSON representation.
+  var mirror = debug.MakeMirror(f).script();
+  var json = mirror.toJSONProtocol(true);
+  print(json);
+
+  // Check the mirror hierachy.
+  assertTrue(mirror instanceof debug.Mirror);
+  assertFalse(mirror instanceof debug.ValueMirror);
+  assertTrue(mirror instanceof debug.ScriptMirror);
+
+  // Check the mirror properties.
+  assertTrue(mirror.isScript());
+  assertEquals('script', mirror.type());
+  var name = mirror.name();
+  assertEquals(file_name, name.substring(name.length - file_name.length));
+  assertEquals(0, mirror.lineOffset());
+  assertEquals(0, mirror.columnOffset());
+  if (file_lines > 0) {
+    assertEquals(file_lines, mirror.lineCount());
+  }
+  assertEquals(script_type, mirror.scriptType());
+  
+  // Parse JSON representation and check.
+  var fromJSON = eval('(' + json + ')');
+  assertEquals('script', fromJSON.type);
+  name = fromJSON.name;
+  assertEquals(file_name, name.substring(name.length - file_name.length));
+  assertEquals(0, fromJSON.lineOffset);
+  assertEquals(0, fromJSON.columnOffset);
+  if (file_lines > 0) {
+    assertEquals(file_lines, fromJSON.lineCount);
+  }
+  assertEquals(script_type, fromJSON.scriptType);  
+}
+
+
+// Test the script mirror for different functions.
+testScriptMirror(function(){}, 'mirror-script.js', 70, 2);
+testScriptMirror(Math.sin, 'native math.js', -1, 0);

test/mjsunit/mirror-string.js

@@ -28,6 +28,8 @@
 // Flags: --expose-debug-as debug
 // Test the mirror object for string values
 
+const kMaxProtocolStringLength = 80; // Constant from mirror-delay.js
+
 function testStringMirror(s) {
   // Create mirror and JSON representation.
   var mirror = debug.MakeMirror(s);
@@ -44,16 +46,26 @@ function testStringMirror(s) {
   assertTrue(mirror.isPrimitive());
 
   // Test text representation
-  assertEquals(s, mirror.toText());
+  if (s.length <= kMaxProtocolStringLength) {
+    assertEquals(s, mirror.toText());
+  } else {
+    assertEquals(s.substring(0, kMaxProtocolStringLength),
+                 mirror.toText().substring(0, kMaxProtocolStringLength));
+  }
 
   // Parse JSON representation and check.
   var fromJSON = eval('(' + json + ')');
   assertEquals('string', fromJSON.type);
-  assertEquals(s, fromJSON.value);
+  if (s.length <= kMaxProtocolStringLength) {
+    assertEquals(s, fromJSON.value);
+  } else {
+    assertEquals(s.substring(0, kMaxProtocolStringLength),
+                 fromJSON.value.substring(0, kMaxProtocolStringLength));
+    assertEquals(fromJSON.fromIndex, 0);
+    assertEquals(fromJSON.toIndex, kMaxProtocolStringLength);
+  }
 }
 
-Number =2;
-
 // Test a number of different strings.
 testStringMirror('');
 testStringMirror('abcdABCD');
@@ -67,3 +79,10 @@ testStringMirror('\\');
 testStringMirror('\b\t\n\f\r');
 testStringMirror('\u0001\u0002\u001E\u001F');
 testStringMirror('"a":1,"b":2');
+
+var s = "1234567890"
+s = s + s + s + s + s + s + s + s;
+assertEquals(kMaxProtocolStringLength, s.length);
+testStringMirror(s);
+s = s + 'X';
+testStringMirror(s);