From 7e080f735b42e7eddcb1e117376a3dd3dc7709df Mon Sep 17 00:00:00 2001 From: "bclary%bclary.com" Date: Sat, 14 Apr 2007 17:04:11 +0000 Subject: [PATCH] JavaScript Tests - do not perform comparisons for skipped test, bug 354541 git-svn-id: svn://10.0.0.236/trunk@224534 18797224-902f-48f8-a5cc-f745e15eee43 --- .../tests/js1_5/extensions/regress-354541-03.js | 16 +++++++--------- .../tests/js1_5/extensions/regress-354541-04.js | 14 ++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/mozilla/js/tests/js1_5/extensions/regress-354541-03.js b/mozilla/js/tests/js1_5/extensions/regress-354541-03.js index 3f1f5f18569..4f24d0bb41d 100755 --- a/mozilla/js/tests/js1_5/extensions/regress-354541-03.js +++ b/mozilla/js/tests/js1_5/extensions/regress-354541-03.js @@ -61,8 +61,6 @@ var actualStringPrototypeInvariant; if (typeof Script == 'undefined') { print('Test skipped. Script not defined.'); - var actualStringInvariant = true; - var actualStringPrototypeInvariant = true; } else { @@ -75,12 +73,12 @@ else { actual = ex + ''; } + reportCompare(expect, actual, 'trim() returned'); + reportCompare(expectStringInvariant, actualStringInvariant, + 'String invariant'); + reportCompare(expectStringPrototypeInvariant, + actualStringPrototypeInvariant, + 'String.prototype invariant'); + } -reportCompare(expect, actual, 'trim() returned'); -reportCompare(expectStringInvariant, actualStringInvariant, - 'String invariant'); -reportCompare(expectStringPrototypeInvariant, - actualStringPrototypeInvariant, - 'String.prototype invariant'); - diff --git a/mozilla/js/tests/js1_5/extensions/regress-354541-04.js b/mozilla/js/tests/js1_5/extensions/regress-354541-04.js index 7967280eabc..b6031b663b3 100755 --- a/mozilla/js/tests/js1_5/extensions/regress-354541-04.js +++ b/mozilla/js/tests/js1_5/extensions/regress-354541-04.js @@ -65,8 +65,6 @@ function test() if (typeof Script == 'undefined') { print('Test skipped. Script is not defined'); - var actualStringInvariant = true; - var actualStringPrototypeInvariant = true; } else { @@ -79,13 +77,13 @@ function test() { actual = ex + ''; } + + reportCompare(expect, actual, 'trim() returned'); + reportCompare(expectStringInvariant, actualStringInvariant, 'String invariant'); + reportCompare(expectStringPrototypeInvariant, + actualStringPrototypeInvariant, + 'String.prototype invariant'); } - reportCompare(expect, actual, 'trim() returned'); - reportCompare(expectStringInvariant, actualStringInvariant, 'String invariant'); - reportCompare(expectStringPrototypeInvariant, - actualStringPrototypeInvariant, - 'String.prototype invariant'); - exitFunc ('test'); }