Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/inspector/network/network-json-parser.html

Issue 1912973002: [DevTools] JSONView parsing smarter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/inspector/network/network-preview-json-expected.txt ('k') | third_party/WebKit/LayoutTests/inspector/network/network-json-parser-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/inspector/network/network-json-parser.html
diff --git a/third_party/WebKit/LayoutTests/inspector/network/network-json-parser.html b/third_party/WebKit/LayoutTests/inspector/network/network-json-parser.html
index b2287a5f3c28cb8d962deb08e8826e143fc3ea59..96724172f3364113412deb713c6db5d53401fd03 100644
--- a/third_party/WebKit/LayoutTests/inspector/network/network-json-parser.html
+++ b/third_party/WebKit/LayoutTests/inspector/network/network-json-parser.html
@@ -4,29 +4,173 @@
<script src="../../http/tests/inspector/network-test.js"></script>
<script>
function test() {
+ var worker = new WorkerRuntime.Worker("formatter_worker");
function check(jsonText)
{
- var result = WebInspector.JSONView.parseJSON(jsonText);
- InspectorTest.addResult("");
- InspectorTest.addResult("Input: " + jsonText);
- if (!result) {
+ var resultData = WebInspector.JSONView._extractJSON(jsonText);
+ if (!resultData) {
+ failure();
+ return;
+ }
+
+ worker.onmessage = success;
+ worker.postMessage({method: "relaxedJSONParser", params:{content: resultData.data}});
+
+ function success(event)
+ {
+ var data = event.data;
+ if (data === null) {
+ failure();
+ return;
+ }
+ resultData.data = data;
+ InspectorTest.addResult("");
+ InspectorTest.addResult("Input: " + cleanData(jsonText));
+
+ InspectorTest.addResult("Prefix: " + cleanData(resultData.prefix));
+ InspectorTest.addResult("Suffix: " + cleanData(resultData.suffix));
+ InspectorTest.addResult("Data: " + cleanData(JSON.stringify(resultData.data, function(k, v) {
+ if (v === undefined)
+ return "!<undefined>!";
+ else if (v === Infinity)
+ return "!<Infinity>!";
+ else if (v === -Infinity)
+ return "!<-Infinity>!";
+ return v;
+ })));
+ runNext();
+ }
+
+ function failure()
+ {
+ InspectorTest.addResult("");
+ InspectorTest.addResult("Input: " + cleanData(jsonText));
+
InspectorTest.addResult("Invalid JSON");
+ runNext();
+ }
+ }
+ function cleanData(data)
+ {
+ return data.replace(/\0/g, "**NULL**").replace(/\r/g, "**CR**");
+ }
+ function runNext()
+ {
+ if (currentTestIndex < tests.length) {
+ currentTestIndex++;
+ check(tests[currentTestIndex - 1]);
} else {
- InspectorTest.addResult("Prefix: " + result.prefix);
- InspectorTest.addResult("Suffix: " + result.suffix);
- InspectorTest.addResult("Data: " + JSON.stringify(result.data));
+ worker.terminate();
+ InspectorTest.completeTest();
}
}
- check("plain text");
- check("{\"x\": 5, \"y\": false, \"z\":\"foo\"}");
- check("{\"bar\": [,,,1, 2, 3,,,], \"baz\": {\"data\": []}}");
- check("[[],[],[]]");
- check("/* GUARD */callback({\"a\": []]});");
- check("foo({a = 5});");
- check("(function(){return {\"a\": []}})()");
+ var currentTestIndex = 0;
+ var tests = [
+ "plain text",
+ "{\"x\": 5, \"y\": false, \"z\":\"foo\"}",
+ "{\"bar\": [,,,1, 2, 3,,,], \"baz\": {\"data\": []}}",
+ "[[],[],[]]",
+ "/* GUARD */callback({\"a\": []]});",
+ "foo({a = 5});",
+ "(function(){return {\"a\": []}})()",
+
+ "{\"name\": \"value\"}",
+ "while(1); {\"name\": \"value\"}",
+ "[, \"foo\", -4.2, true, false, null]",
+ "[{\"foo\": {}, \"bar\": []},[[],{}]]",
+ "/* vanilla */ run ( [1, 2, 3] ) ;",
+ "[\"A\\\"B\\u0020C\\nD\\\\E\\u04ABF\"]",
+ "Text with with {}) inside",
+ "<html>404 Page not found with foo({}) inside</html>",
+ "/* vanilla prefix too large to be considered prefix Ok? */ run([1, 2, 3]); // since it is unlikely JSONP",
+ "[\"This is a really long string\"]{\"This is also a very long string\":\"short\"}",
+ "{010:4}",
+ "{\"foo\":bar}",
+ "{\"foo\":<\"bar\"}",
+ "{\"foo\":\"b\\ar\"}",
+ "[\"foo\"]",
+ "{foo:\"bar\"}",
+ "{ 10 : 4 }",
+ "{ \"foo\" : 010 }",
+ "{\"foo\": 3e3}",
+ "{\"foo\": 3e3,}",
+ "[,,false, null, true,1,0,,,]",
+ "[,,,]",
+ "{foo:\t{bar: null,\r},bar: [\n],foo1: 1,foo2:\r\n -1,\n\rfoo3: -1e-30,foo4: 1E+30,foo5: -1E+1,"+
+ "foo6: \"bar\",\"foo7\": false,\"\\\"\\f\\o\\o8\": true,'fo\\'o9': undefined,"+
+ "\"foo10\": [\"bar\", null],\"\": -Infinity,foo11: {},foo12: [{}],}",
+ "",
+ "\n",
+ "[]",
+ "{}",
+ "()",
+ "foobar",
+ "\"foobar\"",
+ "\"foo\" \"bar\"",
+ "[010, 10, 0x10]",
+ "{010: 010, 0x10: 0x10, 10: 10}",
+ "{-010: -010}",
+ "{-0x10: -0x10}",
+ "{-10: -10}",
+ "{010: -010, 0x10: -0x10, 10: -10}",
+ "[10000, 0x1000000, 0xfEaB3, 01023456, 1234567901, 123.456, -123.456,12.33E-5, 123.456e+5, 123.456e5]",
+ "[\"S\\\"0\u0000me\\\"teXt\"]",
+ " ",
+ " [ {} ] ",
+
+ "var i=0;",
+ "while(true) {}",
+ "while(true); {d:5}",
+ "while(true); {d:-5}",
+ "while(true); {d:[-5]}",
+ "while(true); {d:[-5,-0,03,0xF,0xFF]}",
+ "{d:function () {var i;}}",
+ "{5:d}",
+ "[-{},-[],{},[]]",
+ "[-foo, foo, -bar, bar]",
+ "[function(){}, -function(){}]",
+ "{-true:0}",
+ "{true: 0}",
+ "[-true]",
+ "[true]",
+ "[!true]",
+ "[~true]",
+ "{length: 0}",
+ "[true, false]",
+ "[true, -false]",
+ "[true, false, null, undefined, {}, [], \"\", \"1\", '', '1', 1, -1, -0, 0]",
+ "[-{}, !{}, -[{}], ![{}]]",
+ "[-1, -0, +1, +0, +-1, -!~0]",
+ "[0xFF, -0xFF, +0xFF, 1e1, -1e1, 1E-1, -1E-1, 010, -010, +010]",
+ // Test from json5 ( https://github.com/aseemk/json5 )
+ `{
+ foo: 'bar',
+ while: true,
+
+ this: 'is a \\
+multi-line string',
+
+ // this is an inline comment
+ here: 'is another', // inline comment
+
+ /* this is a block comment
+ that continues on another line */
+
+ hex: 0xDEADbeef,
+ half: .5,
+ delta: +10,
+ to: Infinity, // and beyond!
- InspectorTest.completeTest();
+ finally: 'a trailing comma',
+ oh: [
+ "we shouldn't forget",
+ 'arrays can have',
+ 'trailing commas too',
+ ],
+ }`
+ ];
+ runNext();
}
</script>
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/inspector/network/network-preview-json-expected.txt ('k') | third_party/WebKit/LayoutTests/inspector/network/network-json-parser-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698