From b0f29364960060f2ade3fbb06029d5d55b075731 Mon Sep 17 00:00:00 2001 From: "bclary%bclary.com" Date: Mon, 30 Oct 2006 16:48:38 +0000 Subject: [PATCH] JavaScript Tests - kill writeLineToLog, etc. Not part of the build. Bug 358665, r=igor git-svn-id: svn://10.0.0.236/trunk@214416 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/tests/e4x/browser.js | 41 +- .../ecma/LexicalConventions/7.4.3-14-n.js | 2 +- .../ecma/LexicalConventions/7.4.3-15-n.js | 2 +- .../ecma/LexicalConventions/7.4.3-4-n.js | 2 +- .../ecma/LexicalConventions/7.4.3-7-n.js | 2 +- .../ecma/LexicalConventions/7.4.3-9-n.js | 2 +- mozilla/js/tests/ecma/String/15.5.4.4-1.js | 2 +- mozilla/js/tests/ecma/String/15.5.4.6-1.js | 2 +- mozilla/js/tests/ecma/String/15.5.4.7-1.js | 2 +- .../js/tests/ecma/TypeConversion/9.3.1-3.js | 18 +- mozilla/js/tests/ecma/browser.js | 61 +- mozilla/js/tests/ecma/jsref.js | 9 +- mozilla/js/tests/ecma/shell.js | 18 +- .../ecma_2/Exceptions/exception-010-n.js | 6 +- .../ecma_2/Exceptions/exception-011-n.js | 4 +- .../js/tests/ecma_2/Exceptions/lexical-011.js | 2 +- .../js/tests/ecma_2/Exceptions/lexical-014.js | 2 +- .../js/tests/ecma_2/Exceptions/lexical-016.js | 2 +- .../js/tests/ecma_2/Exceptions/lexical-021.js | 2 +- .../ecma_2/FunctionObjects/apply-001-n.js | 4 +- .../ecma_2/LexicalConventions/keywords-001.js | 2 +- .../js/tests/ecma_2/Statements/dowhile-005.js | 2 +- mozilla/js/tests/ecma_2/browser.js | 62 +- mozilla/js/tests/ecma_2/jsref.js | 7 +- mozilla/js/tests/ecma_2/shell.js | 13 +- mozilla/js/tests/ecma_3/Date/browser.js | 14 +- mozilla/js/tests/ecma_3/Date/shell.js | 18 +- .../js/tests/ecma_3/Exceptions/binding-001.js | 2 +- .../tests/ecma_3/Statements/regress-121744.js | 8 +- .../tests/ecma_3/Statements/regress-131348.js | 8 +- mozilla/js/tests/ecma_3/browser.js | 38 +- mozilla/js/tests/ecma_3/shell.js | 14 +- mozilla/js/tests/js1_1/browser.js | 60 +- mozilla/js/tests/js1_1/jsref.js | 5 +- mozilla/js/tests/js1_1/shell.js | 14 +- mozilla/js/tests/js1_2/browser.js | 61 +- mozilla/js/tests/js1_2/jsref.js | 8 +- .../js/tests/js1_2/regress/regress-144834.js | 4 +- mozilla/js/tests/js1_2/shell.js | 12 +- mozilla/js/tests/js1_2/statements/switch2.js | 2 +- .../tests/js1_2/version120/regress-99663.js | 4 +- mozilla/js/tests/js1_3/browser.js | 74 +- mozilla/js/tests/js1_3/jsref.js | 9 +- mozilla/js/tests/js1_3/shell.js | 14 +- .../js/tests/js1_4/Regress/function-002.js | 2 +- mozilla/js/tests/js1_4/browser.js | 61 +- mozilla/js/tests/js1_4/jsref.js | 5 +- mozilla/js/tests/js1_4/shell.js | 14 +- .../tests/js1_5/Exceptions/regress-342359.js | 2 +- .../js/tests/js1_5/Function/regress-348986.js | 10 +- mozilla/js/tests/js1_5/GC/regress-104584.js | 4 +- .../js/tests/js1_5/GC/regress-319980-01.js | 4 +- mozilla/js/tests/js1_5/GC/regress-331719.js | 2 +- mozilla/js/tests/js1_5/GC/regress-338653.js | 2 +- mozilla/js/tests/js1_5/GC/regress-345967.js | 6 +- mozilla/js/tests/js1_5/GC/regress-348532.js | 2 +- .../js/tests/js1_5/Object/regress-338709.js | 8 +- .../js/tests/js1_5/Regress/regress-104077.js | 40 +- .../js/tests/js1_5/Regress/regress-168347.js | 20 +- .../js/tests/js1_5/Regress/regress-327608.js | 2 +- .../js/tests/js1_5/Regress/regress-340199.js | 6 +- .../js/tests/js1_5/Regress/regress-340369.js | 2 +- .../js/tests/js1_5/Regress/regress-341360.js | 8 +- .../js/tests/js1_5/Regress/regress-343713.js | 2 +- .../tests/js1_5/Regress/regress-346494-01.js | 20 +- .../js/tests/js1_5/Regress/regress-346801.js | 12 +- .../tests/js1_5/Regress/regress-347306-01.js | 2 +- .../tests/js1_5/Regress/regress-347306-02.js | 2 +- .../tests/js1_5/Regress/regress-349482-01.js | 2 +- .../tests/js1_5/Regress/regress-349482-02.js | 2 +- .../js/tests/js1_5/Regress/regress-349484.js | 4 +- .../js/tests/js1_5/Regress/regress-349489.js | 4 +- .../js/tests/js1_5/Regress/regress-349592.js | 2 +- .../js/tests/js1_5/Regress/regress-349616.js | 4 +- .../js/tests/js1_5/Regress/regress-349663.js | 2 +- .../tests/js1_5/Regress/regress-350312-01.js | 4 +- .../tests/js1_5/Regress/regress-350312-02.js | 12 +- .../tests/js1_5/Regress/regress-350312-03.js | 26 +- .../js/tests/js1_5/Regress/regress-350312.js | 6 +- .../js/tests/js1_5/Regress/regress-350531.js | 3 +- .../js/tests/js1_5/Regress/regress-352455.js | 6 +- .../js/tests/js1_5/Regress/regress-355341.js | 2 +- .../js/tests/js1_5/Regress/regress-80981.js | 12 +- .../tests/js1_5/Regress/regress-96526-003.js | 714 +++++++++--------- .../tests/js1_5/String/regress-354541-01.js | 4 +- .../tests/js1_5/String/regress-354541-02.js | 4 +- .../tests/js1_5/String/regress-354541-03.js | 2 +- mozilla/js/tests/js1_5/browser.js | 38 +- mozilla/js/tests/js1_5/shell.js | 17 +- mozilla/js/tests/js1_6/Array/browser.js | 1 - .../js/tests/js1_6/Array/regress-352742-01.js | 4 +- .../js/tests/js1_6/Array/regress-352742-02.js | 2 +- mozilla/js/tests/js1_6/Regress/browser.js | 1 - mozilla/js/tests/js1_6/String/browser.js | 1 - mozilla/js/tests/js1_6/browser.js | 38 +- mozilla/js/tests/js1_6/shell.js | 17 +- .../js/tests/js1_7/block/regress-341939.js | 2 +- .../js/tests/js1_7/block/regress-343765.js | 16 +- .../js/tests/js1_7/block/regress-344262.js | 4 +- .../js/tests/js1_7/block/regress-348685.js | 4 +- .../js/tests/js1_7/block/regress-349493.js | 2 +- .../js/tests/js1_7/block/regress-349499.js | 2 +- .../js/tests/js1_7/block/regress-351070-02.js | 8 +- mozilla/js/tests/js1_7/browser.js | 38 +- .../js1_7/expressions/regress-346645-01.js | 2 +- .../js1_7/expressions/regress-346645-02.js | 2 +- .../js1_7/expressions/regress-346645-03.js | 2 +- .../js/tests/js1_7/geniter/regress-347593.js | 2 +- .../tests/js1_7/geniter/regress-349012-03.js | 2 +- .../tests/js1_7/geniter/regress-349012-04.js | 2 +- .../tests/js1_7/geniter/regress-349012-05.js | 4 +- .../tests/js1_7/geniter/regress-349023-01.js | 2 +- .../js/tests/js1_7/geniter/regress-349331.js | 12 +- .../js/tests/js1_7/geniter/regress-350312.js | 4 +- .../js/tests/js1_7/geniter/regress-350621.js | 4 +- .../tests/js1_7/geniter/regress-352885-01.js | 2 +- .../tests/js1_7/iterable/regress-340526-01.js | 2 +- .../js/tests/js1_7/iterable/regress-341815.js | 2 +- .../js/tests/js1_7/iterable/regress-341821.js | 2 +- .../js/tests/js1_7/iterable/regress-346021.js | 2 +- .../tests/js1_7/lexical/regress-346642-02.js | 4 +- mozilla/js/tests/js1_7/shell.js | 17 +- mozilla/js/tests/jsDriver.pl | 6 +- mozilla/js/tests/lc2/JavaToJS/boolean-005.js | 2 +- mozilla/js/tests/lc2/browser.js | 66 +- mozilla/js/tests/lc2/jsref.js | 5 +- mozilla/js/tests/lc2/shell.js | 15 +- .../js/tests/lc3/JSObject/ToJSObject-001.js | 4 +- mozilla/js/tests/lc3/browser.js | 61 +- mozilla/js/tests/lc3/jsref.js | 5 +- mozilla/js/tests/lc3/shell.js | 11 +- 131 files changed, 1137 insertions(+), 995 deletions(-) diff --git a/mozilla/js/tests/e4x/browser.js b/mozilla/js/tests/e4x/browser.js index 44160bb9a66..60ded184ea8 100644 --- a/mozilla/js/tests/e4x/browser.js +++ b/mozilla/js/tests/e4x/browser.js @@ -70,24 +70,27 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } -} -function print( string ) { - string = String(string); - writeLineToLog( string ); + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } var testcases = new Array(); @@ -219,6 +222,16 @@ TEST_XML = function (section, expected, actual) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -231,13 +244,7 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-14-n.js b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-14-n.js index 3675f9e9811..66056da8f0c 100644 --- a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-14-n.js +++ b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-14-n.js @@ -63,7 +63,7 @@ writeHeaderToLog( SECTION + " "+ TITLE); var actual = 'no error'; var prefValue; -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); jsOptions.setOption('werror', true); diff --git a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-15-n.js b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-15-n.js index 75b4ee0c5b9..3f8c5292cc5 100644 --- a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-15-n.js +++ b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-15-n.js @@ -64,7 +64,7 @@ writeHeaderToLog( SECTION + " "+ TITLE); var actual = 'no error'; var prefValue; -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-4-n.js b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-4-n.js index 90f3796b39e..fae3d282bc2 100644 --- a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-4-n.js +++ b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-4-n.js @@ -63,7 +63,7 @@ writeHeaderToLog( SECTION + " "+ TITLE); var actual = 'no error'; var prefValue; -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); jsOptions.setOption('werror', true); diff --git a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-7-n.js b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-7-n.js index c265b7a7b29..4ea269dbd1e 100644 --- a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-7-n.js +++ b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-7-n.js @@ -63,7 +63,7 @@ writeHeaderToLog( SECTION + " "+ TITLE); var actual = 'no error'; var prefValue; -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-9-n.js b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-9-n.js index 2305be3ea5f..9a73ba87d22 100644 --- a/mozilla/js/tests/ecma/LexicalConventions/7.4.3-9-n.js +++ b/mozilla/js/tests/ecma/LexicalConventions/7.4.3-9-n.js @@ -67,7 +67,7 @@ DESCRIPTION = "var class = true"; EXPECTED = "error"; -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); jsOptions.setOption('werror', true); diff --git a/mozilla/js/tests/ecma/String/15.5.4.4-1.js b/mozilla/js/tests/ecma/String/15.5.4.4-1.js index de1073d5d56..b9505db9676 100644 --- a/mozilla/js/tests/ecma/String/15.5.4.4-1.js +++ b/mozilla/js/tests/ecma/String/15.5.4.4-1.js @@ -84,7 +84,7 @@ for ( i = 0x0020; i < 0x007e; i++, item++) { new TestCase( SECTION, "String.prototype.charAt.length", 1, String.prototype.charAt.length ); -writeLineToLog( "TEST_STRING = new String(\" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\")" ); +print( "TEST_STRING = new String(\" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\")" ); test(); diff --git a/mozilla/js/tests/ecma/String/15.5.4.6-1.js b/mozilla/js/tests/ecma/String/15.5.4.6-1.js index 6494c10fb9f..3769e80b044 100644 --- a/mozilla/js/tests/ecma/String/15.5.4.6-1.js +++ b/mozilla/js/tests/ecma/String/15.5.4.6-1.js @@ -146,7 +146,7 @@ new TestCase( SECTION, "String.indexOf(" +TEST_STRING + ", 0 )", 0, TEST_STRING new TestCase( SECTION, "String.indexOf(" +TEST_STRING + ", 1 )", -1, TEST_STRING.indexOf( TEST_STRING, 1 )); -writeLineToLog( "TEST_STRING = new String(\" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\")" ); +print( "TEST_STRING = new String(\" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\")" ); test(); diff --git a/mozilla/js/tests/ecma/String/15.5.4.7-1.js b/mozilla/js/tests/ecma/String/15.5.4.7-1.js index 831ea11e9c2..f9f8f7f918e 100644 --- a/mozilla/js/tests/ecma/String/15.5.4.7-1.js +++ b/mozilla/js/tests/ecma/String/15.5.4.7-1.js @@ -159,7 +159,7 @@ new TestCase( SECTION, "String.lastIndexOf(" +TEST_STRING + ", 0 )", 0, TEST_ST new TestCase( SECTION, "String.lastIndexOf(" +TEST_STRING + ")", 0, TEST_STRING.lastIndexOf( TEST_STRING )); -writeLineToLog( "TEST_STRING = new String(\" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\")" ); +print( "TEST_STRING = new String(\" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\")" ); test(); diff --git a/mozilla/js/tests/ecma/TypeConversion/9.3.1-3.js b/mozilla/js/tests/ecma/TypeConversion/9.3.1-3.js index c19bce121be..9f5a284291d 100644 --- a/mozilla/js/tests/ecma/TypeConversion/9.3.1-3.js +++ b/mozilla/js/tests/ecma/TypeConversion/9.3.1-3.js @@ -72,7 +72,7 @@ var z = 0; new TestCase( SECTION, - "var z = 0; writeLineToLog(1/-z)", + "var z = 0; print(1/-z)", -Infinity, 1/-z ); @@ -182,8 +182,8 @@ new TestCase( SECTION, s = "17976931348623158079372897140530341507993413271003782693617377898044496829276475094664901797758720709633028641669288791094655554785194040263065748867150582068"; -writeLineToLog("s = " + s); -writeLineToLog("-s = " + (-s)); +print("s = " + s); +print("-s = " + (-s)); new TestCase( SECTION, "s = " + s +"; s +="+ @@ -197,8 +197,8 @@ new TestCase( SECTION, s1 = s+1; -writeLineToLog("s1 = " + s1); -writeLineToLog("-s1 = " + (-s1)); +print("s1 = " + s1); +print("-s1 = " + (-s1)); new TestCase( SECTION, "s1 = s+1; s1", @@ -214,8 +214,8 @@ new TestCase( SECTION, s2 = s + 2; -writeLineToLog("s2 = " + s2); -writeLineToLog("-s2 = " + (-s2)); +print("s2 = " + s2); +print("-s2 = " + (-s2)); new TestCase( SECTION, "s2 = s+2; s2", @@ -230,8 +230,8 @@ new TestCase( SECTION, s3 = s+3; -writeLineToLog("s3 = " + s3); -writeLineToLog("-s3 = " + (-s3)); +print("s3 = " + s3); +print("-s3 = " + (-s3)); new TestCase( SECTION, "s3 = s+3; s3", diff --git a/mozilla/js/tests/ecma/browser.js b/mozilla/js/tests/ecma/browser.js index 6a463a1eb50..85ec9839e21 100644 --- a/mozilla/js/tests/ecma/browser.js +++ b/mozilla/js/tests/ecma/browser.js @@ -73,45 +73,58 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); return passed; } @@ -138,7 +151,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -185,6 +198,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -197,12 +220,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/ecma/jsref.js b/mozilla/js/tests/ecma/jsref.js index 4263fd11f11..e4f2fc0bf9a 100644 --- a/mozilla/js/tests/ecma/jsref.js +++ b/mozilla/js/tests/ecma/jsref.js @@ -68,7 +68,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } } @@ -98,7 +98,7 @@ function startTest() { // print out bugnumber if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } testcases = new Array(); @@ -173,14 +173,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } diff --git a/mozilla/js/tests/ecma/shell.js b/mozilla/js/tests/ecma/shell.js index ffe9efd069b..9138992b3ad 100644 --- a/mozilla/js/tests/ecma/shell.js +++ b/mozilla/js/tests/ecma/shell.js @@ -87,7 +87,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -126,7 +126,7 @@ function startTest() { // print out bugnumber if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } @@ -143,7 +143,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -208,12 +208,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } @@ -240,7 +238,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } @@ -540,7 +538,7 @@ function DaylightSavingTA( t ) { // Daylight Savings Time starts on the first Sunday in April at 2:00AM in // PST. Other time zones will need to override this function. - writeLineToLog( new Date( UTC(dst_start + LocalTZA())) ); + print( new Date( UTC(dst_start + LocalTZA())) ); return UTC(dst_start + LocalTZA()); } @@ -689,7 +687,7 @@ function ToInteger( t ) { function Enumerate ( o ) { var p; for ( p in o ) { - writeLineToLog( p +": " + o[p] ); + print( p +": " + o[p] ); } } diff --git a/mozilla/js/tests/ecma_2/Exceptions/exception-010-n.js b/mozilla/js/tests/ecma_2/Exceptions/exception-010-n.js index e3dde58346b..5927c83c804 100644 --- a/mozilla/js/tests/ecma_2/Exceptions/exception-010-n.js +++ b/mozilla/js/tests/ecma_2/Exceptions/exception-010-n.js @@ -44,8 +44,8 @@ startTest(); var TITLE = "Don't Crash throwing null"; writeHeaderToLog( SECTION + " "+ TITLE); -writeLineToLog("Null throw test."); -writeLineToLog("BUGNUMBER: 21799"); +print("Null throw test."); +print("BUGNUMBER: 21799"); DESCRIPTION = "throw null"; EXPECTED = "error"; @@ -54,6 +54,6 @@ new TestCase( SECTION, "throw null", "error", eval("throw null" )); test(); -writeLineToLog("FAILED!: Should have exited with uncaught exception."); +print("FAILED!: Should have exited with uncaught exception."); diff --git a/mozilla/js/tests/ecma_2/Exceptions/exception-011-n.js b/mozilla/js/tests/ecma_2/Exceptions/exception-011-n.js index 7138427ba95..8fd0a502d30 100644 --- a/mozilla/js/tests/ecma_2/Exceptions/exception-011-n.js +++ b/mozilla/js/tests/ecma_2/Exceptions/exception-011-n.js @@ -45,7 +45,7 @@ var TITLE = "Don't Crash throwing undefined"; writeHeaderToLog( SECTION + " "+ TITLE); -writeLineToLog("Undefined throw test."); +print("Undefined throw test."); DESCRIPTION = "throw undefined"; EXPECTED = "error"; @@ -54,7 +54,7 @@ new TestCase( SECTION, "throw undefined", "error", eval("throw (void 0)") ); test(); -writeLineToLog("FAILED!: Should have exited with uncaught exception."); +print("FAILED!: Should have exited with uncaught exception."); diff --git a/mozilla/js/tests/ecma_2/Exceptions/lexical-011.js b/mozilla/js/tests/ecma_2/Exceptions/lexical-011.js index d1b308ce927..1f3ef1c10a1 100644 --- a/mozilla/js/tests/ecma_2/Exceptions/lexical-011.js +++ b/mozilla/js/tests/ecma_2/Exceptions/lexical-011.js @@ -25,7 +25,7 @@ var TITLE = "Future Reserved Words"; startTest(); writeHeaderToLog( SECTION + " "+ TITLE); -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma_2/Exceptions/lexical-014.js b/mozilla/js/tests/ecma_2/Exceptions/lexical-014.js index a511138e20d..b9c80a272c6 100644 --- a/mozilla/js/tests/ecma_2/Exceptions/lexical-014.js +++ b/mozilla/js/tests/ecma_2/Exceptions/lexical-014.js @@ -25,7 +25,7 @@ var TITLE = "Future Reserved Words"; startTest(); writeHeaderToLog( SECTION + " "+ TITLE); -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma_2/Exceptions/lexical-016.js b/mozilla/js/tests/ecma_2/Exceptions/lexical-016.js index 7167fa09c17..d02c5c36936 100644 --- a/mozilla/js/tests/ecma_2/Exceptions/lexical-016.js +++ b/mozilla/js/tests/ecma_2/Exceptions/lexical-016.js @@ -25,7 +25,7 @@ var TITLE = "Future Reserved Words"; startTest(); writeHeaderToLog( SECTION + " "+ TITLE); -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma_2/Exceptions/lexical-021.js b/mozilla/js/tests/ecma_2/Exceptions/lexical-021.js index 3d0a7d01efb..fbffbca21b0 100644 --- a/mozilla/js/tests/ecma_2/Exceptions/lexical-021.js +++ b/mozilla/js/tests/ecma_2/Exceptions/lexical-021.js @@ -25,7 +25,7 @@ var TITLE = "Future Reserved Words"; startTest(); writeHeaderToLog( SECTION + " "+ TITLE); -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma_2/FunctionObjects/apply-001-n.js b/mozilla/js/tests/ecma_2/FunctionObjects/apply-001-n.js index fd914d6fce9..bea70c66644 100644 --- a/mozilla/js/tests/ecma_2/FunctionObjects/apply-001-n.js +++ b/mozilla/js/tests/ecma_2/FunctionObjects/apply-001-n.js @@ -38,9 +38,9 @@ * * ***** END LICENSE BLOCK ***** */ -writeLineToLog("STATUS: f.apply crash test."); +print("STATUS: f.apply crash test."); -writeLineToLog("BUGNUMBER: 21836"); +print("BUGNUMBER: 21836"); function f () { diff --git a/mozilla/js/tests/ecma_2/LexicalConventions/keywords-001.js b/mozilla/js/tests/ecma_2/LexicalConventions/keywords-001.js index f4d709323b9..638517cff9a 100644 --- a/mozilla/js/tests/ecma_2/LexicalConventions/keywords-001.js +++ b/mozilla/js/tests/ecma_2/LexicalConventions/keywords-001.js @@ -14,7 +14,7 @@ var TITLE = "Keywords"; startTest(); -writeLineToLog("This test requires option javascript.options.strict enabled"); +print("This test requires option javascript.options.strict enabled"); var jsOptions = new JavaScriptOptions(); jsOptions.setOption('strict', true); diff --git a/mozilla/js/tests/ecma_2/Statements/dowhile-005.js b/mozilla/js/tests/ecma_2/Statements/dowhile-005.js index a08da1aba61..947dfac10e3 100644 --- a/mozilla/js/tests/ecma_2/Statements/dowhile-005.js +++ b/mozilla/js/tests/ecma_2/Statements/dowhile-005.js @@ -41,7 +41,7 @@ outer: { } result2 = "pass"; break outer; - writeLineToLog(i); + print(i); } while ( i++ < 100 ); } diff --git a/mozilla/js/tests/ecma_2/browser.js b/mozilla/js/tests/ecma_2/browser.js index 79fb3c9a3a2..85ec9839e21 100644 --- a/mozilla/js/tests/ecma_2/browser.js +++ b/mozilla/js/tests/ecma_2/browser.js @@ -73,49 +73,61 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); return passed; } - /* * The earlier versions of the test code used exceptions * to terminate the test script in "negative" test cases @@ -139,7 +151,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -186,6 +198,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -198,12 +220,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/ecma_2/jsref.js b/mozilla/js/tests/ecma_2/jsref.js index 7543474f05b..e5a3ddfeed1 100644 --- a/mozilla/js/tests/ecma_2/jsref.js +++ b/mozilla/js/tests/ecma_2/jsref.js @@ -55,7 +55,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } } function startTest() { @@ -133,14 +133,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } diff --git a/mozilla/js/tests/ecma_2/shell.js b/mozilla/js/tests/ecma_2/shell.js index bb355907a0b..1f5d0c02348 100644 --- a/mozilla/js/tests/ecma_2/shell.js +++ b/mozilla/js/tests/ecma_2/shell.js @@ -88,7 +88,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -128,7 +128,7 @@ function startTest() { writeHeaderToLog( SECTION + " "+ TITLE); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } @@ -147,7 +147,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -215,13 +215,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} function writeHeaderToLog( string ) { print( string ); } @@ -247,7 +244,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } diff --git a/mozilla/js/tests/ecma_3/Date/browser.js b/mozilla/js/tests/ecma_3/Date/browser.js index 6405b1554d3..63da2da7e38 100644 --- a/mozilla/js/tests/ecma_3/Date/browser.js +++ b/mozilla/js/tests/ecma_3/Date/browser.js @@ -62,10 +62,14 @@ function htmlesc(str) { return str; } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - document.write( string + "
\n"); +function print() { + var s = ''; + var a; for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } + DocumentWrite(s); } function writeHeaderToLog( string ) { @@ -104,7 +108,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + diff --git a/mozilla/js/tests/ecma_3/Date/shell.js b/mozilla/js/tests/ecma_3/Date/shell.js index ad08875bbb6..933e0841723 100644 --- a/mozilla/js/tests/ecma_3/Date/shell.js +++ b/mozilla/js/tests/ecma_3/Date/shell.js @@ -84,7 +84,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -123,7 +123,7 @@ function startTest() { // print out bugnumber if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } @@ -139,7 +139,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -204,12 +204,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } @@ -236,7 +234,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } @@ -542,7 +540,7 @@ function DaylightSavingTA( t ) { // Daylight Savings Time starts on the first Sunday in April at 2:00AM in // PST. Other time zones will need to override this function. - writeLineToLog( new Date( UTC(dst_start + LocalTZA())) ); + print( new Date( UTC(dst_start + LocalTZA())) ); return UTC(dst_start + LocalTZA()); } @@ -691,7 +689,7 @@ function ToInteger( t ) { function Enumerate ( o ) { var p; for ( p in o ) { - writeLineToLog( p +": " + o[p] ); + print( p +": " + o[p] ); } } diff --git a/mozilla/js/tests/ecma_3/Exceptions/binding-001.js b/mozilla/js/tests/ecma_3/Exceptions/binding-001.js index 142a4ef0f7f..782e6cb5b42 100644 --- a/mozilla/js/tests/ecma_3/Exceptions/binding-001.js +++ b/mozilla/js/tests/ecma_3/Exceptions/binding-001.js @@ -66,7 +66,7 @@ var expect= ERR_REF_YES; try { var f = function sum(){}; - writeLineToLog(sum); + print(sum); } catch (e) { diff --git a/mozilla/js/tests/ecma_3/Statements/regress-121744.js b/mozilla/js/tests/ecma_3/Statements/regress-121744.js index ec1287aec87..cb1f166a602 100644 --- a/mozilla/js/tests/ecma_3/Statements/regress-121744.js +++ b/mozilla/js/tests/ecma_3/Statements/regress-121744.js @@ -94,7 +94,7 @@ try { for (var i in undefined) { - writeLineToLog(i); + print(i); } } catch(e) @@ -118,7 +118,7 @@ try { for (var i in null) { - writeLineToLog(i); + print(i); } } catch(e) @@ -145,7 +145,7 @@ try { for (var i in this.ZZZ) { - writeLineToLog(i); + print(i); } } catch(e) @@ -170,7 +170,7 @@ try { for (var i in 'bbb'.match(/aaa/)) { - writeLineToLog(i); + print(i); } } catch(e) diff --git a/mozilla/js/tests/ecma_3/Statements/regress-131348.js b/mozilla/js/tests/ecma_3/Statements/regress-131348.js index 4e6ee8fc7da..24c39fa20ee 100644 --- a/mozilla/js/tests/ecma_3/Statements/regress-131348.js +++ b/mozilla/js/tests/ecma_3/Statements/regress-131348.js @@ -75,7 +75,7 @@ try { for (var i in undefined) { - writeLineToLog(i); + print(i); } } catch(e) @@ -93,7 +93,7 @@ try { for (var i in null) { - writeLineToLog(i); + print(i); } } catch(e) @@ -117,7 +117,7 @@ try { for (var i in this.ZZZ) { - writeLineToLog(i); + print(i); } } catch(e) @@ -139,7 +139,7 @@ try { for (var i in 'bbb'.match(/aaa/)) { - writeLineToLog(i); + print(i); } } catch(e) diff --git a/mozilla/js/tests/ecma_3/browser.js b/mozilla/js/tests/ecma_3/browser.js index 28e1785f345..c444fe4e548 100755 --- a/mozilla/js/tests/ecma_3/browser.js +++ b/mozilla/js/tests/ecma_3/browser.js @@ -71,19 +71,27 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } var testcases = new Array(); @@ -181,6 +189,16 @@ function quit() window.onerror = reportFailure; function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -193,12 +211,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/ecma_3/shell.js b/mozilla/js/tests/ecma_3/shell.js index ac700b680dd..ac6f227d74b 100644 --- a/mozilla/js/tests/ecma_3/shell.js +++ b/mozilla/js/tests/ecma_3/shell.js @@ -46,9 +46,7 @@ var SECT_SUFFIX = ' of test -'; var VERBOSE = false; var callStack = new Array(); -function writeLineToLog( string ) { - print( string ); -} + /* * The test driver searches for such a phrase in the test output. * If such phrase exists, it will set n as the expected exit code. @@ -56,7 +54,7 @@ function writeLineToLog( string ) { function expectExitCode(n) { - writeLineToLog('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); + print('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); } @@ -89,7 +87,7 @@ function reportFailure (msg) var prefix = (funcName) ? "[reported from " + funcName + "] ": ""; for (var i=0; i\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

" ); + string = String(string); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { + string = String(string); + + if (typeof dump == 'function') + { + dump( string + '\n'); + } + string = string.replace(/[<>&]/g, htmlesc); + var s = ""+ string ; s += "" ; s += ( passed ) ? "  " + PASSED : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); - if (typeof dump == 'function') - { - dump( string + '\n'); - } + DocumentWrite( s + "

" ); return passed; } @@ -135,7 +151,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -180,6 +196,16 @@ function version(v) { } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -192,12 +218,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_1/jsref.js b/mozilla/js/tests/js1_1/jsref.js index 05fcdc89fac..1e82e8c5e4c 100644 --- a/mozilla/js/tests/js1_1/jsref.js +++ b/mozilla/js/tests/js1_1/jsref.js @@ -122,14 +122,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } diff --git a/mozilla/js/tests/js1_1/shell.js b/mozilla/js/tests/js1_1/shell.js index bb0fd472053..62458a24ae9 100644 --- a/mozilla/js/tests/js1_1/shell.js +++ b/mozilla/js/tests/js1_1/shell.js @@ -78,7 +78,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -99,7 +99,7 @@ function startTest() { version(110); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } testcases = new Array(); @@ -120,7 +120,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -183,12 +183,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } @@ -214,7 +212,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } diff --git a/mozilla/js/tests/js1_2/browser.js b/mozilla/js/tests/js1_2/browser.js index dd55112f4ee..7b10177e261 100644 --- a/mozilla/js/tests/js1_2/browser.js +++ b/mozilla/js/tests/js1_2/browser.js @@ -73,45 +73,58 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); return passed; } @@ -138,7 +151,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -185,6 +198,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -197,12 +220,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_2/jsref.js b/mozilla/js/tests/js1_2/jsref.js index 8328702a064..eb43b0b5054 100644 --- a/mozilla/js/tests/js1_2/jsref.js +++ b/mozilla/js/tests/js1_2/jsref.js @@ -84,7 +84,7 @@ function startTest() { // print out bugnumber if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } testcases = new Array(); @@ -156,12 +156,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } diff --git a/mozilla/js/tests/js1_2/regress/regress-144834.js b/mozilla/js/tests/js1_2/regress/regress-144834.js index 41bfc6af9ec..ff85e170429 100644 --- a/mozilla/js/tests/js1_2/regress/regress-144834.js +++ b/mozilla/js/tests/js1_2/regress/regress-144834.js @@ -47,8 +47,8 @@ var bug = 144834; var summary = 'Local var having same name as switch label inside function'; -writeLineToLog(bug); -writeLineToLog(summary); +print(bug); +print(summary); function RedrawSched() diff --git a/mozilla/js/tests/js1_2/shell.js b/mozilla/js/tests/js1_2/shell.js index 46ceebd7f67..c8533bd2cab 100644 --- a/mozilla/js/tests/js1_2/shell.js +++ b/mozilla/js/tests/js1_2/shell.js @@ -77,7 +77,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -94,7 +94,7 @@ function startTest() { version(120); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } @@ -112,7 +112,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -175,12 +175,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } diff --git a/mozilla/js/tests/js1_2/statements/switch2.js b/mozilla/js/tests/js1_2/statements/switch2.js index 4cb3d993eef..5ea92d97540 100644 --- a/mozilla/js/tests/js1_2/statements/switch2.js +++ b/mozilla/js/tests/js1_2/statements/switch2.js @@ -181,7 +181,7 @@ case 1: } new TestCase(SECTION, 'switch statement', se, 2); -writeLineToLog("hi"); +print("hi"); test(); diff --git a/mozilla/js/tests/js1_2/version120/regress-99663.js b/mozilla/js/tests/js1_2/version120/regress-99663.js index 7e6b1683ac9..b9479735038 100644 --- a/mozilla/js/tests/js1_2/version120/regress-99663.js +++ b/mozilla/js/tests/js1_2/version120/regress-99663.js @@ -151,8 +151,8 @@ function addThis() function test() { - writeLineToLog ('Bug Number ' + bug); - writeLineToLog ('STATUS: ' + summary); + print ('Bug Number ' + bug); + print ('STATUS: ' + summary); for (var i=0; i\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - DocumentWrite( "

" + string + "

" ); -} -function writeFormattedResult( expect, actual, string, passed ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); if (typeof dump == 'function') { dump( string + '\n'); } - return passed; + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } +function writeFormattedResult( expect, actual, string, passed ) { + string = String(string); + + if (typeof dump == 'function') + { + dump( string + '\n'); + } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); + return passed; +} /* * The earlier versions of the test code used exceptions @@ -133,7 +151,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -178,6 +196,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -190,12 +218,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_3/jsref.js b/mozilla/js/tests/js1_3/jsref.js index dd611a7bbdb..3375fe13950 100644 --- a/mozilla/js/tests/js1_3/jsref.js +++ b/mozilla/js/tests/js1_3/jsref.js @@ -56,7 +56,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } } function startTest() { @@ -130,14 +130,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } @@ -193,6 +190,6 @@ function err( msg, page, line ) { function Enumerate ( o ) { var p; for ( p in o ) { - writeLineToLog( p +": " + o[p] ); + print( p +": " + o[p] ); } } diff --git a/mozilla/js/tests/js1_3/shell.js b/mozilla/js/tests/js1_3/shell.js index 2771bb03f5e..e927fb1d925 100644 --- a/mozilla/js/tests/js1_3/shell.js +++ b/mozilla/js/tests/js1_3/shell.js @@ -87,7 +87,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -123,7 +123,7 @@ function startTest() { writeHeaderToLog( SECTION + " "+ TITLE); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } function test() { @@ -140,7 +140,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -204,12 +204,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } @@ -236,7 +234,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } diff --git a/mozilla/js/tests/js1_4/Regress/function-002.js b/mozilla/js/tests/js1_4/Regress/function-002.js index 64e649382fc..2cea9d836b1 100644 --- a/mozilla/js/tests/js1_4/Regress/function-002.js +++ b/mozilla/js/tests/js1_4/Regress/function-002.js @@ -72,7 +72,7 @@ startTest(); writeHeaderToLog( SECTION + " "+ TITLE); dec1 = "function f1(x,y){++x, --y}"; -dec2 = "function f2(){var y; f1(1,2); y=new Date(); writeLineToLog(y.toString())}"; +dec2 = "function f2(){var y; f1(1,2); y=new Date(); print(y.toString())}"; eval(dec1); eval(dec2); diff --git a/mozilla/js/tests/js1_4/browser.js b/mozilla/js/tests/js1_4/browser.js index ae779d89a7c..e997b1e56e1 100644 --- a/mozilla/js/tests/js1_4/browser.js +++ b/mozilla/js/tests/js1_4/browser.js @@ -73,45 +73,58 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); return passed; } @@ -138,7 +151,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -185,6 +198,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -197,12 +220,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_4/jsref.js b/mozilla/js/tests/js1_4/jsref.js index 982d14ad74c..91817685d47 100644 --- a/mozilla/js/tests/js1_4/jsref.js +++ b/mozilla/js/tests/js1_4/jsref.js @@ -120,14 +120,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } diff --git a/mozilla/js/tests/js1_4/shell.js b/mozilla/js/tests/js1_4/shell.js index 470ec6c8143..6b3e75929e0 100644 --- a/mozilla/js/tests/js1_4/shell.js +++ b/mozilla/js/tests/js1_4/shell.js @@ -87,7 +87,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -125,7 +125,7 @@ version ( 110 ); writeHeaderToLog( SECTION + " "+ TITLE); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } @@ -143,7 +143,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -206,12 +206,10 @@ function writeTestCaseResult( expect, actual, string ) { function writeFormattedResult( expect, actual, string, passed ) { var s = string ; s += ( passed ) ? PASSED : FAILED + expect; - writeLineToLog( s); + print( s); return passed; } -function writeLineToLog( string ) { - print( string ); -} + function writeHeaderToLog( string ) { print( string ); } @@ -237,7 +235,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } diff --git a/mozilla/js/tests/js1_5/Exceptions/regress-342359.js b/mozilla/js/tests/js1_5/Exceptions/regress-342359.js index 973da80b842..405f1ec52e4 100755 --- a/mozilla/js/tests/js1_5/Exceptions/regress-342359.js +++ b/mozilla/js/tests/js1_5/Exceptions/regress-342359.js @@ -51,7 +51,7 @@ try } catch(ex) { - writeLineToLog(ex + ''); + print(ex + ''); } expect = 5; diff --git a/mozilla/js/tests/js1_5/Function/regress-348986.js b/mozilla/js/tests/js1_5/Function/regress-348986.js index 294dedcb441..16b688727c3 100755 --- a/mozilla/js/tests/js1_5/Function/regress-348986.js +++ b/mozilla/js/tests/js1_5/Function/regress-348986.js @@ -74,7 +74,7 @@ function test() if (n == 0) throw "unexpected"; - writeLineToLog("Max nested function leveles:"+n); + print("Max nested function leveles:"+n); n = findActionMax(function(n) { try { @@ -87,11 +87,11 @@ function test() } }); - writeLineToLog("Max callAfterConsumingCStack levels:"+n); + print("Max callAfterConsumingCStack levels:"+n); // Here n is max possible value when callAfterConsumingCStack(n, emptyFunction) -// does not trigger stackOverflow. Decrease it slightly to give some C stack space -// for deepestFunction.toSource() +// does not trigger stackOverflow. Decrease it slightly to give some C stack +// space for deepestFunction.toSource() n = Math.max(0, n - 10); try { @@ -104,7 +104,7 @@ function test() throw e; } - writeLineToLog('Done'); + print('Done'); expect = true; actual = true; reportCompare(expect, true, summary); diff --git a/mozilla/js/tests/js1_5/GC/regress-104584.js b/mozilla/js/tests/js1_5/GC/regress-104584.js index 20f97a73a62..ff4c194c2f6 100755 --- a/mozilla/js/tests/js1_5/GC/regress-104584.js +++ b/mozilla/js/tests/js1_5/GC/regress-104584.js @@ -71,7 +71,7 @@ function G(obj) { if(!obj) obj = {}; - writeLineToLog(obj); + print(obj); gc(); - writeLineToLog(obj); + print(obj); } diff --git a/mozilla/js/tests/js1_5/GC/regress-319980-01.js b/mozilla/js/tests/js1_5/GC/regress-319980-01.js index 8638bb0b28a..a77ee3e51c4 100755 --- a/mozilla/js/tests/js1_5/GC/regress-319980-01.js +++ b/mozilla/js/tests/js1_5/GC/regress-319980-01.js @@ -43,7 +43,7 @@ var expect = 'Normal Exit'; printBugNumber (bug); printStatus (summary); -writeLineToLog ('This test should never fail explicitly. ' + +print ('This test should never fail explicitly. ' + 'You must view the memory usage during the test. ' + 'This test fails if memory usage for each subtest grows'); @@ -89,7 +89,7 @@ function testFuncWatcher() } ++currTest; - writeLineToLog('Executing test ' + currTest + '\n'); + print('Executing test ' + currTest + '\n'); testFuncWatcherId = setTimeout("testFuncWatcher()", timeOut); testFuncTimerId = setTimeout(testFunc, interval); diff --git a/mozilla/js/tests/js1_5/GC/regress-331719.js b/mozilla/js/tests/js1_5/GC/regress-331719.js index 7b3af8bbb8f..ffae249eb8c 100755 --- a/mozilla/js/tests/js1_5/GC/regress-331719.js +++ b/mozilla/js/tests/js1_5/GC/regress-331719.js @@ -42,7 +42,7 @@ var expect = ''; printBugNumber (bug); printStatus (summary); -writeLineToLog('This test requires WAY_TOO_MUCH_GC'); +print('This test requires WAY_TOO_MUCH_GC'); expect = 'No'; actual = 'No'.replace(/\&\&/g, '&'); diff --git a/mozilla/js/tests/js1_5/GC/regress-338653.js b/mozilla/js/tests/js1_5/GC/regress-338653.js index 415ab3594d7..af44e4d7cb2 100755 --- a/mozilla/js/tests/js1_5/GC/regress-338653.js +++ b/mozilla/js/tests/js1_5/GC/regress-338653.js @@ -44,7 +44,7 @@ var expect = 'No Crash'; printBugNumber (bug); printStatus (summary); -writeLineToLog('This test should never fail explicitly. ' + +print('This test should never fail explicitly. ' + 'You must view the memory usage during the test. ' + 'This test fails if the memory usage repeatedly spikes ' + 'by several hundred megabytes.'); diff --git a/mozilla/js/tests/js1_5/GC/regress-345967.js b/mozilla/js/tests/js1_5/GC/regress-345967.js index cfdc50298d7..d657f8e7566 100755 --- a/mozilla/js/tests/js1_5/GC/regress-345967.js +++ b/mozilla/js/tests/js1_5/GC/regress-345967.js @@ -54,8 +54,8 @@ function test() expectExitCode(0); expectExitCode(3); - writeLineToLog('This test will probably run out of memory'); - writeLineToLog('This test really should only fail on 64 bit machines'); + print('This test will probably run out of memory'); + print('This test really should only fail on 64 bit machines'); var JSVAL_INT_MAX = (1 << 30) - 1; @@ -90,7 +90,7 @@ function test() expect = 0; actual = a[JSVAL_INT_MAX]; if (expect !== actual) - writeLineToLog("BAD"); + print("BAD"); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/GC/regress-348532.js b/mozilla/js/tests/js1_5/GC/regress-348532.js index b9298e3929c..e98406563de 100755 --- a/mozilla/js/tests/js1_5/GC/regress-348532.js +++ b/mozilla/js/tests/js1_5/GC/regress-348532.js @@ -70,7 +70,7 @@ function test() // 2^23 * 256 or 2^31 in length var error = err(s,s); - writeLineToLog(error.stack.length); + print(error.stack.length); expect = true; actual = (error.stack.length > 0); diff --git a/mozilla/js/tests/js1_5/Object/regress-338709.js b/mozilla/js/tests/js1_5/Object/regress-338709.js index 1395330e995..7991ccf0881 100755 --- a/mozilla/js/tests/js1_5/Object/regress-338709.js +++ b/mozilla/js/tests/js1_5/Object/regress-338709.js @@ -54,7 +54,7 @@ catch (LN2) { } actual = Math.LN2; -writeLineToLog("Math.LN2 = " + Math.LN2) +print("Math.LN2 = " + Math.LN2) reportCompare(expect, actual, summary); var s = new String("abc"); @@ -68,7 +68,7 @@ catch (length) { } actual = s.length; -writeLineToLog("length of '" + s + "' = " + s.length) +print("length of '" + s + "' = " + s.length) reportCompare(expect, actual, summary); var re = /xy/m; @@ -82,7 +82,7 @@ catch (multiline) { } actual = re.multiline; -writeLineToLog("re.multiline = " + re.multiline) +print("re.multiline = " + re.multiline) reportCompare(expect, actual, summary); if ("document" in this) { @@ -97,7 +97,7 @@ if ("document" in this) { { } actual = document.documentElement + ''; - writeLineToLog("document.documentElement = " + document.documentElement) + print("document.documentElement = " + document.documentElement) } else Object = this.constructor diff --git a/mozilla/js/tests/js1_5/Regress/regress-104077.js b/mozilla/js/tests/js1_5/Regress/regress-104077.js index db91d85d686..c85c8460066 100644 --- a/mozilla/js/tests/js1_5/Regress/regress-104077.js +++ b/mozilla/js/tests/js1_5/Regress/regress-104077.js @@ -109,7 +109,7 @@ function tryThis() } finally { - writeLineToLog("In finally case of tryThis() function"); + print("In finally case of tryThis() function"); } } return i; @@ -130,7 +130,7 @@ function myTest(x) with (obj) { msg = (x != null) ? "NO" : "YES"; - writeLineToLog("Is the provided argument to myTest() null? : " + msg); + print("Is the provided argument to myTest() null? : " + msg); try { @@ -138,7 +138,7 @@ function myTest(x) } catch(e) { - writeLineToLog("Caught thrown exception = " + e); + print("Caught thrown exception = " + e); } } @@ -172,7 +172,7 @@ function addValues_2(obj) } catch(e) { - writeLineToLog('Caught an exception in addValues_2() function: ' + e); + print('Caught an exception in addValues_2() function: ' + e); } } } @@ -337,7 +337,7 @@ function addValues_3(obj) catch (e) { sum += 1; - writeLineToLog(e); + print(e); } } } @@ -347,17 +347,17 @@ function addValues_3(obj) try { sum +=1; - writeLineToLog("In finally block of addValues_3() function: sum = " + sum); + print("In finally block of addValues_3() function: sum = " + sum); } catch (e if e == 42) { sum +=1; - writeLineToLog('In finally catch block of addValues_3() function: sum = ' + sum + ', e = ' + e); + print('In finally catch block of addValues_3() function: sum = ' + sum + ', e = ' + e); } finally { sum +=1; - writeLineToLog("In finally finally block of addValues_3() function: sum = " + sum); + print("In finally finally block of addValues_3() function: sum = " + sum); return sum; } } @@ -400,7 +400,7 @@ function addValues_4(obj) catch (e) { sum += 1; - writeLineToLog(e); + print(e); } } } @@ -410,22 +410,22 @@ function addValues_4(obj) try { sum += 1; - writeLineToLog("In finally block of addValues_4() function: sum = " + sum); + print("In finally block of addValues_4() function: sum = " + sum); } catch (e if e == 42) { sum += 1; - writeLineToLog("In 1st finally catch block of addValues_4() function: sum = " + sum + ", e = " + e); + print("In 1st finally catch block of addValues_4() function: sum = " + sum + ", e = " + e); } catch (e if e == 43) { sum += 1; - writeLineToLog("In 2nd finally catch block of addValues_4() function: sum = " + sum + ", e = " + e); + print("In 2nd finally catch block of addValues_4() function: sum = " + sum + ", e = " + e); } finally { sum += 1; - writeLineToLog("In finally finally block of addValues_4() function: sum = " + sum); + print("In finally finally block of addValues_4() function: sum = " + sum); return sum; } } @@ -468,7 +468,7 @@ function addValues_5(obj) catch (e) { sum += 1; - writeLineToLog(e); + print(e); } } } @@ -478,17 +478,17 @@ function addValues_5(obj) try { sum += 1; - writeLineToLog("In finally block of addValues_5() function: sum = " + sum); + print("In finally block of addValues_5() function: sum = " + sum); } catch (e) { sum += 1; - writeLineToLog("In finally catch block of addValues_5() function: sum = " + sum + ", e = " + e); + print("In finally catch block of addValues_5() function: sum = " + sum + ", e = " + e); } finally { sum += 1; - writeLineToLog("In finally finally block of addValues_5() function: sum = " + sum); + print("In finally finally block of addValues_5() function: sum = " + sum); return sum; } } @@ -524,7 +524,7 @@ function testObj(obj) } finally { - writeLineToLog("in finally block of testObj() function"); + print("in finally block of testObj() function"); return 999; } } @@ -555,7 +555,7 @@ function a120571() } // this caused a crash! Test to see that it doesn't now. -writeLineToLog(a120571); +print(a120571); // Now test that we have a non-null value for a120571.toString() status = inSection(13); @@ -588,7 +588,7 @@ function b() } // this caused a crash!!! Test to see that it doesn't now. -writeLineToLog(b); +print(b); // Now test that we have a non-null value for b.toString() status = inSection(14); diff --git a/mozilla/js/tests/js1_5/Regress/regress-168347.js b/mozilla/js/tests/js1_5/Regress/regress-168347.js index 4dcfd3564e5..069580cc88d 100644 --- a/mozilla/js/tests/js1_5/Regress/regress-168347.js +++ b/mozilla/js/tests/js1_5/Regress/regress-168347.js @@ -62,51 +62,51 @@ sFunc += ''; sFunc += ' try'; sFunc += ' {'; sFunc += ' f.i = f.i + 1;'; -sFunc += ' writeLineToLog("i = i+1 succeeded \ti = " + f.i);'; +sFunc += ' print("i = i+1 succeeded \ti = " + f.i);'; sFunc += ' }'; sFunc += ' catch(e)'; sFunc += ' {'; -sFunc += ' writeLineToLog("i = i+1 failed with " + e + "\ti = " + f.i);'; +sFunc += ' print("i = i+1 failed with " + e + "\ti = " + f.i);'; sFunc += ' }'; sFunc += ''; sFunc += ' try'; sFunc += ' {'; sFunc += ' ++f.i;'; -sFunc += ' writeLineToLog("++i succeeded \t\ti = " + f.i);'; +sFunc += ' print("++i succeeded \t\ti = " + f.i);'; sFunc += ' }'; sFunc += ' catch(e)'; sFunc += ' {'; -sFunc += ' writeLineToLog("++i failed with " + e + "\ti = " + f.i);'; +sFunc += ' print("++i failed with " + e + "\ti = " + f.i);'; sFunc += ' }'; sFunc += ''; sFunc += ' try'; sFunc += ' {'; sFunc += ' f.i++;'; -sFunc += ' writeLineToLog("i++ succeeded \t\ti = " + f.i);'; +sFunc += ' print("i++ succeeded \t\ti = " + f.i);'; sFunc += ' }'; sFunc += ' catch(e)'; sFunc += ' {'; -sFunc += ' writeLineToLog("i++ failed with " + e + "\ti = " + f.i);'; +sFunc += ' print("i++ failed with " + e + "\ti = " + f.i);'; sFunc += ' }'; sFunc += ''; sFunc += ' try'; sFunc += ' {'; sFunc += ' --f.i;'; -sFunc += ' writeLineToLog("--i succeeded \t\ti = " + f.i);'; +sFunc += ' print("--i succeeded \t\ti = " + f.i);'; sFunc += ' }'; sFunc += ' catch(e)'; sFunc += ' {'; -sFunc += ' writeLineToLog("--i failed with " + e + "\ti = " + f.i);'; +sFunc += ' print("--i failed with " + e + "\ti = " + f.i);'; sFunc += ' }'; sFunc += ''; sFunc += ' try'; sFunc += ' {'; sFunc += ' f.i--;'; -sFunc += ' writeLineToLog("i-- succeeded \t\ti = " + f.i);'; +sFunc += ' print("i-- succeeded \t\ti = " + f.i);'; sFunc += ' }'; sFunc += ' catch(e)'; sFunc += ' {'; -sFunc += ' writeLineToLog("i-- failed with " + e + "\ti = " + f.i);'; +sFunc += ' print("i-- failed with " + e + "\ti = " + f.i);'; sFunc += ' }'; sFunc += '}'; diff --git a/mozilla/js/tests/js1_5/Regress/regress-327608.js b/mozilla/js/tests/js1_5/Regress/regress-327608.js index 54ea0f26ad9..2268e7ea354 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-327608.js +++ b/mozilla/js/tests/js1_5/Regress/regress-327608.js @@ -42,7 +42,7 @@ var expect = 'No Crash'; printBugNumber (bug); printStatus (summary); -writeLineToLog('This test runs only in the browser'); +print('This test runs only in the browser'); function countProps(obj) { diff --git a/mozilla/js/tests/js1_5/Regress/regress-340199.js b/mozilla/js/tests/js1_5/Regress/regress-340199.js index fd906b26237..739428c962d 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-340199.js +++ b/mozilla/js/tests/js1_5/Regress/regress-340199.js @@ -47,7 +47,7 @@ if (typeof window != 'undefined' && typeof XPCNativeWrapper != 'undefined') { Object.prototype.__iterator__ = - function () { actual = "User code called"; writeLineToLog(actual); }; + function () { actual = "User code called"; print(actual); }; try { @@ -55,11 +55,11 @@ if (typeof window != 'undefined' && { try { - writeLineToLog(i); + print(i); } catch(ex) { - writeLineToLog(ex); + print(ex); } } } diff --git a/mozilla/js/tests/js1_5/Regress/regress-340369.js b/mozilla/js/tests/js1_5/Regress/regress-340369.js index bc43840975a..e513c58c7ed 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-340369.js +++ b/mozilla/js/tests/js1_5/Regress/regress-340369.js @@ -50,7 +50,7 @@ try } catch(ex) { - writeLineToLog(ex+''); + print(ex+''); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-341360.js b/mozilla/js/tests/js1_5/Regress/regress-341360.js index b838898deef..48418a6871d 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-341360.js +++ b/mozilla/js/tests/js1_5/Regress/regress-341360.js @@ -48,14 +48,14 @@ function xxx() { if(t != null) { - writeLineToLog('Clearing interval...'); + print('Clearing interval...'); window.clearInterval(t); t = null; setTimeout('yyy()', 2000); } else { - writeLineToLog('Clearing interval failed...'); + print('Clearing interval failed...'); actual = "Broken"; gDelayTestDriverEnd = false; reportCompare(expect, actual, summary); @@ -65,7 +65,7 @@ function xxx() function yyy() { - writeLineToLog('Checking result...'); + print('Checking result...'); actual = 'Ok'; gDelayTestDriverEnd = false; reportCompare(expect, actual, summary); @@ -79,7 +79,7 @@ if (typeof window == 'undefined') } else { - writeLineToLog('Start...'); + print('Start...'); gDelayTestDriverEnd = true; var t = window.setInterval(xxx, 1000); } diff --git a/mozilla/js/tests/js1_5/Regress/regress-343713.js b/mozilla/js/tests/js1_5/Regress/regress-343713.js index 224847d2b4e..aa9560b1873 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-343713.js +++ b/mozilla/js/tests/js1_5/Regress/regress-343713.js @@ -46,7 +46,7 @@ printStatus (summary); with (this) with (this) { eval("function outer() { function inner() { " + - "writeLineToLog('inner');} inner(); writeLineToLog('outer');} outer()"); + "print('inner');} inner(); print('outer');} outer()"); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-346494-01.js b/mozilla/js/tests/js1_5/Regress/regress-346494-01.js index 73dcc077917..af3a6ced5ef 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-346494-01.js +++ b/mozilla/js/tests/js1_5/Regress/regress-346494-01.js @@ -52,10 +52,10 @@ function test() printStatus (summary); var pfx = "(function (x) {try {throw x}", - cg1 = " catch (e if e === 42) {var v = 'catch guard 1 ' + e; actual += v + ','; writeLineToLog(v);}" - cg2 = " catch (e if e === 43) {var v = 'catch guard 2 ' + e; actual += v + ','; writeLineToLog(v);}" - cat = " catch (e) {var v = 'catch all ' + e; actual += v + ','; writeLineToLog(v);}" - fin = " finally{var v = 'fin'; actual += v + ','; writeLineToLog(v)}", + cg1 = " catch (e if e === 42) {var v = 'catch guard 1 ' + e; actual += v + ','; print(v);}" + cg2 = " catch (e if e === 43) {var v = 'catch guard 2 ' + e; actual += v + ','; print(v);}" + cat = " catch (e) {var v = 'catch all ' + e; actual += v + ','; print(v);}" + fin = " finally{var v = 'fin'; actual += v + ','; print(v)}", end = "})"; var exphash = { @@ -96,23 +96,23 @@ function test() ]; for (var i in src) { - writeLineToLog("\n=== " + src[i]); + print("\n=== " + src[i]); var f = eval(src[i]); - writeLineToLog(src[i]); + print(src[i]); var exp = eval(expsrc[i]); // dis(f); - writeLineToLog('decompiling: ' + f); + print('decompiling: ' + f); actual = ''; - try { expect = exp(42); f(42) } catch (e) { writeLineToLog('tried f(42), caught ' + e) } + try { expect = exp(42); f(42) } catch (e) { print('tried f(42), caught ' + e) } reportCompare(expect, actual, summary); actual = ''; - try { expect = exp(43); f(43) } catch (e) { writeLineToLog('tried f(43), caught ' + e) } + try { expect = exp(43); f(43) } catch (e) { print('tried f(43), caught ' + e) } reportCompare(expect, actual, summary); actual = ''; - try { expect = exp(44); f(44) } catch (e) { writeLineToLog('tried f(44), caught ' + e) } + try { expect = exp(44); f(44) } catch (e) { print('tried f(44), caught ' + e) } reportCompare(expect, actual, summary); } diff --git a/mozilla/js/tests/js1_5/Regress/regress-346801.js b/mozilla/js/tests/js1_5/Regress/regress-346801.js index c8cb6b7edc8..29c94b66dda 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-346801.js +++ b/mozilla/js/tests/js1_5/Regress/regress-346801.js @@ -62,21 +62,21 @@ function test() } Object.extend = function(destination, source) { - writeLineToLog("Start"); -// writeLineToLog(destination); -// writeLineToLog(source); + print("Start"); +// print(destination); +// print(source); if(destination==source) - writeLineToLog("Same desination and source!"); + print("Same desination and source!"); var i = 0; for (property in source) { -// writeLineToLog(" " + property); +// print(" " + property); destination[property] = source[property]; ++i; if (i > 1000) { throw "Hang"; } } - writeLineToLog("Finish"); + print("Finish"); return destination; } diff --git a/mozilla/js/tests/js1_5/Regress/regress-347306-01.js b/mozilla/js/tests/js1_5/Regress/regress-347306-01.js index 14269026023..603783d5983 100644 --- a/mozilla/js/tests/js1_5/Regress/regress-347306-01.js +++ b/mozilla/js/tests/js1_5/Regress/regress-347306-01.js @@ -77,7 +77,7 @@ function testSource(n) var end = new Date(); - writeLineToLog("Size: " + n + ", Time: " + (end - start) + " ms"); + print("Size: " + n + ", Time: " + (end - start) + " ms"); return end - start; } diff --git a/mozilla/js/tests/js1_5/Regress/regress-347306-02.js b/mozilla/js/tests/js1_5/Regress/regress-347306-02.js index 512a3a6139b..6a7cc5a66d7 100644 --- a/mozilla/js/tests/js1_5/Regress/regress-347306-02.js +++ b/mozilla/js/tests/js1_5/Regress/regress-347306-02.js @@ -76,7 +76,7 @@ function testSource(n) var end = new Date(); - writeLineToLog("Size: " + n + ", Time: " + (end - start) + " ms"); + print("Size: " + n + ", Time: " + (end - start) + " ms"); return end - start; } diff --git a/mozilla/js/tests/js1_5/Regress/regress-349482-01.js b/mozilla/js/tests/js1_5/Regress/regress-349482-01.js index 75b7cade0f6..740981a278d 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349482-01.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349482-01.js @@ -52,7 +52,7 @@ function test() printStatus (summary); var f = function() { for(p in {}) try{}catch(e){} }; - writeLineToLog(f.toString()); + print(f.toString()); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-349482-02.js b/mozilla/js/tests/js1_5/Regress/regress-349482-02.js index d0fca0c7bea..275ffd99d3a 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349482-02.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349482-02.js @@ -52,7 +52,7 @@ function test() printStatus (summary); var f = function() { with({}) { try{}catch(e){} } } - writeLineToLog(f.toString()); + print(f.toString()); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-349484.js b/mozilla/js/tests/js1_5/Regress/regress-349484.js index 37f0772f622..30a59fd98e6 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349484.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349484.js @@ -54,13 +54,13 @@ function test() expect = 'function () {\n export x;\n alert(5);\n}'; var f = function() { export x; alert(5); }; actual = f.toString(); - writeLineToLog(f.toString()); + print(f.toString()); compareSource(expect, actual, summary); expect = 'function () {\n import o.x;\n alert(5);\n}'; f = function () { import o.x; alert(5); } actual = f.toString(); - writeLineToLog(f.toString()); + print(f.toString()); compareSource(expect, actual, summary); exitFunc ('test'); diff --git a/mozilla/js/tests/js1_5/Regress/regress-349489.js b/mozilla/js/tests/js1_5/Regress/regress-349489.js index 755db979170..b38d69c2602 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349489.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349489.js @@ -54,13 +54,13 @@ function test() expect = 'function () {\nL:\n 3;\n}'; var f = function() { L: 3; }; actual = f.toString(); - writeLineToLog(f.toString()); + print(f.toString()); compareSource(expect, actual, summary); expect = 'function () {\nL:\n 3;\n alert(5);\n}'; f = function() { L: 3; alert(5); } actual = f.toString(); - writeLineToLog(f.toString()); + print(f.toString()); compareSource(expect, actual, summary); exitFunc ('test'); diff --git a/mozilla/js/tests/js1_5/Regress/regress-349592.js b/mozilla/js/tests/js1_5/Regress/regress-349592.js index f9dc47abc6f..4629a93ee0f 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349592.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349592.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ //----------------------------------------------------------------------------- var bug = 349592; -var summary = 'decompilation of try/finally inside finally'; +var summary = 'Do not assert with try/finally inside finally'; var actual = 'No Crash'; var expect = 'No Crash'; diff --git a/mozilla/js/tests/js1_5/Regress/regress-349616.js b/mozilla/js/tests/js1_5/Regress/regress-349616.js index e446fe57191..8b99da4959a 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349616.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349616.js @@ -54,12 +54,12 @@ function test() var f; f = function() { window.foo getter = function() { return 5; }; - writeLineToLog(window.foo); + print(window.foo); } actual = f + ''; expect = 'function () {\n window.foo getter= ' + - 'function () {return 5;};\n writeLineToLog(window.foo);\n}'; + 'function () {return 5;};\n print(window.foo);\n}'; compareSource(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-349663.js b/mozilla/js/tests/js1_5/Regress/regress-349663.js index 11fd970c1c2..41b5bf945c8 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-349663.js +++ b/mozilla/js/tests/js1_5/Regress/regress-349663.js @@ -59,7 +59,7 @@ function test() expect = f + ''; actual = g + ''; - writeLineToLog(f); + print(f); compareSource(expect, actual, summary); exitFunc ('test'); diff --git a/mozilla/js/tests/js1_5/Regress/regress-350312-01.js b/mozilla/js/tests/js1_5/Regress/regress-350312-01.js index f889d4c7e5c..015ab218644 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-350312-01.js +++ b/mozilla/js/tests/js1_5/Regress/regress-350312-01.js @@ -72,8 +72,8 @@ function test() var passed = ex === 1; if (!passed) { - writeLineToLog("Failed!"); - writeLineToLog("ex="+uneval(ex)); + print("Failed!"); + print("ex="+uneval(ex)); } reportCompare(true, passed, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-350312-02.js b/mozilla/js/tests/js1_5/Regress/regress-350312-02.js index 3f6d663c949..16cdb4e6a3e 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-350312-02.js +++ b/mozilla/js/tests/js1_5/Regress/regress-350312-02.js @@ -54,7 +54,7 @@ function test() function createPrint(obj) { return new Function("actual += " + obj + " + ','; " + - "writeLineToLog(" + obj + ");"); + "print(" + obj + ");"); } function createThrow(obj) @@ -74,7 +74,7 @@ function test() } } - writeLineToLog('test 1'); + print('test 1'); expect = 'a,c,'; actual = ''; try @@ -87,7 +87,7 @@ function test() } reportCompare(expect, actual, summary + ': 1'); - writeLineToLog('test 2'); + print('test 2'); expect = 'c,caught a'; actual = ''; try @@ -100,7 +100,7 @@ function test() } reportCompare(expect, actual, summary + ': 2'); - writeLineToLog('test 3'); + print('test 3'); expect = 'b,c,'; actual = ''; try @@ -113,7 +113,7 @@ function test() } reportCompare(expect, actual, summary + ': 3'); - writeLineToLog('test 4'); + print('test 4'); expect = 'a,c,'; actual = ''; try @@ -126,7 +126,7 @@ function test() } reportCompare(expect, actual, summary + ': 4'); - writeLineToLog('test 5'); + print('test 5'); expect = 'c,caught b'; actual = ''; try diff --git a/mozilla/js/tests/js1_5/Regress/regress-350312-03.js b/mozilla/js/tests/js1_5/Regress/regress-350312-03.js index 646a00ca88c..1e486de879c 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-350312-03.js +++ b/mozilla/js/tests/js1_5/Regress/regress-350312-03.js @@ -52,11 +52,11 @@ function test() printStatus (summary); var pfx = "(function (x) {try {if (x > 41) throw x}", - cg1a = " catch (e if e === 42) {var v = 'catch guard 1 ' + e; actual += v + ',';writeLineToLog(v);}" - cg1b = " catch (e if e === 42) {var v = 'catch guard 1 + throw ' + e; actual += v + ',';writeLineToLog(v); throw e;}" - cg2 = " catch (e if e === 43) {var v = 'catch guard 2 ' + e; actual += v + ',';writeLineToLog(v)}" - cat = " catch (e) {var v = 'catch all ' + e; writeLineToLog(v); if (e == 44) throw e}" - fin = " finally{var v = 'fin'; actual += v + ',';writeLineToLog(v)}", + cg1a = " catch (e if e === 42) {var v = 'catch guard 1 ' + e; actual += v + ',';print(v);}" + cg1b = " catch (e if e === 42) {var v = 'catch guard 1 + throw ' + e; actual += v + ',';print(v); throw e;}" + cg2 = " catch (e if e === 43) {var v = 'catch guard 2 ' + e; actual += v + ',';print(v)}" + cat = " catch (e) {var v = 'catch all ' + e; print(v); if (e == 44) throw e}" + fin = " finally{var v = 'fin'; actual += v + ',';print(v)}", end = "})"; var exphash = { @@ -114,31 +114,31 @@ function test() ]; for (var i in src) { - writeLineToLog("\n=== " + i + ": " + src[i]); + print("\n=== " + i + ": " + src[i]); var f = eval(src[i]); var exp = eval(expsrc[i]); // dis(f); - writeLineToLog('decompiling: ' + f); - //writeLineToLog('decompiling exp: ' + exp); + print('decompiling: ' + f); + //print('decompiling exp: ' + exp); actual = ''; - try { expect = exp(41); f(41) } catch (e) { writeLineToLog('tried f(41), caught ' + e) } + try { expect = exp(41); f(41) } catch (e) { print('tried f(41), caught ' + e) } reportCompare(expect, actual, summary); actual = ''; - try { expect = exp(42); f(42) } catch (e) { writeLineToLog('tried f(42), caught ' + e) } + try { expect = exp(42); f(42) } catch (e) { print('tried f(42), caught ' + e) } reportCompare(expect, actual, summary); actual = ''; - try { expect = exp(43); f(43) } catch (e) { writeLineToLog('tried f(43), caught ' + e) } + try { expect = exp(43); f(43) } catch (e) { print('tried f(43), caught ' + e) } reportCompare(expect, actual, summary); actual = ''; - try { expect = exp(44); f(44) } catch (e) { writeLineToLog('tried f(44), caught ' + e) } + try { expect = exp(44); f(44) } catch (e) { print('tried f(44), caught ' + e) } reportCompare(expect, actual, summary); actual = ''; - try { expect = exp(45); f(45) } catch (e) { writeLineToLog('tried f(44), caught ' + e) } + try { expect = exp(45); f(45) } catch (e) { print('tried f(44), caught ' + e) } reportCompare(expect, actual, summary); } diff --git a/mozilla/js/tests/js1_5/Regress/regress-350312.js b/mozilla/js/tests/js1_5/Regress/regress-350312.js index 59c6e1016f3..905ec5a9fb6 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-350312.js +++ b/mozilla/js/tests/js1_5/Regress/regress-350312.js @@ -74,7 +74,7 @@ function test() catch(e2) { actual += e2; - writeLineToLog(e2); + print(e2); if (++counter > 10) { throw 'Infinite loop...'; @@ -89,7 +89,7 @@ function test() try { - writeLineToLog('test 1'); + print('test 1'); f(2, 1); } catch(ex) @@ -100,7 +100,7 @@ function test() actual = ''; try { - writeLineToLog('test 2'); + print('test 2'); f(2, 0); } catch(ex) diff --git a/mozilla/js/tests/js1_5/Regress/regress-350531.js b/mozilla/js/tests/js1_5/Regress/regress-350531.js index 686d58fa59a..b43ab32c8f6 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-350531.js +++ b/mozilla/js/tests/js1_5/Regress/regress-350531.js @@ -145,6 +145,7 @@ next_subset: gc(); for each (var set in sets) { + print('for each set in sets: ' + (uneval(set)) ); var src = "(function () {"; for (j in set) { var op = set[j], op2 = set[j-1]; @@ -172,7 +173,7 @@ next_subset: var ref = uneval(eval(src)).replace(/\s+/g, ' '); if (ref != src) { actual += "BROKEN! input: " + src + " output: " + ref + " "; - writeLineToLog("BROKEN! input: " + src + " output: " + ref); + print("BROKEN! input: " + src + " output: " + ref); break next_subset; } } catch (e) {} diff --git a/mozilla/js/tests/js1_5/Regress/regress-352455.js b/mozilla/js/tests/js1_5/Regress/regress-352455.js index 83263ee0b2f..aa8fde6d174 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-352455.js +++ b/mozilla/js/tests/js1_5/Regress/regress-352455.js @@ -51,13 +51,13 @@ function test() printBugNumber (bug); printStatus (summary); - writeLineToLog('If the test harness fails on this bug, the test fails.'); + print('If the test harness fails on this bug, the test fails.'); expect = 'SyntaxError: invalid getter usage'; z = ({}); try { eval('z.x getter= /g/i;'); } catch(ex) { actual = ex + '';} - writeLineToLog("This line should not be the last output you see."); - try { writeLineToLog(uneval(z)); } catch(e) { writeLineToLog("Threw!"); writeLineToLog(e); } + print("This line should not be the last output you see."); + try { print(uneval(z)); } catch(e) { print("Threw!"); print(e); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/Regress/regress-355341.js b/mozilla/js/tests/js1_5/Regress/regress-355341.js index 0546a2c7e20..e82cfedab74 100755 --- a/mozilla/js/tests/js1_5/Regress/regress-355341.js +++ b/mozilla/js/tests/js1_5/Regress/regress-355341.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ //----------------------------------------------------------------------------- var bug = 355341; -var summary = 'Do not crash with watch adn setter'; +var summary = 'Do not crash with watch and setter'; var actual = ''; var expect = ''; diff --git a/mozilla/js/tests/js1_5/Regress/regress-80981.js b/mozilla/js/tests/js1_5/Regress/regress-80981.js index 6d1adf66af5..0304023303d 100644 --- a/mozilla/js/tests/js1_5/Regress/regress-80981.js +++ b/mozilla/js/tests/js1_5/Regress/regress-80981.js @@ -72,7 +72,7 @@ function test() { b (); b4 (); - writeLineToLog('Number of errors = ' + err_num); + print('Number of errors = ' + err_num); } @@ -3109,16 +3109,16 @@ function b() function check(status) { - writeLineToLog('k = ' + k + ' j = ' + j + ' ' + status); + print('k = ' + k + ' j = ' + j + ' ' + status); for (i = 0; i < i2; i++) { if (n[i] != 1) { - writeLineToLog('n[' + i + '] = ' + n[i]); + print('n[' + i + '] = ' + n[i]); if (i != j) { - writeLineToLog('Test failed'); + print('Test failed'); err_num++; break; } @@ -3129,13 +3129,13 @@ function check(status) function b4() { - writeLineToLog('Visited b4'); + print('Visited b4'); } function b_after() { - writeLineToLog('Visited b_after'); + print('Visited b_after'); } reportCompare('No Error', 'No Error', ''); diff --git a/mozilla/js/tests/js1_5/Regress/regress-96526-003.js b/mozilla/js/tests/js1_5/Regress/regress-96526-003.js index beb18018029..9b681995a63 100644 --- a/mozilla/js/tests/js1_5/Regress/regress-96526-003.js +++ b/mozilla/js/tests/js1_5/Regress/regress-96526-003.js @@ -55,7 +55,7 @@ function validId(IDtext) var res = ""; if(IDText.value==""){ - writeLineToLog("You must enter a valid battery #") + print("You must enter a valid battery #") return false } else if(IDText.value=="x522"){ @@ -1653,1851 +1653,1851 @@ else if(IDText.value=="erd300"){ else if(IDText.value=="164"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="201"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="216"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="226"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="228"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="311"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="314"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="313"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="323"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="325"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="333cz"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="343"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="354"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="355"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="387"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="388"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="417"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="420"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="457"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="460"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="477"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="479"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="482"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="484"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="487"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="490"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="491"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="496"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="509"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="510f"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="520"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="523"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="531"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="532"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="537"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="538"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="544"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="560"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="561"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="563"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="564"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="565"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="646"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="703"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="706"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="714"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="715"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="716"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="717"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="724"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="731"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="735"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="736"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="738"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="742"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="744"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="750"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="762s"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="773"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="778"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="781"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="812"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="815"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="835"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="850"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="904"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="912"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="915"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="935"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="950"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1015"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1035"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1050"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1150"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1231"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1461"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1463"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1562"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="1862"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="2356n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="2709n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="2744n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="2745n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="2746n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="2780n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ac41e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cc1096"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ccm1460"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ccm2460"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ccm4060a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ccm4060m"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cdc100"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch12"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch15"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch2aa"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch22"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch35"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch4"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ch50"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm1060"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm1560"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm2360"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm4160"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm6036"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm9072"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cm9172"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp2360"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp3336"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp3536"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp3736"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp5036"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp5160"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp5648"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp5960"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp6072"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp6172"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7049"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7072"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7148"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7149"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7160"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7172"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7248"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7261"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7348"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7548"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7661"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp7960"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8049"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8136"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8160"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8172"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8248"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8661"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8748"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8948"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp8960"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp9061"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp9148"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp9161"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cp9360"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs3336"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs5036"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs5460"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7048"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7072"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7148"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7149"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7160"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7248"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7261"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7348"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7448"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7548"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs7661"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs8136"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs8648"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs9061"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs9148"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cs9161"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv2012"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv2096"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv3010s"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv3012"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv3060"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv3112"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="cv3212"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e1"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e1n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e3"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e4"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e9"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e12"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e12n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e13e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e41e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e42"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e42n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e89"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e115"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e115n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e126"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e132"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e132n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e133"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e133n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e134"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e134n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e135"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e135n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e136"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e137"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e137n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e146x"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e152"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e163"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e164"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e164n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e165"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e169"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e177"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e233"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e233n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e235n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e236n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e286"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e289"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e312e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e340e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e400"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e400n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e401e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e401n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e450"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e502"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e601"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e625"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e630"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e640"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e640n"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e675e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302157"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302250"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302358"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302435"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302462"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302465"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302478"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302642"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302651"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302702"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302904"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302905"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e302908"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e303145"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e303236"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e303314"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e303394"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e303496"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="e303996"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ea6"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ea6f"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ea6ft"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ea6st"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en1a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en132a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en133a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en134a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en135a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en136a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en164a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en165a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en175a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en177a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="en640a"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ep175"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ep401e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ep675e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx1"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx4"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx13"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx14"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx23"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx25"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx27"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx29"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx30"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx625"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx640"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx675"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="epx825"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev6"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev9"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev10s"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev15"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev22"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev31"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev35"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev50"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev90"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="ev90hp"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="fcc2"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs6"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs10s"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs15"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs31"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs35"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs50"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs90"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs95"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs150"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="hs6571"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="if6"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="is6"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="is6t"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="p2321m"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="p2322"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="p2326m"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="p7307"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="p7507"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="qcc4"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="s13e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="s312e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="s41e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="s76e"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="t35"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="t50"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } else if(IDText.value=="w353"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/contents/discontinued_battery_index.htm" return true } @@ -4142,283 +4142,283 @@ else if(IDText.value=="LED"){ else if(IDText.value=="108"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="209"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="330"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="330y"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="331"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="331y"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="1251bk"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="2253"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="3233"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="3253"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="3415"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="3452"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="4220"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="4453"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="5154"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="5251"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="7369"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="8115"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="8415"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="b170"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="bkc1"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="d620"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="d820"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="e100"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="e252"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="e350"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="e420"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="em290"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="em420"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="f100"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="f215"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="f250"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="f415"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="h100"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="h250"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="h350"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="in25t"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="kcdb"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="kcsg"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="kctw"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="rc100"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="rc251"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="rc290"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="t430"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="v235"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="x250"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } else if(IDText.value=="x350"){ //Checks for id entry - writeLineToLog("You have entered a Discontinued Product Number") + print("You have entered a Discontinued Product Number") res="../datasheets/flashlights/discontinued_flashlight_index.htm" return true } @@ -4426,7 +4426,7 @@ else if(IDText.value=="x350"){ else { - writeLineToLog("You have entered an Invalid Product Number...Please try 'Select Product Group' search.") + print("You have entered an Invalid Product Number...Please try 'Select Product Group' search.") return false } diff --git a/mozilla/js/tests/js1_5/String/regress-354541-01.js b/mozilla/js/tests/js1_5/String/regress-354541-01.js index d57d085d9dd..e91e7feb251 100755 --- a/mozilla/js/tests/js1_5/String/regress-354541-01.js +++ b/mozilla/js/tests/js1_5/String/regress-354541-01.js @@ -45,7 +45,7 @@ var expect = ''; printBugNumber (bug); printStatus (summary + ': top level'); -String.prototype.trim = function() { writeLineToLog('hallo'); }; +String.prototype.trim = function() { print('hallo'); }; const S = String; const Sp = String.prototype; @@ -53,7 +53,7 @@ const Sp = String.prototype; expect = 'No Error'; actual = 'No Error'; -var s = Script('var tmp = function(o) { switch(o) { case String: case 1: return ""; } }; writeLineToLog(String === S); writeLineToLog(String.prototype === Sp); "".trim();'); +var s = Script('var tmp = function(o) { switch(o) { case String: case 1: return ""; } }; print(String === S); print(String.prototype === Sp); "".trim();'); s(); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/String/regress-354541-02.js b/mozilla/js/tests/js1_5/String/regress-354541-02.js index e4ef21414a0..db31f298fb5 100755 --- a/mozilla/js/tests/js1_5/String/regress-354541-02.js +++ b/mozilla/js/tests/js1_5/String/regress-354541-02.js @@ -52,14 +52,14 @@ function test() printBugNumber (bug); printStatus (summary + ': in function'); - String.prototype.trim = function() { writeLineToLog('hallo'); }; + String.prototype.trim = function() { print('hallo'); }; const S = String; const Sp = String.prototype; expect = 'No Error'; actual = 'No Error'; - var s = Script('var tmp = function(o) { switch(o) { case String: case 1: return ""; } }; writeLineToLog(String === S); writeLineToLog(String.prototype === Sp); "".trim();'); + var s = Script('var tmp = function(o) { switch(o) { case String: case 1: return ""; } }; print(String === S); print(String.prototype === Sp); "".trim();'); s(); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_5/String/regress-354541-03.js b/mozilla/js/tests/js1_5/String/regress-354541-03.js index 8ee3570e4f5..7170b63908b 100755 --- a/mozilla/js/tests/js1_5/String/regress-354541-03.js +++ b/mozilla/js/tests/js1_5/String/regress-354541-03.js @@ -45,7 +45,7 @@ var expect = ''; printBugNumber (bug); printStatus (summary + ': top level'); -String.prototype.trim = function() { writeLineToLog('hallo'); }; +String.prototype.trim = function() { print('hallo'); }; String.prototype.trim = function() { return 'hallo'; }; diff --git a/mozilla/js/tests/js1_5/browser.js b/mozilla/js/tests/js1_5/browser.js index 3a71054a626..031b6262064 100755 --- a/mozilla/js/tests/js1_5/browser.js +++ b/mozilla/js/tests/js1_5/browser.js @@ -70,19 +70,27 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite(string); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } var testcases = new Array(); @@ -172,6 +180,16 @@ reportFailure = function (msg, page, line) }; function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -184,13 +202,7 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_5/shell.js b/mozilla/js/tests/js1_5/shell.js index dce3d882118..86b425a0981 100644 --- a/mozilla/js/tests/js1_5/shell.js +++ b/mozilla/js/tests/js1_5/shell.js @@ -47,9 +47,6 @@ var SECT_PREFIX = 'Section '; var SECT_SUFFIX = ' of test -'; var callStack = new Array(); -function writeLineToLog( string ) { - print( string + "\n"); -} /* * The test driver searches for such a phrase in the test output. * If such phrase exists, it will set n as the expected exit code. @@ -57,7 +54,7 @@ function writeLineToLog( string ) { function expectExitCode(n) { - writeLineToLog('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); + print('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); } @@ -90,7 +87,7 @@ function reportFailure (msg) var prefix = (funcName) ? "[reported from " + funcName + "] ": ""; for (var i=0; i\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } var testcases = new Array(); @@ -176,6 +184,16 @@ reportFailure = function (msg, page, line) }; function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -188,13 +206,7 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_6/shell.js b/mozilla/js/tests/js1_6/shell.js index 15f05165722..0ea11e9873b 100755 --- a/mozilla/js/tests/js1_6/shell.js +++ b/mozilla/js/tests/js1_6/shell.js @@ -47,9 +47,6 @@ var SECT_PREFIX = 'Section '; var SECT_SUFFIX = ' of test -'; var callStack = new Array(); -function writeLineToLog( string ) { - print( string + "\n"); -} /* * The test driver searches for such a phrase in the test output. * If such phrase exists, it will set n as the expected exit code. @@ -57,7 +54,7 @@ function writeLineToLog( string ) { function expectExitCode(n) { - writeLineToLog('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); + print('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); } @@ -90,7 +87,7 @@ function reportFailure (msg) var prefix = (funcName) ? "[reported from " + funcName + "] ": ""; for (var i=0; i\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } var testcases = new Array(); @@ -176,6 +184,16 @@ reportFailure = function (msg, page, line) }; function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -188,13 +206,7 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/js1_7/expressions/regress-346645-01.js b/mozilla/js/tests/js1_7/expressions/regress-346645-01.js index e97dc5c6b8f..522b2761790 100755 --- a/mozilla/js/tests/js1_7/expressions/regress-346645-01.js +++ b/mozilla/js/tests/js1_7/expressions/regress-346645-01.js @@ -57,7 +57,7 @@ function test() } catch(ex) { - writeLineToLog(ex); + print(ex); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/expressions/regress-346645-02.js b/mozilla/js/tests/js1_7/expressions/regress-346645-02.js index ebe519f161a..b1aaa288b69 100755 --- a/mozilla/js/tests/js1_7/expressions/regress-346645-02.js +++ b/mozilla/js/tests/js1_7/expressions/regress-346645-02.js @@ -57,7 +57,7 @@ function test() } catch(ex) { - writeLineToLog(ex); + print(ex); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/expressions/regress-346645-03.js b/mozilla/js/tests/js1_7/expressions/regress-346645-03.js index d9aca046b78..e17c5012d4f 100755 --- a/mozilla/js/tests/js1_7/expressions/regress-346645-03.js +++ b/mozilla/js/tests/js1_7/expressions/regress-346645-03.js @@ -57,7 +57,7 @@ function test() } catch(ex) { - writeLineToLog(ex); + print(ex); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/geniter/regress-347593.js b/mozilla/js/tests/js1_7/geniter/regress-347593.js index 28042384be5..d661cb3467c 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-347593.js +++ b/mozilla/js/tests/js1_7/geniter/regress-347593.js @@ -77,7 +77,7 @@ function test() } catch(ex) { - writeLineToLog(ex+''); + print(ex+''); actual = ex.name; } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/geniter/regress-349012-03.js b/mozilla/js/tests/js1_7/geniter/regress-349012-03.js index 91277b5a3c0..d1b0252f27b 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-349012-03.js +++ b/mozilla/js/tests/js1_7/geniter/regress-349012-03.js @@ -64,7 +64,7 @@ function test() var iter = gen(); iter.next(); var ex = iter.send(iter); - writeLineToLog(ex + ''); + print(ex + ''); actual = (ex instanceof TypeError); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/geniter/regress-349012-04.js b/mozilla/js/tests/js1_7/geniter/regress-349012-04.js index 715483acf16..f1254e6d045 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-349012-04.js +++ b/mozilla/js/tests/js1_7/geniter/regress-349012-04.js @@ -64,7 +64,7 @@ function test() var iter = gen(); iter.next(); var ex = iter.send(iter); - writeLineToLog(ex + ''); + print(ex + ''); actual = (ex instanceof TypeError); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/geniter/regress-349012-05.js b/mozilla/js/tests/js1_7/geniter/regress-349012-05.js index 8d37a5ed264..2880b45d9ba 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-349012-05.js +++ b/mozilla/js/tests/js1_7/geniter/regress-349012-05.js @@ -62,11 +62,11 @@ function test() { iter = gen(); var i = iter.next(); - writeLineToLog("i="+i); + print("i="+i); } catch(ex) { - writeLineToLog(ex + ''); + print(ex + ''); actual = (ex instanceof TypeError) && (ex + '').indexOf(' already executing generator') != -1; } diff --git a/mozilla/js/tests/js1_7/geniter/regress-349023-01.js b/mozilla/js/tests/js1_7/geniter/regress-349023-01.js index 1173bee0395..512a03b5342 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-349023-01.js +++ b/mozilla/js/tests/js1_7/geniter/regress-349023-01.js @@ -60,7 +60,7 @@ function test() { var g = gen(); for (var i = 0; i < 10; i++) { - writeLineToLog(g.next()); + print(g.next()); } } catch(ex) diff --git a/mozilla/js/tests/js1_7/geniter/regress-349331.js b/mozilla/js/tests/js1_7/geniter/regress-349331.js index 4102d5f8fdf..fa833ff6fd7 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-349331.js +++ b/mozilla/js/tests/js1_7/geniter/regress-349331.js @@ -89,10 +89,10 @@ function test() finally3; if (!passed) { - writeLineToLog("Failed!"); - writeLineToLog("catch1=" + catch1 + " catch2=" + catch2 + " catch3=" + + print("Failed!"); + print("catch1=" + catch1 + " catch2=" + catch2 + " catch3=" + catch3); - writeLineToLog("finally1=" + finally1 + " finally2=" + finally2 + + print("finally1=" + finally1 + " finally2=" + finally2 + " finally3=" + finally3); } @@ -111,10 +111,10 @@ function test() finally3; if (!passed) { - writeLineToLog("Failed!"); - writeLineToLog("catch1=" + catch1 + " catch2=" + catch2 + " catch3=" + + print("Failed!"); + print("catch1=" + catch1 + " catch2=" + catch2 + " catch3=" + catch3); - writeLineToLog("finally1=" + finally1 + " finally2=" + finally2 + + print("finally1=" + finally1 + " finally2=" + finally2 + " finally3="+finally3); } reportCompare(true, passed, 'test GC-invoke close'); diff --git a/mozilla/js/tests/js1_7/geniter/regress-350312.js b/mozilla/js/tests/js1_7/geniter/regress-350312.js index e202d581cb5..9383140001e 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-350312.js +++ b/mozilla/js/tests/js1_7/geniter/regress-350312.js @@ -58,10 +58,10 @@ function test() yield iter; } catch (e if e == null) { actual += 'CATCH,'; - writeLineToLog("CATCH"); + print("CATCH"); } finally { actual += 'FINALLY'; - writeLineToLog("FINALLY"); + print("FINALLY"); } } diff --git a/mozilla/js/tests/js1_7/geniter/regress-350621.js b/mozilla/js/tests/js1_7/geniter/regress-350621.js index 804a88157ad..9c7d1e61cc6 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-350621.js +++ b/mozilla/js/tests/js1_7/geniter/regress-350621.js @@ -73,7 +73,7 @@ function test() ++count; } if (count != LOOPS) { - writeLineToLog("Test run " + c + ": test failed, count = " + count + + print("Test run " + c + ": test failed, count = " + count + ", should be " + LOOPS); var failed = true; } @@ -81,7 +81,7 @@ function test() actual = !failed; if (!failed) { - writeLineToLog("Test passed."); + print("Test passed."); } } diff --git a/mozilla/js/tests/js1_7/geniter/regress-352885-01.js b/mozilla/js/tests/js1_7/geniter/regress-352885-01.js index 00101df7d3d..139de0b0652 100755 --- a/mozilla/js/tests/js1_7/geniter/regress-352885-01.js +++ b/mozilla/js/tests/js1_7/geniter/regress-352885-01.js @@ -52,7 +52,7 @@ function test() printStatus (summary); for (j in ((function() { yield 3; })().__proto__)) - writeLineToLog(j); + print(j); reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/iterable/regress-340526-01.js b/mozilla/js/tests/js1_7/iterable/regress-340526-01.js index 7da483f340b..d01fc01fb5b 100755 --- a/mozilla/js/tests/js1_7/iterable/regress-340526-01.js +++ b/mozilla/js/tests/js1_7/iterable/regress-340526-01.js @@ -53,7 +53,7 @@ try } catch(ex) { - writeLineToLog(ex + ''); + print(ex + ''); } reportCompare(expect, actual, summary); diff --git a/mozilla/js/tests/js1_7/iterable/regress-341815.js b/mozilla/js/tests/js1_7/iterable/regress-341815.js index db710aee92f..b9a9b3c4a8f 100755 --- a/mozilla/js/tests/js1_7/iterable/regress-341815.js +++ b/mozilla/js/tests/js1_7/iterable/regress-341815.js @@ -76,7 +76,7 @@ function test() var x = {}; } - writeLineToLog('done'); + print('done'); reportCompare(expect, actual, summary); exitFunc ('test'); diff --git a/mozilla/js/tests/js1_7/iterable/regress-341821.js b/mozilla/js/tests/js1_7/iterable/regress-341821.js index 3f6b242a9e0..cb3ee1f6c50 100755 --- a/mozilla/js/tests/js1_7/iterable/regress-341821.js +++ b/mozilla/js/tests/js1_7/iterable/regress-341821.js @@ -79,7 +79,7 @@ function test() var x = {}; } - writeLineToLog('done'); + print('done'); reportCompare(expect, actual, summary); exitFunc ('test'); diff --git a/mozilla/js/tests/js1_7/iterable/regress-346021.js b/mozilla/js/tests/js1_7/iterable/regress-346021.js index d871c7aac46..2dc4039af98 100755 --- a/mozilla/js/tests/js1_7/iterable/regress-346021.js +++ b/mozilla/js/tests/js1_7/iterable/regress-346021.js @@ -51,7 +51,7 @@ function test() printBugNumber (bug); printStatus (summary); - var o = { __iterator__: function () { writeLineToLog(12); yield 42; } }; + var o = { __iterator__: function () { print(12); yield 42; } }; expect = 42; actual = 0; diff --git a/mozilla/js/tests/js1_7/lexical/regress-346642-02.js b/mozilla/js/tests/js1_7/lexical/regress-346642-02.js index 06b6d3346df..6ac69765bbf 100755 --- a/mozilla/js/tests/js1_7/lexical/regress-346642-02.js +++ b/mozilla/js/tests/js1_7/lexical/regress-346642-02.js @@ -60,7 +60,7 @@ function test() compareSource(expect, actual, summary); expect = actual = 'No Crash'; - writeLineToLog(uneval(f)); - reportCompare(expect, actual, 'writeLineToLog(uneval(f))'); + print(uneval(f)); + reportCompare(expect, actual, 'print(uneval(f))'); exitFunc ('test'); } diff --git a/mozilla/js/tests/js1_7/shell.js b/mozilla/js/tests/js1_7/shell.js index 718165c7e1a..9bf2bae1ddb 100644 --- a/mozilla/js/tests/js1_7/shell.js +++ b/mozilla/js/tests/js1_7/shell.js @@ -53,9 +53,6 @@ var SECT_PREFIX = 'Section '; var SECT_SUFFIX = ' of test -'; var callStack = new Array(); -function writeLineToLog( string ) { - print( string + "\n"); -} /* * The test driver searches for such a phrase in the test output. * If such phrase exists, it will set n as the expected exit code. @@ -63,7 +60,7 @@ function writeLineToLog( string ) { function expectExitCode(n) { - writeLineToLog('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); + print('--- NOTE: IN THIS TESTCASE, WE EXPECT EXIT CODE ' + n + ' ---'); } @@ -96,7 +93,7 @@ function reportFailure (msg) var prefix = (funcName) ? "[reported from " + funcName + "] ": ""; for (var i=0; i/>/g; $test =~ s/\:/\//g; if ($opt_console_failures) { @@ -1378,6 +1375,9 @@ sub report_failure { } } + $message =~ s/&/&/g; + $message =~ s//>/g; $message =~ s/\n/
\n/g; if ($bug_number) { diff --git a/mozilla/js/tests/lc2/JavaToJS/boolean-005.js b/mozilla/js/tests/lc2/JavaToJS/boolean-005.js index ea59b9f53a8..f2d9ac52d48 100644 --- a/mozilla/js/tests/lc2/JavaToJS/boolean-005.js +++ b/mozilla/js/tests/lc2/JavaToJS/boolean-005.js @@ -134,7 +134,7 @@ function JavaValue( value ) { // this.jsclass = value.getJSClass(); this.string = value + ""; - writeLineToLog( this.string ); + print( this.string ); this.value = value.booleanValue(); this.type = typeof value; diff --git a/mozilla/js/tests/lc2/browser.js b/mozilla/js/tests/lc2/browser.js index 9df373fd039..81a9c2a3ef7 100644 --- a/mozilla/js/tests/lc2/browser.js +++ b/mozilla/js/tests/lc2/browser.js @@ -74,48 +74,58 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n" ); - +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

\n" ); - if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); - if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); return passed; } @@ -137,7 +147,7 @@ function ToInteger( t ) { function Enumerate ( o ) { var p; for ( p in o ) { - writeLineToLog( p +": " + o[p] ); + print( p +": " + o[p] ); } } @@ -164,7 +174,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -211,6 +221,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -223,12 +243,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/lc2/jsref.js b/mozilla/js/tests/lc2/jsref.js index 9acd3217dda..26194e42fa4 100644 --- a/mozilla/js/tests/lc2/jsref.js +++ b/mozilla/js/tests/lc2/jsref.js @@ -110,14 +110,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } diff --git a/mozilla/js/tests/lc2/shell.js b/mozilla/js/tests/lc2/shell.js index 5936fb6c890..76629699137 100644 --- a/mozilla/js/tests/lc2/shell.js +++ b/mozilla/js/tests/lc2/shell.js @@ -99,7 +99,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -135,7 +135,7 @@ function startTest() { writeHeaderToLog( SECTION + " "+ TITLE); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } } @@ -154,7 +154,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -228,14 +228,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } @@ -246,7 +243,7 @@ function writeHeaderToLog( string ) { */ function stopTest() { - writeLineToLog( HR ); + print( HR ); var gc; if ( gc != undefined ) { gc(); @@ -261,7 +258,7 @@ function stopTest() { function getFailedCases() { for ( var i = 0; i < testcases.length; i++ ) { if ( ! testcases[i].passed ) { - writeLineToLog ( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); + print ( testcases[i].description +" = " +testcases[i].actual +" expected: "+ testcases[i].expect ); } } } diff --git a/mozilla/js/tests/lc3/JSObject/ToJSObject-001.js b/mozilla/js/tests/lc3/JSObject/ToJSObject-001.js index 29dad54a635..62c3461d002 100644 --- a/mozilla/js/tests/lc3/JSObject/ToJSObject-001.js +++ b/mozilla/js/tests/lc3/JSObject/ToJSObject-001.js @@ -236,9 +236,9 @@ function MyObject( stringValue ) { function TestObject( description, javaField, javaMethod, javaType, jsValue, jsType ) { - writeLineToLog("hi"); + print("hi"); eval (description); - writeLineToLog("bye") + print("bye") this.description = description; this.javaFieldName = javaField; this.javaFieldValue = eval( javaField ); diff --git a/mozilla/js/tests/lc3/browser.js b/mozilla/js/tests/lc3/browser.js index ee2101a14e3..b028be741d3 100755 --- a/mozilla/js/tests/lc3/browser.js +++ b/mozilla/js/tests/lc3/browser.js @@ -88,45 +88,58 @@ function DocumentWrite(s) } catch(excp) { - document.write(s + "
\n"); + document.write(s + '
\n'); } } -function writeLineToLog( string ) { - string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( string + "
\n"); +function print() { + var s = ''; + var a; + for (var i = 0; i < arguments.length; i++) + { + a = arguments[i]; + s += String(a) + ' '; + } if (typeof dump == 'function') { - dump( string + '\n'); + dump( s + '\n'); } + + s = s.replace(/[<>&]/g, htmlesc); + + DocumentWrite(s); } function writeHeaderToLog( string ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - DocumentWrite( "

" + string + "

" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + DocumentWrite( "

" + string + "

" ); } function writeFormattedResult( expect, actual, string, passed ) { string = String(string); - string = string.replace(/[<>&]/g, htmlesc); - var s = ""+ string ; - s += "" ; - s += ( passed ) ? "  " + PASSED - : " " + FAILED + expect + ""; - DocumentWrite( s + "
" ); if (typeof dump == 'function') { dump( string + '\n'); } + + string = string.replace(/[<>&]/g, htmlesc); + + var s = ""+ string ; + s += "" ; + s += ( passed ) ? "  " + PASSED + : " " + FAILED + expect + ""; + + DocumentWrite( s + "
" ); return passed; } @@ -153,7 +166,7 @@ function err( msg, page, line ) { /* * an unexpected exception occured */ - writeLineToLog( "Test failed with the message: " + msg ); + print( "Test failed with the message: " + msg ); testcase = new TestCase(SECTION, "unknown", "unknown", "unknown"); testcase.passed = false; testcase.reason = "Error: " + msg + @@ -200,6 +213,16 @@ function version(v) } function gc() +{ + // Thanks to igor.bukanov@gmail.com + var tmp = Math.PI * 1e500, tmp2; + for (var i = 0; i != 1 << 15; ++i) + { + tmp2 = tmp * 1.5; + } +} + +function jsdgc() { try { @@ -212,12 +235,6 @@ function gc() } catch(ex) { - writeLineToLog('gc: ' + ex); - // Thanks to igor.bukanov@gmail.com - var tmp = Math.PI * 1e500, tmp2; - for (var i = 0; i != 1 << 15; ++i) - { - tmp2 = tmp * 1.5; - } + print('gc: ' + ex); } } diff --git a/mozilla/js/tests/lc3/jsref.js b/mozilla/js/tests/lc3/jsref.js index a53b722004a..5a135a25737 100644 --- a/mozilla/js/tests/lc3/jsref.js +++ b/mozilla/js/tests/lc3/jsref.js @@ -180,14 +180,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); } diff --git a/mozilla/js/tests/lc3/shell.js b/mozilla/js/tests/lc3/shell.js index 484e98f6344..ee1044b4b74 100644 --- a/mozilla/js/tests/lc3/shell.js +++ b/mozilla/js/tests/lc3/shell.js @@ -94,7 +94,7 @@ function TestCase( n, d, e, a ) { this.passed = getTestCaseResult( this.expect, this.actual ); if ( DEBUG ) { - writeLineToLog( "added " + this.description ); + print( "added " + this.description ); } /* * testcases are solely maintained in the TestCase @@ -134,7 +134,7 @@ function startTest() { writeHeaderToLog( SECTION + " "+ TITLE); if ( BUGNUMBER ) { - writeLineToLog ("BUGNUMBER: " + BUGNUMBER ); + print ("BUGNUMBER: " + BUGNUMBER ); } @@ -163,7 +163,7 @@ function test() { } catch(e) { - writeLineToLog('test(): empty testcase for tc = ' + tc + ' ' + e); + print('test(): empty testcase for tc = ' + tc + ' ' + e); } } stopTest(); @@ -239,14 +239,11 @@ function writeFormattedResult( expect, actual, string, passed ) { s += B ; s += ( passed ) ? FONT_GREEN + NBSP + PASSED : FONT_RED + NBSP + FAILED + expect + TT_ ; - writeLineToLog( s + FONT_ + B_ + TT_ ); + print( s + FONT_ + B_ + TT_ ); return passed; } -function writeLineToLog( string ) { - print( string + BR + CR ); -} function writeHeaderToLog( string ) { print( H2 + string + H2_ ); }