From fb850ad1e04c296536d0fcae87440cac2ebd171c Mon Sep 17 00:00:00 2001
From: Brent Baker <brbaker@adobe.com>
Date: Thu, 6 Jun 2013 07:44:11 -0400
Subject: [PATCH] Bug 1128: Move getYear() and setYear() into annexB

---
 .../15.2.3.3-4-119.js => annexB/B.2.4.js}         |  2 +-
 test/suite/annexB/B.2.4.propertyCheck.js          | 15 +++++++++++++++
 .../15.2.3.3-4-137.js => annexB/B.2.5.js}         |  2 +-
 test/suite/annexB/B.2.5.propertyCheck.js          | 15 +++++++++++++++
 test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js      |  4 ----
 5 files changed, 32 insertions(+), 6 deletions(-)
 rename test/suite/{ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-119.js => annexB/B.2.4.js} (91%)
 create mode 100644 test/suite/annexB/B.2.4.propertyCheck.js
 rename test/suite/{ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-137.js => annexB/B.2.5.js} (91%)
 create mode 100644 test/suite/annexB/B.2.5.propertyCheck.js

diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-119.js b/test/suite/annexB/B.2.4.js
similarity index 91%
rename from test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-119.js
rename to test/suite/annexB/B.2.4.js
index 24e82ad881..252c6c151a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-119.js
+++ b/test/suite/annexB/B.2.4.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-119.js
+ * @path annexB/B.2.4.js
  * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getYear)
  */
 
diff --git a/test/suite/annexB/B.2.4.propertyCheck.js b/test/suite/annexB/B.2.4.propertyCheck.js
new file mode 100644
index 0000000000..959c8b7da6
--- /dev/null
+++ b/test/suite/annexB/B.2.4.propertyCheck.js
@@ -0,0 +1,15 @@
+// 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.4.propertyCheck.js
+ * @description Checking properties of the Date object (getYear)
+ */
+
+if (typeof Date.prototype.getYear !== "function")  $ERROR('#1: typeof Date.prototype.getYear === "function". Actual: ' + (typeof Date.prototype.getYear ));
+if (typeof Date.prototype['getYear'] !== "function")  $ERROR('#2: typeof Date.prototype["getYear"] === "function". Actual: ' + (typeof Date.prototype["getYear"] ));
+
+
+
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-137.js b/test/suite/annexB/B.2.5.js
similarity index 91%
rename from test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-137.js
rename to test/suite/annexB/B.2.5.js
index 56cf7a17e7..7754c221d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-137.js
+++ b/test/suite/annexB/B.2.5.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-137.js
+ * @path annexB/B.2.5.js
  * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setYear)
  */
 
diff --git a/test/suite/annexB/B.2.5.propertyCheck.js b/test/suite/annexB/B.2.5.propertyCheck.js
new file mode 100644
index 0000000000..2af44c2510
--- /dev/null
+++ b/test/suite/annexB/B.2.5.propertyCheck.js
@@ -0,0 +1,15 @@
+// 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.5.propertyCheck.js
+ * @description Checking properties of the Date object (setYear)
+ */
+
+if (typeof Date.prototype.setYear !== "function")  $ERROR('#1: typeof Date.prototype.setYear === "function". Actual: ' + (typeof Date.prototype.setYear ));
+if (typeof Date.prototype['setYear'] !== "function")  $ERROR('#2: typeof Date.prototype["setYear"] === "function". Actual: ' + (typeof Date.prototype["setYear"] ));
+
+
+
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js
index 8aecb182fa..6b142a4916 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js
@@ -23,8 +23,6 @@ if (typeof Date.prototype.valueOf !== "function")  $ERROR('#11: typeof Date.prot
 if (typeof Date.prototype['valueOf'] !== "function")  $ERROR('#12: typeof Date.prototype["valueOf"] === "function". Actual: ' + (typeof Date.prototype["valueOf"] ));
 if (typeof Date.prototype.getTime !== "function")  $ERROR('#13: typeof Date.prototype.getTime === "function". Actual: ' + (typeof Date.prototype.getTime ));
 if (typeof Date.prototype['getTime'] !== "function")  $ERROR('#14: typeof Date.prototype["getTime"] === "function". Actual: ' + (typeof Date.prototype["getTime"] ));
-if (typeof Date.prototype.getYear !== "function")  $ERROR('#15: typeof Date.prototype.getYear === "function". Actual: ' + (typeof Date.prototype.getYear ));
-if (typeof Date.prototype['getYear'] !== "function")  $ERROR('#16: typeof Date.prototype["getYear"] === "function". Actual: ' + (typeof Date.prototype["getYear"] ));
 if (typeof Date.prototype.getFullYear !== "function")  $ERROR('#17: typeof Date.prototype.getFullYear === "function". Actual: ' + (typeof Date.prototype.getFullYear ));
 if (typeof Date.prototype['getFullYear'] !== "function")  $ERROR('#18: typeof Date.prototype["getFullYear"] === "function". Actual: ' + (typeof Date.prototype["getFullYear"] ));
 if (typeof Date.prototype.getUTCFullYear !== "function")  $ERROR('#19: typeof Date.prototype.getUTCFullYear === "function". Actual: ' + (typeof Date.prototype.getUTCFullYear ));
@@ -87,8 +85,6 @@ if (typeof Date.prototype.setFullYear !== "function")  $ERROR('#75: typeof Date.
 if (typeof Date.prototype['setFullYear'] !== "function")  $ERROR('#76: typeof Date.prototype["setFullYear"] === "function". Actual: ' + (typeof Date.prototype["setFullYear"] ));
 if (typeof Date.prototype.setUTCFullYear !== "function")  $ERROR('#77: typeof Date.prototype.setUTCFullYear === "function". Actual: ' + (typeof Date.prototype.setUTCFullYear ));
 if (typeof Date.prototype['setUTCFullYear'] !== "function")  $ERROR('#78: typeof Date.prototype["setUTCFullYear"] === "function". Actual: ' + (typeof Date.prototype["setUTCFullYear"] ));
-if (typeof Date.prototype.setYear !== "function")  $ERROR('#79: typeof Date.prototype.setYear === "function". Actual: ' + (typeof Date.prototype.setYear ));
-if (typeof Date.prototype['setYear'] !== "function")  $ERROR('#80: typeof Date.prototype["setYear"] === "function". Actual: ' + (typeof Date.prototype["setYear"] ));
 if (typeof Date.prototype.toLocaleString !== "function")  $ERROR('#81: typeof Date.prototype.toLocaleString === "function". Actual: ' + (typeof Date.prototype.toLocaleString ));
 if (typeof Date.prototype['toLocaleString'] !== "function")  $ERROR('#82: typeof Date.prototype["toLocaleString"] === "function". Actual: ' + (typeof Date.prototype["toLocaleString"] ));
 if (typeof Date.prototype.toUTCString !== "function")  $ERROR('#83: typeof Date.prototype.toUTCString === "function". Actual: ' + (typeof Date.prototype.toUTCString ));
-- 
GitLab