Bug 1432992, part 3 - Adjust some line numbers in tests. r=florian draft
authorAndrew McCreight <continuation@gmail.com>
Thu, 01 Feb 2018 13:35:20 -0800
changeset 751790 74de512cb8d644ba9d6d8279596df3d24f9c7bb6
parent 751789 f5789bf6490f06ff36c04ff144fa653311bb47ef
push id98047
push userbmo:continuation@gmail.com
push dateTue, 06 Feb 2018 22:02:37 +0000
reviewersflorian
bugs1432992
milestone60.0a1
Bug 1432992, part 3 - Adjust some line numbers in tests. r=florian Deleting lines in part 1 caused two tests to break, because they check the line numbers for source files. The devtools part of the patch was automatically generated. MozReview-Commit-ID: DrDZeyVnpE0
devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
js/xpconnect/tests/chrome/test_nsScriptErrorWithStack.html
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
@@ -39,24 +39,24 @@ stubPreparedMessages.set("ReferenceError
     },
     {
       "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
       "lineNumber": 9,
       "columnNumber": 3,
       "functionName": null
     },
     {
-      "filename": "resource://testing-common/content-task.js line 52 > eval",
+      "filename": "resource://testing-common/content-task.js line 50 > eval",
       "lineNumber": 7,
       "columnNumber": 9,
       "functionName": null
     },
     {
       "filename": "resource://testing-common/content-task.js",
-      "lineNumber": 53,
+      "lineNumber": 51,
       "columnNumber": 20,
       "functionName": null
     }
   ],
   "frame": {
     "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 5
@@ -76,24 +76,24 @@ stubPreparedMessages.set("SyntaxError: r
   "type": "log",
   "helperType": null,
   "level": "error",
   "messageText": "SyntaxError: redeclaration of let a",
   "parameters": null,
   "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: redeclaration of let a\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null}",
   "stacktrace": [
     {
-      "filename": "resource://testing-common/content-task.js line 52 > eval",
+      "filename": "resource://testing-common/content-task.js line 50 > eval",
       "lineNumber": 7,
       "columnNumber": 9,
       "functionName": null
     },
     {
       "filename": "resource://testing-common/content-task.js",
-      "lineNumber": 53,
+      "lineNumber": 51,
       "columnNumber": 20,
       "functionName": null
     }
   ],
   "frame": {
     "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 9
@@ -132,24 +132,24 @@ stubPreparedMessages.set("TypeError long
   "stacktrace": [
     {
       "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
       "lineNumber": 1,
       "columnNumber": 7,
       "functionName": null
     },
     {
-      "filename": "resource://testing-common/content-task.js line 52 > eval",
+      "filename": "resource://testing-common/content-task.js line 50 > eval",
       "lineNumber": 7,
       "columnNumber": 9,
       "functionName": null
     },
     {
       "filename": "resource://testing-common/content-task.js",
-      "lineNumber": 53,
+      "lineNumber": 51,
       "columnNumber": 20,
       "functionName": null
     }
   ],
   "frame": {
     "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 7
@@ -194,24 +194,24 @@ stubPackets.set("ReferenceError: asdf is
       },
       {
         "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
         "lineNumber": 9,
         "columnNumber": 3,
         "functionName": null
       },
       {
-        "filename": "resource://testing-common/content-task.js line 52 > eval",
+        "filename": "resource://testing-common/content-task.js line 50 > eval",
         "lineNumber": 7,
         "columnNumber": 9,
         "functionName": null
       },
       {
         "filename": "resource://testing-common/content-task.js",
-        "lineNumber": 53,
+        "lineNumber": 51,
         "columnNumber": 20,
         "functionName": null
       }
     ],
     "notes": null
   }
 });
 
@@ -230,24 +230,24 @@ stubPackets.set("SyntaxError: redeclarat
     "warning": false,
     "error": false,
     "exception": true,
     "strict": false,
     "info": false,
     "private": false,
     "stacktrace": [
       {
-        "filename": "resource://testing-common/content-task.js line 52 > eval",
+        "filename": "resource://testing-common/content-task.js line 50 > eval",
         "lineNumber": 7,
         "columnNumber": 9,
         "functionName": null
       },
       {
         "filename": "resource://testing-common/content-task.js",
-        "lineNumber": 53,
+        "lineNumber": 51,
         "columnNumber": 20,
         "functionName": null
       }
     ],
     "notes": [
       {
         "messageBody": "Previously declared at line 2, column 6",
         "frame": {
@@ -286,24 +286,24 @@ stubPackets.set("TypeError longString me
     "stacktrace": [
       {
         "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
         "lineNumber": 1,
         "columnNumber": 7,
         "functionName": null
       },
       {
-        "filename": "resource://testing-common/content-task.js line 52 > eval",
+        "filename": "resource://testing-common/content-task.js line 50 > eval",
         "lineNumber": 7,
         "columnNumber": 9,
         "functionName": null
       },
       {
         "filename": "resource://testing-common/content-task.js",
-        "lineNumber": 53,
+        "lineNumber": 51,
         "columnNumber": 20,
         "functionName": null
       }
     ],
     "notes": null
   }
 });
 
--- a/js/xpconnect/tests/chrome/test_nsScriptErrorWithStack.html
+++ b/js/xpconnect/tests/chrome/test_nsScriptErrorWithStack.html
@@ -30,23 +30,23 @@
         return;
       }
       dump("stack: "+aSubject.stack+"\n");
 
       // Main assertions
       var s = aSubject.stack;
       ok(!!s, "has first frame");
       ok(s.source.includes("test_nsScriptErrorWithStack.html"), "source is correct");
-      is(s.line, 23, "line is correct");
+      is(s.line, 21, "line is correct");
       is(s.column, 5, "column is correct");
       is(s.functionDisplayName, "nestedFunction");
       s = s.parent;
       ok(!!s, "has second frame");
       ok(s.source.includes("test_nsScriptErrorWithStack.html"), "source is correct");
-      is(s.line, 20, "line is correct");
+      is(s.line, 18, "line is correct");
       is(s.column, 5, "column is correct");
       is(s.functionDisplayName, "failingStack");
       // We shouldn't have any more frame as we used setTimeout
       ok(!s.parent, "has no more frames");
 
       // Cleanup
       Services.console.unregisterListener(TestObserver);
       SimpleTest.finish();