From de768278bb39941d83bb3eafe908b28160ef5b4b Mon Sep 17 00:00:00 2001 From: "bob%bclary.com" Date: Sun, 20 Nov 2005 06:08:42 +0000 Subject: [PATCH] Modify test to handle script error path when running in the browser, no bug, not part of the build git-svn-id: svn://10.0.0.236/trunk@185008 18797224-902f-48f8-a5cc-f745e15eee43 --- .../tests/js1_5/Exceptions/regress-50447-1.js | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/mozilla/js/tests/js1_5/Exceptions/regress-50447-1.js b/mozilla/js/tests/js1_5/Exceptions/regress-50447-1.js index ddceeaf626f..e64f5f29454 100644 --- a/mozilla/js/tests/js1_5/Exceptions/regress-50447-1.js +++ b/mozilla/js/tests/js1_5/Exceptions/regress-50447-1.js @@ -124,9 +124,18 @@ function test2() test file and assumes the path to the test case is a subdirectory of the directory containing jsDriver.pl */ - var expectedLine = 130; - var expectedFileName = './js1_5/Exceptions/regress-50447-1.js'; - + var expectedLine = 139; + var expectedFileName = 'js1_5/Exceptions/regress-50447-1.js'; + if (typeof document == "undefined") + { + expectedFileName = './' + expectedFileName; + } + else + { + expectedFileName = document.location.href. + replace(/[^\/]*(\?.*)$/, '') + + expectedFileName; + } var e = new InternalError ("msg"); reportCompare ("(new InternalError(\"msg\", \"" + expectedFileName + "\", " + expectedLine + "))", @@ -152,7 +161,17 @@ function test3() enterFunc ("test3"); - var expectedFileName = './js1_5/Exceptions/regress-50447-1.js'; + var expectedFileName = 'js1_5/Exceptions/regress-50447-1.js'; + if (typeof document == "undefined") + { + expectedFileName = './' + expectedFileName; + } + else + { + expectedFileName = document.location.href. + replace(/[^\/]*(\?.*)$/, '') + + expectedFileName; + } var e = new InternalError ("msg"); e.lineNumber = 10; @@ -174,7 +193,7 @@ function test4() /* generate an error with only msg and filename properties */ enterFunc ("test4"); - var expectedLine = 179; + var expectedLine = 198; var e = new InternalError ("msg", "file"); reportCompare ("(new InternalError(\"msg\", \"file\", " + expectedLine + "))",