From 66563223a5015e8c48a7c5a0e0f13db087fc42c3 Mon Sep 17 00:00:00 2001 From: Brent Baker Date: Thu, 6 Jun 2013 07:36:51 -0400 Subject: [PATCH] Bug 1125: Move escape and unescape into "annexB" --- .../15.2.3.3/15.2.3.3-4-12.js => annexB/B.2.1.js} | 2 +- test/suite/annexB/B.2.1.propertyCheck.js | 12 ++++++++++++ .../15.2.3.3/15.2.3.3-4-13.js => annexB/B.2.2.js} | 2 +- test/suite/annexB/B.2.2.propertyCheck.js | 12 ++++++++++++ test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js | 4 ---- 5 files changed, 26 insertions(+), 6 deletions(-) rename test/suite/{ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-12.js => annexB/B.2.1.js} (91%) create mode 100644 test/suite/annexB/B.2.1.propertyCheck.js rename test/suite/{ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-13.js => annexB/B.2.2.js} (91%) create mode 100644 test/suite/annexB/B.2.2.propertyCheck.js diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-12.js b/test/suite/annexB/B.2.1.js similarity index 91% rename from test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-12.js rename to test/suite/annexB/B.2.1.js index 6d2d007989..89754a48cf 100644 --- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-12.js +++ b/test/suite/annexB/B.2.1.js @@ -4,7 +4,7 @@ /// "Use Terms"). Any redistribution of this code must retain the above /// copyright and this notice and otherwise comply with the Use Terms. /** - * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-12.js + * @path annexB/B.2.1.js * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.escape) */ diff --git a/test/suite/annexB/B.2.1.propertyCheck.js b/test/suite/annexB/B.2.1.propertyCheck.js new file mode 100644 index 0000000000..cadef98772 --- /dev/null +++ b/test/suite/annexB/B.2.1.propertyCheck.js @@ -0,0 +1,12 @@ +// Copyright 2009 the Sputnik authors. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/** + * Check type of various properties + * + * @path annexB/B.2.1.propertyCheck.js + * @description Checking properties of this object (escape) + */ + +if (typeof this.escape === "undefined") $ERROR('#1: typeof this.escape !== "undefined"'); +if (typeof this['escape'] === "undefined") $ERROR('#2: typeof this["escape"] !== "undefined"'); diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-13.js b/test/suite/annexB/B.2.2.js similarity index 91% rename from test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-13.js rename to test/suite/annexB/B.2.2.js index cde6808382..987a0d651a 100644 --- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-13.js +++ b/test/suite/annexB/B.2.2.js @@ -4,7 +4,7 @@ /// "Use Terms"). Any redistribution of this code must retain the above /// copyright and this notice and otherwise comply with the Use Terms. /** - * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-13.js + * @path annexB/B.2.2.js * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.unescape) */ diff --git a/test/suite/annexB/B.2.2.propertyCheck.js b/test/suite/annexB/B.2.2.propertyCheck.js new file mode 100644 index 0000000000..be9cac6a71 --- /dev/null +++ b/test/suite/annexB/B.2.2.propertyCheck.js @@ -0,0 +1,12 @@ +// Copyright 2009 the Sputnik authors. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/** + * Check type of various properties + * + * @path annexB/B.2.2.propertyCheck.js + * @description Checking properties of this object (unescape) + */ + +if (typeof this.unescape === "undefined") $ERROR('#1: typeof this.unescape !== "undefined"'); +if (typeof this['unescape'] === "undefined") $ERROR('#2: typeof this["unescape"] !== "undefined"'); diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js index fb78048fb0..8f9212243b 100644 --- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js +++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js @@ -17,10 +17,6 @@ if (typeof this.parseInt === "undefined") $ERROR('#5: typeof this.parseInt !== if (typeof this['parseInt'] === "undefined") $ERROR('#6: typeof this["parseInt"] !== "undefined"'); if (typeof this.parseFloat === "undefined") $ERROR('#7: typeof this.parseFloat !== "undefined"'); if (typeof this['parseFloat'] === "undefined") $ERROR('#8: typeof this["parseFloat"] !== "undefined"'); -if (typeof this.escape === "undefined") $ERROR('#9: typeof this.escape !== "undefined"'); -if (typeof this['escape'] === "undefined") $ERROR('#10: typeof this["escape"] !== "undefined"'); -if (typeof this.unescape === "undefined") $ERROR('#11: typeof this.unescape !== "undefined"'); -if (typeof this['unescape'] === "undefined") $ERROR('#12: typeof this["unescape"] !== "undefined"'); if (typeof this.isNaN === "undefined") $ERROR('#13: typeof this.isNaN !== "undefined"'); if (typeof this['isNaN'] === "undefined") $ERROR('#14: typeof this["isNaN"] !== "undefined"'); if (typeof this.isFinite === "undefined") $ERROR('#15: typeof this.isFinite !== "undefined"');