[webkit-changes] [117806] trunk/LayoutTests

Mon, 21 May 2012 12:19:35 -0700

Title: [117806] trunk/LayoutTests
Revision
117806
Author
[email protected]
Date
2012-05-21 12:20:14 -0700 (Mon, 21 May 2012)

Log Message

LayoutTests: fast/js/resources/js-test-pre.js - shouldBeEqualToString fails on "
https://bugs.webkit.org/show_bug.cgi?id=86931

Implementations of shouldBeEqualToString() function were not correctly escaping
double quote ('"') characters. Switch to using JSON.stringify() which does
correct escaping, and updated one test that couldn't previously use the function.

Reviewed by Ojan Vafai.

* fast/js/resources/js-test-pre.js:
(shouldBeEqualToString):
* fast/js/resources/standalone-pre.js:
(shouldBeEqualToString):
* storage/indexeddb/cursor-advance-expected.txt:
* storage/indexeddb/resources/cursor-advance.js:
(runTest):

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (117805 => 117806)


--- trunk/LayoutTests/ChangeLog	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/ChangeLog	2012-05-21 19:20:14 UTC (rev 117806)
@@ -1,3 +1,22 @@
+2012-05-21  Joshua Bell  <[email protected]>
+
+        LayoutTests: fast/js/resources/js-test-pre.js - shouldBeEqualToString fails on "
+        https://bugs.webkit.org/show_bug.cgi?id=86931
+
+        Implementations of shouldBeEqualToString() function were not correctly escaping
+        double quote ('"') characters. Switch to using JSON.stringify() which does
+        correct escaping, and updated one test that couldn't previously use the function.
+
+        Reviewed by Ojan Vafai.
+
+        * fast/js/resources/js-test-pre.js:
+        (shouldBeEqualToString):
+        * fast/js/resources/standalone-pre.js:
+        (shouldBeEqualToString):
+        * storage/indexeddb/cursor-advance-expected.txt:
+        * storage/indexeddb/resources/cursor-advance.js:
+        (runTest):
+
 2012-05-21  Sudarsana Nagineni  <[email protected]>
 
         [GTK] DRT support for layoutTestController.setSerializeHTTPLoads

Modified: trunk/LayoutTests/fast/dom/HTMLElement/class-list-expected.txt (117805 => 117806)


--- trunk/LayoutTests/fast/dom/HTMLElement/class-list-expected.txt	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/fast/dom/HTMLElement/class-list-expected.txt	2012-05-21 19:20:14 UTC (rev 117806)
@@ -24,7 +24,7 @@
 PASS element.classList[1] is null
 Testing add in presence of trailing white spaces.
 PASS element.className is "x y"
-PASS element.className is "x	 y"
+PASS element.className is "x\t y"
 PASS element.className is " y"
 Test invalid tokens
 PASS element.classList.contains('') threw expected DOMException with code 12

Modified: trunk/LayoutTests/fast/dom/HTMLElement/class-list-quirks-expected.txt (117805 => 117806)


--- trunk/LayoutTests/fast/dom/HTMLElement/class-list-quirks-expected.txt	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/fast/dom/HTMLElement/class-list-quirks-expected.txt	2012-05-21 19:20:14 UTC (rev 117806)
@@ -24,7 +24,7 @@
 PASS element.classList[1] is null
 Testing add in presence of trailing white spaces.
 PASS element.className is "x y"
-PASS element.className is "x	 y"
+PASS element.className is "x\t y"
 PASS element.className is " y"
 Test invalid tokens
 PASS element.classList.contains('') threw expected DOMException with code 12

Modified: trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt (117805 => 117806)


--- trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt	2012-05-21 19:20:14 UTC (rev 117806)
@@ -26,7 +26,7 @@
 PASS element.htmlFor[1] is null
 - Testing add in presence of trailing white spaces.
 PASS element.htmlFor.toString() is "x y"
-PASS element.htmlFor.toString() is "x	 y"
+PASS element.htmlFor.toString() is "x\t y"
 PASS element.htmlFor.toString() is " y"
 - Test invalid tokens
 PASS element.htmlFor.contains('') threw expected DOMException with code 12

Modified: trunk/LayoutTests/fast/js/resources/js-test-pre.js (117805 => 117806)


--- trunk/LayoutTests/fast/js/resources/js-test-pre.js	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/fast/js/resources/js-test-pre.js	2012-05-21 19:20:14 UTC (rev 117806)
@@ -68,7 +68,7 @@
         styleElement.textContent = css;
         (document.head || document.documentElement).appendChild(styleElement);
     }
-    
+
     if (!isWorker())
         insertStyleSheet();
 
@@ -258,7 +258,9 @@
 
 function shouldBeEqualToString(a, b)
 {
-  var unevaledString = '"' + b.replace(/\\/g, "\\\\").replace(/"/g, "\"").replace(/\n/g, "\\n").replace(/\r/g, "\\r") + '"';
+  if (typeof a !== "string" || typeof b !== "string")
+    debug("WARN: shouldBeEqualToString() expects string arguments");
+  var unevaledString = JSON.stringify(b);
   shouldBe(a, unevaledString);
 }

Modified: trunk/LayoutTests/fast/js/resources/standalone-pre.js (117805 => 117806)


--- trunk/LayoutTests/fast/js/resources/standalone-pre.js	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/fast/js/resources/standalone-pre.js	2012-05-21 19:20:14 UTC (rev 117806)
@@ -98,7 +98,9 @@
 
 function shouldBeEqualToString(a, b)
 {
-  var unevaledString = '"' + b.replace(/\\/g, "\\\\").replace(/"/g, "\"").replace(/\n/g, "\\n").replace(/\r/g, "\\r") + '"';
+  if (typeof a !== "string" || typeof b !== "string")
+    debug("WARN: shouldBeEqualToString() expects string arguments");
+  var unevaledString = JSON.stringify(b);
   shouldBe(a, unevaledString);
 }

Modified: trunk/LayoutTests/storage/domstorage/complex-values-expected.txt (117805 => 117806)


--- trunk/LayoutTests/storage/domstorage/complex-values-expected.txt	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/storage/domstorage/complex-values-expected.txt	2012-05-21 19:20:14 UTC (rev 117806)
@@ -82,25 +82,25 @@
 
 storage.foo10 = k
 PASS typeof storage['foo10'] is "string"
-PASS storage['foo10'] is "ÿ찡\0hello"
+PASS storage['foo10'] is "ÿ찡\u0000hello"
 PASS typeof storage.foo10 is "string"
-PASS storage.foo10 is "ÿ찡\0hello"
+PASS storage.foo10 is "ÿ찡\u0000hello"
 PASS typeof storage.getItem('foo10') is "string"
-PASS storage.getItem('foo10') is "ÿ찡\0hello"
+PASS storage.getItem('foo10') is "ÿ찡\u0000hello"
 storage['foo11'] = k
 PASS typeof storage['foo11'] is "string"
-PASS storage['foo11'] is "ÿ찡\0hello"
+PASS storage['foo11'] is "ÿ찡\u0000hello"
 PASS typeof storage.foo11 is "string"
-PASS storage.foo11 is "ÿ찡\0hello"
+PASS storage.foo11 is "ÿ찡\u0000hello"
 PASS typeof storage.getItem('foo11') is "string"
-PASS storage.getItem('foo11') is "ÿ찡\0hello"
+PASS storage.getItem('foo11') is "ÿ찡\u0000hello"
 storage.setItem('foo12', k)
 PASS typeof storage['foo12'] is "string"
-PASS storage['foo12'] is "ÿ찡\0hello"
+PASS storage['foo12'] is "ÿ찡\u0000hello"
 PASS typeof storage.foo12 is "string"
-PASS storage.foo12 is "ÿ찡\0hello"
+PASS storage.foo12 is "ÿ찡\u0000hello"
 PASS typeof storage.getItem('foo12') is "string"
-PASS storage.getItem('foo12') is "ÿ찡\0hello"
+PASS storage.getItem('foo12') is "ÿ찡\u0000hello"
 
 
 Testing localStorage
@@ -182,25 +182,25 @@
 
 storage.foo10 = k
 PASS typeof storage['foo10'] is "string"
-PASS storage['foo10'] is "ÿ찡\0hello"
+PASS storage['foo10'] is "ÿ찡\u0000hello"
 PASS typeof storage.foo10 is "string"
-PASS storage.foo10 is "ÿ찡\0hello"
+PASS storage.foo10 is "ÿ찡\u0000hello"
 PASS typeof storage.getItem('foo10') is "string"
-PASS storage.getItem('foo10') is "ÿ찡\0hello"
+PASS storage.getItem('foo10') is "ÿ찡\u0000hello"
 storage['foo11'] = k
 PASS typeof storage['foo11'] is "string"
-PASS storage['foo11'] is "ÿ찡\0hello"
+PASS storage['foo11'] is "ÿ찡\u0000hello"
 PASS typeof storage.foo11 is "string"
-PASS storage.foo11 is "ÿ찡\0hello"
+PASS storage.foo11 is "ÿ찡\u0000hello"
 PASS typeof storage.getItem('foo11') is "string"
-PASS storage.getItem('foo11') is "ÿ찡\0hello"
+PASS storage.getItem('foo11') is "ÿ찡\u0000hello"
 storage.setItem('foo12', k)
 PASS typeof storage['foo12'] is "string"
-PASS storage['foo12'] is "ÿ찡\0hello"
+PASS storage['foo12'] is "ÿ찡\u0000hello"
 PASS typeof storage.foo12 is "string"
-PASS storage.foo12 is "ÿ찡\0hello"
+PASS storage.foo12 is "ÿ찡\u0000hello"
 PASS typeof storage.getItem('foo12') is "string"
-PASS storage.getItem('foo12') is "ÿ찡\0hello"
+PASS storage.getItem('foo12') is "ÿ찡\u0000hello"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/storage/indexeddb/cursor-advance-expected.txt (117805 => 117806)


--- trunk/LayoutTests/storage/indexeddb/cursor-advance-expected.txt	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/storage/indexeddb/cursor-advance-expected.txt	2012-05-21 19:20:14 UTC (rev 117806)
@@ -35,7 +35,7 @@
 store = trans.objectStore(objectStoreName)
 request = store.openCursor()
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7733","value":{"name":"Ann","height":52,"weight":110},"primaryKey":"237-23-7733"}'
+PASS expected is "{\"key\":\"237-23-7733\",\"value\":{\"name\":\"Ann\",\"height\":52,\"weight\":110},\"primaryKey\":\"237-23-7733\"}"
 testContinueThenAdvance()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
@@ -44,88 +44,88 @@
 cursor.continue();
 cursor.continue();
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7736","value":{"name":"Joe","height":65,"weight":150},"primaryKey":"237-23-7736"}'
+PASS expected is "{\"key\":\"237-23-7736\",\"value\":{\"name\":\"Joe\",\"height\":65,\"weight\":150},\"primaryKey\":\"237-23-7736\"}"
 testAdvanceMultiple()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
 request = store.openCursor()
 cursor.advance(3)
-PASS expected is '{"key":"237-23-7735","value":{"name":"Sue","height":58,"weight":130},"primaryKey":"237-23-7735"}'
+PASS expected is "{\"key\":\"237-23-7735\",\"value\":{\"name\":\"Sue\",\"height\":58,\"weight\":130},\"primaryKey\":\"237-23-7735\"}"
 testAdvanceIndex()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
 request = store.openCursor()
 cursor.advance(3)
-PASS expected is '{"key":"Jef","value":{"name":"Jef","height":65,"weight":120},"primaryKey":"237-23-7739"}'
+PASS expected is "{\"key\":\"Jef\",\"value\":{\"name\":\"Jef\",\"height\":65,\"weight\":120},\"primaryKey\":\"237-23-7739\"}"
 testAdvanceIndexNoDupe()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
 request = store.openCursor(null, 'nextunique')
 cursor.advance(3)
-PASS expected is '{"key":130,"value":{"name":"Sue","height":58,"weight":130},"primaryKey":"237-23-7735"}'
+PASS expected is "{\"key\":130,\"value\":{\"name\":\"Sue\",\"height\":58,\"weight\":130},\"primaryKey\":\"237-23-7735\"}"
 testAdvanceIndexPrev()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
 request = store.openCursor(null, 'prev')
 cursor.advance(3)
-PASS expected is '{"key":150,"value":{"name":"Joe","height":65,"weight":150},"primaryKey":"237-23-7736"}'
+PASS expected is "{\"key\":150,\"value\":{\"name\":\"Joe\",\"height\":65,\"weight\":150},\"primaryKey\":\"237-23-7736\"}"
 testAdvanceIndexPrevNoDupe()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
 request = store.openCursor(null, 'prevunique')
 cursor.advance(3)
-PASS expected is '{"key":120,"value":{"name":"Bob","height":60,"weight":120},"primaryKey":"237-23-7732"}'
+PASS expected is "{\"key\":120,\"value\":{\"name\":\"Bob\",\"height\":60,\"weight\":120},\"primaryKey\":\"237-23-7732\"}"
 testAdvanceToEnd()
 trans = db.transaction(objectStoreName)
 store = trans.objectStore(objectStoreName)
 request = store.openCursor()
 cursor.advance(100)
-PASS expected is 'null'
+PASS expected is "null"
 testPrefetchInRange()
 trans = db.transaction(objectStoreName)
 objectStore = trans.objectStore(objectStoreName)
 request = objectStore.openCursor()
-PASS expected is '{"key":"237-23-7732","value":{"name":"Bob","height":60,"weight":120},"primaryKey":"237-23-7732"}'
+PASS expected is "{\"key\":\"237-23-7732\",\"value\":{\"name\":\"Bob\",\"height\":60,\"weight\":120},\"primaryKey\":\"237-23-7732\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7733","value":{"name":"Ann","height":52,"weight":110},"primaryKey":"237-23-7733"}'
+PASS expected is "{\"key\":\"237-23-7733\",\"value\":{\"name\":\"Ann\",\"height\":52,\"weight\":110},\"primaryKey\":\"237-23-7733\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7734","value":{"name":"Ron","height":73,"weight":180},"primaryKey":"237-23-7734"}'
+PASS expected is "{\"key\":\"237-23-7734\",\"value\":{\"name\":\"Ron\",\"height\":73,\"weight\":180},\"primaryKey\":\"237-23-7734\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7735","value":{"name":"Sue","height":58,"weight":130},"primaryKey":"237-23-7735"}'
+PASS expected is "{\"key\":\"237-23-7735\",\"value\":{\"name\":\"Sue\",\"height\":58,\"weight\":130},\"primaryKey\":\"237-23-7735\"}"
 cursor.advance(2)
-PASS expected is '{"key":"237-23-7737","value":{"name":"Pat","height":65,"weight":100},"primaryKey":"237-23-7737"}'
+PASS expected is "{\"key\":\"237-23-7737\",\"value\":{\"name\":\"Pat\",\"height\":65,\"weight\":100},\"primaryKey\":\"237-23-7737\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7738","value":{"name":"Leo","height":65,"weight":180},"primaryKey":"237-23-7738"}'
+PASS expected is "{\"key\":\"237-23-7738\",\"value\":{\"name\":\"Leo\",\"height\":65,\"weight\":180},\"primaryKey\":\"237-23-7738\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7739","value":{"name":"Jef","height":65,"weight":120},"primaryKey":"237-23-7739"}'
+PASS expected is "{\"key\":\"237-23-7739\",\"value\":{\"name\":\"Jef\",\"height\":65,\"weight\":120},\"primaryKey\":\"237-23-7739\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7740","value":{"name":"Sam","height":71,"weight":110},"primaryKey":"237-23-7740"}'
+PASS expected is "{\"key\":\"237-23-7740\",\"value\":{\"name\":\"Sam\",\"height\":71,\"weight\":110},\"primaryKey\":\"237-23-7740\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7741","value":{"name":"Bug","height":63,"weight":100},"primaryKey":"237-23-7741"}'
+PASS expected is "{\"key\":\"237-23-7741\",\"value\":{\"name\":\"Bug\",\"height\":63,\"weight\":100},\"primaryKey\":\"237-23-7741\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7742","value":{"name":"Tub","height":69,"weight":180},"primaryKey":"237-23-7742"}'
+PASS expected is "{\"key\":\"237-23-7742\",\"value\":{\"name\":\"Tub\",\"height\":69,\"weight\":180},\"primaryKey\":\"237-23-7742\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7743","value":{"name":"Rug","height":77,"weight":120},"primaryKey":"237-23-7743"}'
+PASS expected is "{\"key\":\"237-23-7743\",\"value\":{\"name\":\"Rug\",\"height\":77,\"weight\":120},\"primaryKey\":\"237-23-7743\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7744","value":{"name":"Pug","height":66,"weight":110},"primaryKey":"237-23-7744"}'
+PASS expected is "{\"key\":\"237-23-7744\",\"value\":{\"name\":\"Pug\",\"height\":66,\"weight\":110},\"primaryKey\":\"237-23-7744\"}"
 cursor.continue()
 testPrefetchOutOfRange()
 trans = db.transaction(objectStoreName)
 objectStore = trans.objectStore(objectStoreName)
 request = objectStore.openCursor()
-PASS expected is '{"key":"237-23-7732","value":{"name":"Bob","height":60,"weight":120},"primaryKey":"237-23-7732"}'
+PASS expected is "{\"key\":\"237-23-7732\",\"value\":{\"name\":\"Bob\",\"height\":60,\"weight\":120},\"primaryKey\":\"237-23-7732\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7733","value":{"name":"Ann","height":52,"weight":110},"primaryKey":"237-23-7733"}'
+PASS expected is "{\"key\":\"237-23-7733\",\"value\":{\"name\":\"Ann\",\"height\":52,\"weight\":110},\"primaryKey\":\"237-23-7733\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7734","value":{"name":"Ron","height":73,"weight":180},"primaryKey":"237-23-7734"}'
+PASS expected is "{\"key\":\"237-23-7734\",\"value\":{\"name\":\"Ron\",\"height\":73,\"weight\":180},\"primaryKey\":\"237-23-7734\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7735","value":{"name":"Sue","height":58,"weight":130},"primaryKey":"237-23-7735"}'
+PASS expected is "{\"key\":\"237-23-7735\",\"value\":{\"name\":\"Sue\",\"height\":58,\"weight\":130},\"primaryKey\":\"237-23-7735\"}"
 cursor.advance(7)
-PASS expected is '{"key":"237-23-7742","value":{"name":"Tub","height":69,"weight":180},"primaryKey":"237-23-7742"}'
+PASS expected is "{\"key\":\"237-23-7742\",\"value\":{\"name\":\"Tub\",\"height\":69,\"weight\":180},\"primaryKey\":\"237-23-7742\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7743","value":{"name":"Rug","height":77,"weight":120},"primaryKey":"237-23-7743"}'
+PASS expected is "{\"key\":\"237-23-7743\",\"value\":{\"name\":\"Rug\",\"height\":77,\"weight\":120},\"primaryKey\":\"237-23-7743\"}"
 cursor.continue()
-PASS expected is '{"key":"237-23-7744","value":{"name":"Pug","height":66,"weight":110},"primaryKey":"237-23-7744"}'
+PASS expected is "{\"key\":\"237-23-7744\",\"value\":{\"name\":\"Pug\",\"height\":66,\"weight\":110},\"primaryKey\":\"237-23-7744\"}"
 cursor.continue()
 testBadAdvance()
 trans = db.transaction(objectStoreName, 'readwrite')
@@ -138,25 +138,25 @@
 trans = db.transaction(objectStoreName, 'readwrite')
 objectStore = trans.objectStore(objectStoreName)
 request = objectStore.openCursor()
-PASS expected is '{"key":"237-23-7732","value":{"name":"Bob","height":60,"weight":120},"primaryKey":"237-23-7732"}'
+PASS expected is "{\"key\":\"237-23-7732\",\"value\":{\"name\":\"Bob\",\"height\":60,\"weight\":120},\"primaryKey\":\"237-23-7732\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7733","value":{"name":"Ann","height":52,"weight":110},"primaryKey":"237-23-7733"}'
+PASS expected is "{\"key\":\"237-23-7733\",\"value\":{\"name\":\"Ann\",\"height\":52,\"weight\":110},\"primaryKey\":\"237-23-7733\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7734","value":{"name":"Ron","height":73,"weight":180},"primaryKey":"237-23-7734"}'
+PASS expected is "{\"key\":\"237-23-7734\",\"value\":{\"name\":\"Ron\",\"height\":73,\"weight\":180},\"primaryKey\":\"237-23-7734\"}"
 cursor.delete()
-PASS expected is '{"key":"237-23-7738","value":{"name":"Leo","height":65,"weight":180},"primaryKey":"237-23-7738"}'
+PASS expected is "{\"key\":\"237-23-7738\",\"value\":{\"name\":\"Leo\",\"height\":65,\"weight\":180},\"primaryKey\":\"237-23-7738\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7739","value":{"name":"Jef","height":65,"weight":120},"primaryKey":"237-23-7739"}'
+PASS expected is "{\"key\":\"237-23-7739\",\"value\":{\"name\":\"Jef\",\"height\":65,\"weight\":120},\"primaryKey\":\"237-23-7739\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7740","value":{"name":"Sam","height":71,"weight":110},"primaryKey":"237-23-7740"}'
+PASS expected is "{\"key\":\"237-23-7740\",\"value\":{\"name\":\"Sam\",\"height\":71,\"weight\":110},\"primaryKey\":\"237-23-7740\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7741","value":{"name":"Bug","height":63,"weight":100},"primaryKey":"237-23-7741"}'
+PASS expected is "{\"key\":\"237-23-7741\",\"value\":{\"name\":\"Bug\",\"height\":63,\"weight\":100},\"primaryKey\":\"237-23-7741\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7742","value":{"name":"Tub","height":69,"weight":180},"primaryKey":"237-23-7742"}'
+PASS expected is "{\"key\":\"237-23-7742\",\"value\":{\"name\":\"Tub\",\"height\":69,\"weight\":180},\"primaryKey\":\"237-23-7742\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7743","value":{"name":"Rug","height":77,"weight":120},"primaryKey":"237-23-7743"}'
+PASS expected is "{\"key\":\"237-23-7743\",\"value\":{\"name\":\"Rug\",\"height\":77,\"weight\":120},\"primaryKey\":\"237-23-7743\"}"
 cursor.advance(1)
-PASS expected is '{"key":"237-23-7744","value":{"name":"Pug","height":66,"weight":110},"primaryKey":"237-23-7744"}'
+PASS expected is "{\"key\":\"237-23-7744\",\"value\":{\"name\":\"Pug\",\"height\":66,\"weight\":110},\"primaryKey\":\"237-23-7744\"}"
 cursor.advance(1)
 PASS successfullyParsed is true

Modified: trunk/LayoutTests/storage/indexeddb/resources/cursor-advance.js (117805 => 117806)


--- trunk/LayoutTests/storage/indexeddb/resources/cursor-advance.js	2012-05-21 18:52:16 UTC (rev 117805)
+++ trunk/LayoutTests/storage/indexeddb/resources/cursor-advance.js	2012-05-21 19:20:14 UTC (rev 117806)
@@ -137,7 +137,7 @@
 function runTest(cursor, expectedValue)
 {
     expected = JSON.stringify(expectedValue);
-    shouldBe("expected", "'" + JSON.stringify(simplifyCursor(cursor)) + "'");
+    shouldBeEqualToString("expected", JSON.stringify(simplifyCursor(cursor)));
 }
 
 function testAll()

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to