From 6a806c8b7fe924e442623c6df7a1f9b32d28ab4d Mon Sep 17 00:00:00 2001
From: David Fugate <dfugate@microsoft.com>
Date: Tue, 1 Mar 2011 11:08:16 -0800
Subject: [PATCH] Three test cases fixes. One of these involved re-enabling
 15.2.3.3-4-188.js.

---
 test/config/excludelist.xml                              | 1 -
 .../chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js     | 9 ++-------
 .../chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js      | 9 ++++-----
 .../chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js      | 8 ++++----
 website/resources/scripts/testcases/chapter15.xml        | 7 ++++---
 website/resources/scripts/testcases/testcaseslist.xml    | 2 +-
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/test/config/excludelist.xml b/test/config/excludelist.xml
index 9524f29c6c..fc4cf5cad7 100644
--- a/test/config/excludelist.xml
+++ b/test/config/excludelist.xml
@@ -306,7 +306,6 @@
   <test id="S11.1.5_A4.2">https://bugs.ecmascript.org/show_bug.cgi?id=14</test>
   <test id="S11.8.2_A2.3_T1">https://bugs.ecmascript.org/show_bug.cgi?id=15</test>
   <test id="S11.8.3_A2.3_T1">https://bugs.ecmascript.org/show_bug.cgi?id=15</test>
-  <test id="15.2.3.3-4-188">https://bugs.ecmascript.org/show_bug.cgi?id=16</test>
   
   <!-- FunctionDeclaration inside a Statement context-->
   <test id="12.14-5">https://bugs.ecmascript.org/show_bug.cgi?id=18</test>
diff --git a/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js b/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js
index 798f8f1cf7..c06620f6c3 100644
--- a/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js
+++ b/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js
@@ -28,13 +28,8 @@ description: "Object.getOwnPropertyDescriptor returns undefined for non-existent
 
 test: function testcase() {
   var f = Function('return 42;');
-
-  var desc = Object.getOwnPropertyDescriptor(f, "name");
-
-  if (desc === undefined) {
-    return true;
-  }
-  return false;
+  var desc = Object.getOwnPropertyDescriptor(f, "functionNameHopefullyDoesNotExist");
+  return desc === undefined;
  },
 
 precondition: function prereq() {
diff --git a/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js b/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js
index 9bdd9535f8..bc0a85c227 100644
--- a/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js
+++ b/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js
@@ -31,10 +31,9 @@ ES5Harness.registerTest({
         var props = new Error("test");
         var result = false;
 
-        props.description = { value: 11 };
-        props.message = { value: 11 };
-        props.name = { value: 11 };
-
+        (Object.getOwnPropertyNames(props)).forEach(function(name){
+            props[name] = {value:11, configurable:true}
+        });
 
         Object.defineProperty(props, "prop", {
             get: function () {
@@ -48,6 +47,6 @@ ES5Harness.registerTest({
     },
 
     precondition: function prereq() {
-        return fnExists(Object.create) && fnExists(Object.defineProperty);
+        return fnExists(Object.create) && fnExists(Object.defineProperty) && fnExists(Array.prototype.forEach) && fnExists(Object.getOwnPropertyNames);
     }
 });
diff --git a/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js b/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js
index ab01ae6916..54d2fda6e9 100644
--- a/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js
+++ b/test/suite/ietestcenter/chapter15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js
@@ -29,9 +29,9 @@ ES5Harness.registerTest({
 
         var props = new Error("test");
 
-        props.description = { value: 11 };
-        props.message = { value: 11 };
-        props.name = { value: 11 };
+        (Object.getOwnPropertyNames(props)).forEach(function(name){
+            props[name] = {value:11, configurable:true}
+        });
 
         props.prop = {
             value: 12,
@@ -42,6 +42,6 @@ ES5Harness.registerTest({
     },
 
     precondition: function prereq() {
-        return fnExists(Object.create);
+        return fnExists(Object.create) && fnExists(Array.prototype.forEach) && fnExists(Object.getOwnPropertyNames);
     }
 });
diff --git a/website/resources/scripts/testcases/chapter15.xml b/website/resources/scripts/testcases/chapter15.xml
index 696cb3f66a..fec48eedec 100644
--- a/website/resources/scripts/testcases/chapter15.xml
+++ b/website/resources/scripts/testcases/chapter15.xml
@@ -2,7 +2,7 @@
   <!-- adding section element if in the future we want to store information about the -->
   <!-- spec structure in this file, for now the section structure is defined in the   -->
   <!-- sections.js file                                                               -->
-  <section name="Chapter - chapter15" numTests="4312">
+  <section name="Chapter - chapter15" numTests="4313">
     <test id="15.1.1.1-0"><![CDATA[dmFyIGdsb2JhbCA9IHRoaXM7DQoNCg0KRVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMS4xLjEtMCIsDQoNCnBhdGg6ICJUZXN0Q2FzZXMvY2hhcHRlcjE1LzE1LjEvMTUuMS4xLzE1LjEuMS4xLzE1LjEuMS4xLTAuanMiLA0KDQpkZXNjcmlwdGlvbjogIkdsb2JhbC5OYU4gaXMgYSBkYXRhIHByb3BlcnR5IHdpdGggZGVmYXVsdCBhdHRyaWJ1dGUgdmFsdWVzIChmYWxzZSkiLA0KDQp0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGdsb2JhbCwgJ05hTicpOw0KICBpZiAoZGVzYy53cml0YWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuZW51bWVyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuY29uZmlndXJhYmxlID09PSBmYWxzZSkgew0KICAgIHJldHVybiB0cnVlOw0KICB9DQogfSwNCg0KcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogIHJldHVybiBmbkV4aXN0cyhPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKTsNCiB9DQp9KTsNCg==]]></test>
     <test id="15.1.1.2-0"><![CDATA[dmFyIGdsb2JhbCA9IHRoaXM7DQoNCg0KRVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMS4xLjItMCIsDQoNCnBhdGg6ICJUZXN0Q2FzZXMvY2hhcHRlcjE1LzE1LjEvMTUuMS4xLzE1LjEuMS4yLzE1LjEuMS4yLTAuanMiLA0KDQpkZXNjcmlwdGlvbjogIkdsb2JhbC5JbmZpbml0eSBpcyBhIGRhdGEgcHJvcGVydHkgd2l0aCBkZWZhdWx0IGF0dHJpYnV0ZSB2YWx1ZXMgKGZhbHNlKSIsDQoNCnRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KICB2YXIgZGVzYyA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoZ2xvYmFsLCAnSW5maW5pdHknKTsNCiAgaWYgKGRlc2Mud3JpdGFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmVudW1lcmFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmNvbmZpZ3VyYWJsZSA9PT0gZmFsc2UpIHsNCiAgICByZXR1cm4gdHJ1ZTsNCiAgfQ0KIH0sDQoNCnByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcik7DQogfQ0KfSk7DQo=]]></test>
     <test id="15.1.1.3-0"><![CDATA[dmFyIGdsb2JhbCA9IHRoaXM7DQoNCg0KRVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMS4xLjMtMCIsDQoNCnBhdGg6ICJUZXN0Q2FzZXMvY2hhcHRlcjE1LzE1LjEvMTUuMS4xLzE1LjEuMS4zLzE1LjEuMS4zLTAuanMiLA0KDQpkZXNjcmlwdGlvbjogIkdsb2JhbC51bmRlZmluZWQgaXMgYSBkYXRhIHByb3BlcnR5IHdpdGggZGVmYXVsdCBhdHRyaWJ1dGUgdmFsdWVzIChmYWxzZSkiLA0KDQp0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGdsb2JhbCwgJ3VuZGVmaW5lZCcpOw0KICBpZiAoZGVzYy53cml0YWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuZW51bWVyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuY29uZmlndXJhYmxlID09PSBmYWxzZSkgew0KICAgIHJldHVybiB0cnVlOw0KICB9DQogfSwNCg0KcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogIHJldHVybiBmbkV4aXN0cyhPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKTsNCiB9DQp9KTsNCg==]]></test>
@@ -427,6 +427,7 @@
     <test id="15.2.3.3-4-185"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xODUiLA0KDQpwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuMy8xNS4yLjMuMy00LTE4NS5qcyIsDQoNCmRlc2NyaXB0aW9uOiAiT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvciByZXR1cm5zIGRhdGEgZGVzYyAoYWxsIGZhbHNlKSBmb3IgcHJvcGVydGllcyBvbiBidWlsdC1pbnMgKEZ1bmN0aW9uLnByb3RvdHlwZSkiLA0KDQp0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKEZ1bmN0aW9uLCAicHJvdG90eXBlIik7DQoNCiAgaWYgKGRlc2Mud3JpdGFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmVudW1lcmFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmNvbmZpZ3VyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuaGFzT3duUHJvcGVydHkoJ2dldCcpID09PSBmYWxzZSAmJg0KICAgICAgZGVzYy5oYXNPd25Qcm9wZXJ0eSgnc2V0JykgPT09IGZhbHNlKSB7DQogICAgcmV0dXJuIHRydWU7DQogIH0NCiB9LA0KDQpwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IpOw0KIH0NCn0pOw0K]]></test>
     <test id="15.2.3.3-4-186"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xODYiLA0KDQpwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuMy8xNS4yLjMuMy00LTE4Ni5qcyIsDQoNCmRlc2NyaXB0aW9uOiAiT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvciByZXR1cm5zIGRhdGEgZGVzYyAoYWxsIGZhbHNlKSBmb3IgcHJvcGVydGllcyBvbiBidWlsdC1pbnMgKEZ1bmN0aW9uLmxlbmd0aCkiLA0KDQp0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKEZ1bmN0aW9uLCAibGVuZ3RoIik7DQoNCiAgaWYgKGRlc2Mud3JpdGFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmVudW1lcmFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmNvbmZpZ3VyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuaGFzT3duUHJvcGVydHkoJ2dldCcpID09PSBmYWxzZSAmJg0KICAgICAgZGVzYy5oYXNPd25Qcm9wZXJ0eSgnc2V0JykgPT09IGZhbHNlKSB7DQogICAgcmV0dXJuIHRydWU7DQogIH0NCiB9LA0KDQpwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IpOw0KIH0NCn0pOw0K]]></test>
     <test id="15.2.3.3-4-187"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xODciLA0KDQpwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuMy8xNS4yLjMuMy00LTE4Ny5qcyIsDQoNCmRlc2NyaXB0aW9uOiAiT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvciByZXR1cm5zIGRhdGEgZGVzYyAoYWxsIGZhbHNlKSBmb3IgcHJvcGVydGllcyBvbiBidWlsdC1pbnMgKEZ1bmN0aW9uIChpbnN0YW5jZSkubGVuZ3RoKSIsDQoNCnRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KICB2YXIgZiA9IEZ1bmN0aW9uKCdyZXR1cm4gNDI7Jyk7DQoNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGYsICJsZW5ndGgiKTsNCg0KICBpZiAoZGVzYy53cml0YWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuZW51bWVyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuY29uZmlndXJhYmxlID09PSBmYWxzZSAmJg0KICAgICAgZGVzYy5oYXNPd25Qcm9wZXJ0eSgnZ2V0JykgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmhhc093blByb3BlcnR5KCdzZXQnKSA9PT0gZmFsc2UpIHsNCiAgICByZXR1cm4gdHJ1ZTsNCiAgfQ0KIH0sDQoNCnByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcik7DQogfQ0KfSk7DQo=]]></test>
+    <test id="15.2.3.3-4-188"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xODgiLA0KDQpwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuMy8xNS4yLjMuMy00LTE4OC5qcyIsDQoNCmRlc2NyaXB0aW9uOiAiT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvciByZXR1cm5zIHVuZGVmaW5lZCBmb3Igbm9uLWV4aXN0ZW50IHByb3BlcnRpZXMgb24gYnVpbHQtaW5zIChGdW5jdGlvbiAoaW5zdGFuY2UpLm5hbWUpIiwNCg0KdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQogIHZhciBmID0gRnVuY3Rpb24oJ3JldHVybiA0MjsnKTsNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGYsICJmdW5jdGlvbk5hbWVIb3BlZnVsbHlEb2VzTm90RXhpc3QiKTsNCiAgcmV0dXJuIGRlc2MgPT09IHVuZGVmaW5lZDsNCiB9LA0KDQpwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IpOw0KIH0NCn0pOw0K]]></test>
     <test id="15.2.3.3-4-189"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xODkiLA0KDQpwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuMy8xNS4yLjMuMy00LTE4OS5qcyIsDQoNCmRlc2NyaXB0aW9uOiAiT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvciByZXR1cm5zIGRhdGEgZGVzYyAoYWxsIGZhbHNlKSBmb3IgcHJvcGVydGllcyBvbiBidWlsdC1pbnMgKEFycmF5LnByb3RvdHlwZSkiLA0KDQp0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCiAgdmFyIGRlc2MgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKEFycmF5LCAicHJvdG90eXBlIik7DQoNCiAgaWYgKGRlc2Mud3JpdGFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmVudW1lcmFibGUgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmNvbmZpZ3VyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuaGFzT3duUHJvcGVydHkoJ2dldCcpID09PSBmYWxzZSAmJg0KICAgICAgZGVzYy5oYXNPd25Qcm9wZXJ0eSgnc2V0JykgPT09IGZhbHNlKSB7DQogICAgcmV0dXJuIHRydWU7DQogIH0NCiB9LA0KDQpwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IpOw0KIH0NCn0pOw0K]]></test>
     <test id="15.2.3.3-4-19"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xOSIsDQoNCnBhdGg6ICJUZXN0Q2FzZXMvY2hhcHRlcjE1LzE1LjIvMTUuMi4zLzE1LjIuMy4zLzE1LjIuMy4zLTQtMTkuanMiLA0KDQpkZXNjcmlwdGlvbjogIk9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IgcmV0dXJucyBkYXRhIGRlc2MgZm9yIGZ1bmN0aW9ucyBvbiBidWlsdC1pbnMgKE9iamVjdC5kZWZpbmVQcm9wZXJ0aWVzKSIsDQoNCnRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KICB2YXIgZGVzYyA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoT2JqZWN0LCAiZGVmaW5lUHJvcGVydGllcyIpOw0KICBpZiAoZGVzYy52YWx1ZSA9PT0gT2JqZWN0LmRlZmluZVByb3BlcnRpZXMgJiYNCiAgICAgIGRlc2Mud3JpdGFibGUgPT09IHRydWUgJiYNCiAgICAgIGRlc2MuZW51bWVyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuY29uZmlndXJhYmxlID09PSB0cnVlKSB7DQogICAgcmV0dXJuIHRydWU7DQogIH0NCiB9LA0KDQpwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IpOw0KIH0NCn0pOw0K]]></test>
     <test id="15.2.3.3-4-190"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3QoIHsNCmlkOiAiMTUuMi4zLjMtNC0xOTAiLA0KDQpwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuMy8xNS4yLjMuMy00LTE5MC5qcyIsDQoNCmRlc2NyaXB0aW9uOiAiT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvciByZXR1cm5zIGRhdGEgZGVzYyAoYWxsIGZhbHNlKSBmb3IgcHJvcGVydGllcyBvbiBidWlsdC1pbnMgKFN0cmluZy5wcm90b3R5cGUpIiwNCg0KdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQogIHZhciBkZXNjID0gT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcihTdHJpbmcsICJwcm90b3R5cGUiKTsNCg0KICBpZiAoZGVzYy53cml0YWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuZW51bWVyYWJsZSA9PT0gZmFsc2UgJiYNCiAgICAgIGRlc2MuY29uZmlndXJhYmxlID09PSBmYWxzZSAmJg0KICAgICAgZGVzYy5oYXNPd25Qcm9wZXJ0eSgnZ2V0JykgPT09IGZhbHNlICYmDQogICAgICBkZXNjLmhhc093blByb3BlcnR5KCdzZXQnKSA9PT0gZmFsc2UpIHsNCiAgICByZXR1cm4gdHJ1ZTsNCiAgfQ0KIH0sDQoNCnByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcik7DQogfQ0KfSk7DQo=]]></test>
@@ -664,7 +665,7 @@
     <test id="15.2.3.5-4-137"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xMzciLA0KDQogICAgcGF0aDogIlRlc3RDYXNlcy9jaGFwdGVyMTUvMTUuMi8xNS4yLjMvMTUuMi4zLjUvMTUuMi4zLjUtNC0xMzcuanMiLA0KDQogICAgZGVzY3JpcHRpb246ICJPYmplY3QuY3JlYXRlIC0gJ2NvbmZpZ3VyYWJsZScgcHJvcGVydHkgb2Ygb25lIHByb3BlcnR5IGluICdQcm9wZXJ0aWVzJyBpcyBhIEZ1bmN0aW9uIG9iamVjdCAoOC4xMC41IHN0ZXAgNC5iKSIsDQoNCiAgICB0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCg0KICAgICAgICB2YXIgbmV3T2JqID0gT2JqZWN0LmNyZWF0ZSh7fSwgew0KICAgICAgICAgICAgcHJvcDogew0KICAgICAgICAgICAgICAgIGNvbmZpZ3VyYWJsZTogZnVuY3Rpb24gKCkgeyB9DQogICAgICAgICAgICB9DQogICAgICAgIH0pOw0KDQogICAgICAgIHZhciBiZWZvcmVEZWxldGVkID0gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQoNCiAgICAgICAgZGVsZXRlIG5ld09iai5wcm9wOw0KDQogICAgICAgIHZhciBhZnRlckRlbGV0ZWQgPSBuZXdPYmouaGFzT3duUHJvcGVydHkoInByb3AiKTsNCg0KICAgICAgICByZXR1cm4gYmVmb3JlRGVsZXRlZCA9PT0gdHJ1ZSAmJiBhZnRlckRlbGV0ZWQgPT09IGZhbHNlOw0KICAgIH0sDQoNCiAgICBwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgICAgICAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5jcmVhdGUpOw0KICAgIH0NCn0pOw0K]]></test>
     <test id="15.2.3.5-4-138"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xMzgiLA0KDQogICAgcGF0aDogIlRlc3RDYXNlcy9jaGFwdGVyMTUvMTUuMi8xNS4yLjMvMTUuMi4zLjUvMTUuMi4zLjUtNC0xMzguanMiLA0KDQogICAgZGVzY3JpcHRpb246ICJPYmplY3QuY3JlYXRlIC0gJ2NvbmZpZ3VyYWJsZScgcHJvcGVydHkgb2Ygb25lIHByb3BlcnR5IGluICdQcm9wZXJ0aWVzJyBpcyBhbiBBcnJheSBvYmplY3QgKDguMTAuNSBzdGVwIDQuYikiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIG5ld09iaiA9IE9iamVjdC5jcmVhdGUoe30sIHsNCiAgICAgICAgICAgIHByb3A6IHsNCiAgICAgICAgICAgICAgICBjb25maWd1cmFibGU6IFtdDQogICAgICAgICAgICB9DQogICAgICAgIH0pOw0KDQogICAgICAgIHZhciBiZWZvcmVEZWxldGVkID0gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQoNCiAgICAgICAgZGVsZXRlIG5ld09iai5wcm9wOw0KDQogICAgICAgIHZhciBhZnRlckRlbGV0ZWQgPSBuZXdPYmouaGFzT3duUHJvcGVydHkoInByb3AiKTsNCg0KICAgICAgICByZXR1cm4gYmVmb3JlRGVsZXRlZCA9PT0gdHJ1ZSAmJiBhZnRlckRlbGV0ZWQgPT09IGZhbHNlOw0KICAgIH0sDQoNCiAgICBwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgICAgICAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5jcmVhdGUpOw0KICAgIH0NCn0pOw0K]]></test>
     <test id="15.2.3.5-4-139"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xMzkiLA0KDQogICAgcGF0aDogIlRlc3RDYXNlcy9jaGFwdGVyMTUvMTUuMi8xNS4yLjMvMTUuMi4zLjUvMTUuMi4zLjUtNC0xMzkuanMiLA0KDQogICAgZGVzY3JpcHRpb246ICJPYmplY3QuY3JlYXRlIC0gJ2NvbmZpZ3VyYWJsZScgcHJvcGVydHkgb2Ygb25lIHByb3BlcnR5IGluICdQcm9wZXJ0aWVzJyBpcyBhIFN0cmluZyBvYmplY3QgKDguMTAuNSBzdGVwIDQuYikiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIG5ld09iaiA9IE9iamVjdC5jcmVhdGUoe30sIHsNCiAgICAgICAgICAgIHByb3A6IHsNCiAgICAgICAgICAgICAgICBjb25maWd1cmFibGU6IG5ldyBTdHJpbmcoImFiYyIpDQogICAgICAgICAgICB9DQogICAgICAgIH0pOw0KDQogICAgICAgIHZhciBiZWZvcmVEZWxldGVkID0gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQoNCiAgICAgICAgZGVsZXRlIG5ld09iai5wcm9wOw0KDQogICAgICAgIHZhciBhZnRlckRlbGV0ZWQgPSBuZXdPYmouaGFzT3duUHJvcGVydHkoInByb3AiKTsNCg0KICAgICAgICByZXR1cm4gYmVmb3JlRGVsZXRlZCA9PT0gdHJ1ZSAmJiBhZnRlckRlbGV0ZWQgPT09IGZhbHNlOw0KICAgIH0sDQoNCiAgICBwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgICAgICAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5jcmVhdGUpOw0KICAgIH0NCn0pOw0K]]></test>
-    <test id="15.2.3.5-4-14"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xNCIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTE0LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtIGFyZ3VtZW50ICdQcm9wZXJ0aWVzJyBpcyBhbiBFcnJvciBvYmplY3QgKDE1LjIuMy43IHN0ZXAgMikiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIHByb3BzID0gbmV3IEVycm9yKCJ0ZXN0Iik7DQogICAgICAgIHZhciByZXN1bHQgPSBmYWxzZTsNCg0KICAgICAgICBwcm9wcy5kZXNjcmlwdGlvbiA9IHsgdmFsdWU6IDExIH07DQogICAgICAgIHByb3BzLm1lc3NhZ2UgPSB7IHZhbHVlOiAxMSB9Ow0KICAgICAgICBwcm9wcy5uYW1lID0geyB2YWx1ZTogMTEgfTsNCg0KDQogICAgICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShwcm9wcywgInByb3AiLCB7DQogICAgICAgICAgICBnZXQ6IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzIGluc3RhbmNlb2YgRXJyb3I7DQogICAgICAgICAgICAgICAgcmV0dXJuIHt9Ow0KICAgICAgICAgICAgfSwNCiAgICAgICAgICAgIGVudW1lcmFibGU6IHRydWUNCiAgICAgICAgfSk7DQogICAgICAgIHZhciBuZXdPYmogPSBPYmplY3QuY3JlYXRlKHt9LCBwcm9wcyk7DQogICAgICAgIHJldHVybiByZXN1bHQgJiYgbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQogICAgfSwNCg0KICAgIHByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICAgICAgICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmNyZWF0ZSkgJiYgZm5FeGlzdHMoT2JqZWN0LmRlZmluZVByb3BlcnR5KTsNCiAgICB9DQp9KTsNCg==]]></test>
+    <test id="15.2.3.5-4-14"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xNCIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTE0LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtIGFyZ3VtZW50ICdQcm9wZXJ0aWVzJyBpcyBhbiBFcnJvciBvYmplY3QgKDE1LjIuMy43IHN0ZXAgMikiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIHByb3BzID0gbmV3IEVycm9yKCJ0ZXN0Iik7DQogICAgICAgIHZhciByZXN1bHQgPSBmYWxzZTsNCg0KICAgICAgICAoT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMocHJvcHMpKS5mb3JFYWNoKGZ1bmN0aW9uKG5hbWUpew0KICAgICAgICAgICAgcHJvcHNbbmFtZV0gPSB7dmFsdWU6MTEsIGNvbmZpZ3VyYWJsZTp0cnVlfQ0KICAgICAgICB9KTsNCg0KICAgICAgICBPYmplY3QuZGVmaW5lUHJvcGVydHkocHJvcHMsICJwcm9wIiwgew0KICAgICAgICAgICAgZ2V0OiBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhpcyBpbnN0YW5jZW9mIEVycm9yOw0KICAgICAgICAgICAgICAgIHJldHVybiB7fTsNCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICBlbnVtZXJhYmxlOiB0cnVlDQogICAgICAgIH0pOw0KICAgICAgICB2YXIgbmV3T2JqID0gT2JqZWN0LmNyZWF0ZSh7fSwgcHJvcHMpOw0KICAgICAgICByZXR1cm4gcmVzdWx0ICYmIG5ld09iai5oYXNPd25Qcm9wZXJ0eSgicHJvcCIpOw0KICAgIH0sDQoNCiAgICBwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgICAgICAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5jcmVhdGUpICYmIGZuRXhpc3RzKE9iamVjdC5kZWZpbmVQcm9wZXJ0eSkgJiYgZm5FeGlzdHMoQXJyYXkucHJvdG90eXBlLmZvckVhY2gpICYmIGZuRXhpc3RzKE9iamVjdC5nZXRPd25Qcm9wZXJ0eU5hbWVzKTsNCiAgICB9DQp9KTsNCg==]]></test>
     <test id="15.2.3.5-4-140"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xNDAiLA0KDQogICAgcGF0aDogIlRlc3RDYXNlcy9jaGFwdGVyMTUvMTUuMi8xNS4yLjMvMTUuMi4zLjUvMTUuMi4zLjUtNC0xNDAuanMiLA0KDQogICAgZGVzY3JpcHRpb246ICJPYmplY3QuY3JlYXRlIC0gJ2NvbmZpZ3VyYWJsZScgcHJvcGVydHkgb2Ygb25lIHByb3BlcnR5IGluICdQcm9wZXJ0aWVzJyBpcyBhIEJvb2xlYW4gb2JqZWN0ICg4LjEwLjUgc3RlcCA0LmIpIiwNCg0KICAgIHRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KDQogICAgICAgIHZhciBuZXdPYmogPSBPYmplY3QuY3JlYXRlKHt9LCB7DQogICAgICAgICAgICBwcm9wOiB7DQogICAgICAgICAgICAgICAgY29uZmlndXJhYmxlOiBuZXcgQm9vbGVhbih0cnVlKQ0KICAgICAgICAgICAgfQ0KICAgICAgICB9KTsNCg0KICAgICAgICB2YXIgYmVmb3JlRGVsZXRlZCA9IG5ld09iai5oYXNPd25Qcm9wZXJ0eSgicHJvcCIpOw0KDQogICAgICAgIGRlbGV0ZSBuZXdPYmoucHJvcDsNCg0KICAgICAgICB2YXIgYWZ0ZXJEZWxldGVkID0gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQoNCiAgICAgICAgcmV0dXJuIGJlZm9yZURlbGV0ZWQgPT09IHRydWUgJiYgYWZ0ZXJEZWxldGVkID09PSBmYWxzZTsNCiAgICB9LA0KDQogICAgcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogICAgICAgIHJldHVybiBmbkV4aXN0cyhPYmplY3QuY3JlYXRlKTsNCiAgICB9DQp9KTsNCg==]]></test>
     <test id="15.2.3.5-4-141"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xNDEiLA0KDQogICAgcGF0aDogIlRlc3RDYXNlcy9jaGFwdGVyMTUvMTUuMi8xNS4yLjMvMTUuMi4zLjUvMTUuMi4zLjUtNC0xNDEuanMiLA0KDQogICAgZGVzY3JpcHRpb246ICJPYmplY3QuY3JlYXRlIC0gJ2NvbmZpZ3VyYWJsZScgcHJvcGVydHkgb2Ygb25lIHByb3BlcnR5IGluICdQcm9wZXJ0aWVzJyBpcyBhIE51bWJlciBvYmplY3QgKDguMTAuNSBzdGVwIDQuYikiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIG5ld09iaiA9IE9iamVjdC5jcmVhdGUoe30sIHsNCiAgICAgICAgICAgIHByb3A6IHsNCiAgICAgICAgICAgICAgICBjb25maWd1cmFibGU6IG5ldyBOdW1iZXIoMTIzKQ0KICAgICAgICAgICAgfQ0KICAgICAgICB9KTsNCg0KICAgICAgICB2YXIgYmVmb3JlRGVsZXRlZCA9IG5ld09iai5oYXNPd25Qcm9wZXJ0eSgicHJvcCIpOw0KDQogICAgICAgIGRlbGV0ZSBuZXdPYmoucHJvcDsNCg0KICAgICAgICB2YXIgYWZ0ZXJEZWxldGVkID0gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQoNCiAgICAgICAgcmV0dXJuIGJlZm9yZURlbGV0ZWQgPT09IHRydWUgJiYgYWZ0ZXJEZWxldGVkID09PSBmYWxzZTsNCiAgICB9LA0KDQogICAgcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogICAgICAgIHJldHVybiBmbkV4aXN0cyhPYmplY3QuY3JlYXRlKTsNCiAgICB9DQp9KTsNCg==]]></test>
     <test id="15.2.3.5-4-142"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0xNDIiLA0KDQogICAgcGF0aDogIlRlc3RDYXNlcy9jaGFwdGVyMTUvMTUuMi8xNS4yLjMvMTUuMi4zLjUvMTUuMi4zLjUtNC0xNDIuanMiLA0KDQogICAgZGVzY3JpcHRpb246ICJPYmplY3QuY3JlYXRlIC0gJ2NvbmZpZ3VyYWJsZScgcHJvcGVydHkgb2Ygb25lIHByb3BlcnR5IGluICdQcm9wZXJ0aWVzJyBpcyB0aGUgTWF0aCBvYmplY3QgKDguMTAuNSBzdGVwIDQuYikiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIG5ld09iaiA9IE9iamVjdC5jcmVhdGUoe30sIHsNCiAgICAgICAgICAgIHByb3A6IHsNCiAgICAgICAgICAgICAgICBjb25maWd1cmFibGU6IE1hdGgNCiAgICAgICAgICAgIH0NCiAgICAgICAgfSk7DQoNCiAgICAgICAgdmFyIGJlZm9yZURlbGV0ZWQgPSBuZXdPYmouaGFzT3duUHJvcGVydHkoInByb3AiKTsNCg0KICAgICAgICBkZWxldGUgbmV3T2JqLnByb3A7DQoNCiAgICAgICAgdmFyIGFmdGVyRGVsZXRlZCA9IG5ld09iai5oYXNPd25Qcm9wZXJ0eSgicHJvcCIpOw0KDQogICAgICAgIHJldHVybiBiZWZvcmVEZWxldGVkID09PSB0cnVlICYmIGFmdGVyRGVsZXRlZCA9PT0gZmFsc2U7DQogICAgfSwNCg0KICAgIHByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICAgICAgICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmNyZWF0ZSk7DQogICAgfQ0KfSk7DQo=]]></test>
@@ -857,7 +858,7 @@
     <test id="15.2.3.5-4-34"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zNCIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM0LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtICdQcm9wZXJ0aWVzJyBpcyBhIERhdGUgb2JqZWN0IHRoYXQgdXNlcyBPYmplY3QncyBbW0dldF1dIG1ldGhvZCB0byBhY2Nlc3Mgb3duIGVudW1lcmFibGUgcHJvcGVydHkgKDE1LjIuMy43IHN0ZXAgNS5hKSIsDQoNCiAgICB0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCg0KICAgICAgICB2YXIgcHJvcHMgPSBuZXcgRGF0ZSgpOw0KICAgICAgICBwcm9wcy5wcm9wID0gew0KICAgICAgICAgICAgdmFsdWU6IDEyLA0KICAgICAgICAgICAgZW51bWVyYWJsZTogdHJ1ZQ0KICAgICAgICB9Ow0KICAgICAgICB2YXIgbmV3T2JqID0gT2JqZWN0LmNyZWF0ZSh7fSwgcHJvcHMpOw0KICAgICAgICByZXR1cm4gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQogICAgfSwNCg0KICAgIHByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICAgICAgICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmNyZWF0ZSk7DQogICAgfQ0KfSk7DQo=]]></test>
     <test id="15.2.3.5-4-35"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zNSIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM1LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtICdQcm9wZXJ0aWVzJyBpcyBhIFJlZ0V4cCBvYmplY3QgdGhhdCB1c2VzIE9iamVjdCdzIFtbR2V0XV0gbWV0aG9kIHRvIGFjY2VzcyBvd24gZW51bWVyYWJsZSBwcm9wZXJ0eSAoMTUuMi4zLjcgc3RlcCA1LmEpIiwNCg0KICAgIHRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KDQogICAgICAgIHZhciBwcm9wcyA9IG5ldyBSZWdFeHAoKTsNCiAgICAgICAgcHJvcHMucHJvcCA9IHsNCiAgICAgICAgICAgIHZhbHVlOiAxMiwNCiAgICAgICAgICAgIGVudW1lcmFibGU6IHRydWUNCiAgICAgICAgfTsNCiAgICAgICAgdmFyIG5ld09iaiA9IE9iamVjdC5jcmVhdGUoe30sIHByb3BzKTsNCiAgICAgICAgcmV0dXJuIG5ld09iai5oYXNPd25Qcm9wZXJ0eSgicHJvcCIpOw0KICAgIH0sDQoNCiAgICBwcmVjb25kaXRpb246IGZ1bmN0aW9uIHByZXJlcSgpIHsNCiAgICAgICAgcmV0dXJuIGZuRXhpc3RzKE9iamVjdC5jcmVhdGUpOw0KICAgIH0NCn0pOw0K]]></test>
     <test id="15.2.3.5-4-36"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zNiIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM2LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtICdQcm9wZXJ0aWVzJyBpcyB0aGUgSlNPTiBvYmplY3QgdGhhdCB1c2VzIE9iamVjdCdzIFtbR2V0XV0gbWV0aG9kIHRvIGFjY2VzcyBvd24gZW51bWVyYWJsZSBwcm9wZXJ0eSAoMTUuMi4zLjcgc3RlcCA1LmEpIiwNCg0KICAgIHRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KDQogICAgICAgIHRyeSB7DQogICAgICAgICAgICBKU09OLnByb3AgPSB7DQogICAgICAgICAgICAgICAgdmFsdWU6IDEyLA0KICAgICAgICAgICAgICAgIGVudW1lcmFibGU6IHRydWUNCiAgICAgICAgICAgIH07DQogICAgICAgICAgICB2YXIgbmV3T2JqID0gT2JqZWN0LmNyZWF0ZSh7fSwgSlNPTik7DQogICAgICAgICAgICByZXR1cm4gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQogICAgICAgIH0gZmluYWxseSB7DQogICAgICAgICAgICBkZWxldGUgSlNPTi5wcm9wOw0KICAgICAgICB9DQogICAgfSwNCg0KICAgIHByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICAgICAgICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmNyZWF0ZSk7DQogICAgfQ0KfSk7DQo=]]></test>
-    <test id="15.2.3.5-4-37"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zNyIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM3LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtICdQcm9wZXJ0aWVzJyBpcyBhbiBFcnJvciBvYmplY3QgdGhhdCB1c2VzIE9iamVjdCdzIFtbR2V0XV0gbWV0aG9kIHRvIGFjY2VzcyBvd24gZW51bWVyYWJsZSBwcm9wZXJ0eSAoMTUuMi4zLjcgc3RlcCA1LmEpIiwNCg0KICAgIHRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KDQogICAgICAgIHZhciBwcm9wcyA9IG5ldyBFcnJvcigidGVzdCIpOw0KDQogICAgICAgIHByb3BzLmRlc2NyaXB0aW9uID0geyB2YWx1ZTogMTEgfTsNCiAgICAgICAgcHJvcHMubWVzc2FnZSA9IHsgdmFsdWU6IDExIH07DQogICAgICAgIHByb3BzLm5hbWUgPSB7IHZhbHVlOiAxMSB9Ow0KDQogICAgICAgIHByb3BzLnByb3AgPSB7DQogICAgICAgICAgICB2YWx1ZTogMTIsDQogICAgICAgICAgICBlbnVtZXJhYmxlOiB0cnVlDQogICAgICAgIH07DQogICAgICAgIHZhciBuZXdPYmogPSBPYmplY3QuY3JlYXRlKHt9LCBwcm9wcyk7DQogICAgICAgIHJldHVybiBuZXdPYmouaGFzT3duUHJvcGVydHkoInByb3AiKTsNCiAgICB9LA0KDQogICAgcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogICAgICAgIHJldHVybiBmbkV4aXN0cyhPYmplY3QuY3JlYXRlKTsNCiAgICB9DQp9KTsNCg==]]></test>
+    <test id="15.2.3.5-4-37"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zNyIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM3LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtICdQcm9wZXJ0aWVzJyBpcyBhbiBFcnJvciBvYmplY3QgdGhhdCB1c2VzIE9iamVjdCdzIFtbR2V0XV0gbWV0aG9kIHRvIGFjY2VzcyBvd24gZW51bWVyYWJsZSBwcm9wZXJ0eSAoMTUuMi4zLjcgc3RlcCA1LmEpIiwNCg0KICAgIHRlc3Q6IGZ1bmN0aW9uIHRlc3RjYXNlKCkgew0KDQogICAgICAgIHZhciBwcm9wcyA9IG5ldyBFcnJvcigidGVzdCIpOw0KDQogICAgICAgIChPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhwcm9wcykpLmZvckVhY2goZnVuY3Rpb24obmFtZSl7DQogICAgICAgICAgICBwcm9wc1tuYW1lXSA9IHt2YWx1ZToxMSwgY29uZmlndXJhYmxlOnRydWV9DQogICAgICAgIH0pOw0KDQogICAgICAgIHByb3BzLnByb3AgPSB7DQogICAgICAgICAgICB2YWx1ZTogMTIsDQogICAgICAgICAgICBlbnVtZXJhYmxlOiB0cnVlDQogICAgICAgIH07DQogICAgICAgIHZhciBuZXdPYmogPSBPYmplY3QuY3JlYXRlKHt9LCBwcm9wcyk7DQogICAgICAgIHJldHVybiBuZXdPYmouaGFzT3duUHJvcGVydHkoInByb3AiKTsNCiAgICB9LA0KDQogICAgcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogICAgICAgIHJldHVybiBmbkV4aXN0cyhPYmplY3QuY3JlYXRlKSAmJiBmbkV4aXN0cyhBcnJheS5wcm90b3R5cGUuZm9yRWFjaCkgJiYgZm5FeGlzdHMoT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMpOw0KICAgIH0NCn0pOw0K]]></test>
     <test id="15.2.3.5-4-38"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zOCIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM4LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtICdQcm9wZXJ0aWVzJyBpcyBhbiBBcmd1bWVudHMgb2JqZWN0IHdoaWNoIGltcGxlbWVudHMgaXRzIG93biBbW0dldF1dIG1ldGhvZCB0byBhY2Nlc3Mgb3duIGVudW1lcmFibGUgcHJvcGVydHkgKDE1LjIuMy43IHN0ZXAgNS5hKSIsDQoNCiAgICB0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCg0KICAgICAgICB2YXIgYXJnT2JqID0gKGZ1bmN0aW9uICgpIHsgcmV0dXJuIGFyZ3VtZW50czsgfSkoKTsNCg0KICAgICAgICBhcmdPYmoucHJvcCA9IHsNCiAgICAgICAgICAgIHZhbHVlOiAxMiwNCiAgICAgICAgICAgIGVudW1lcmFibGU6IHRydWUNCiAgICAgICAgfTsNCg0KICAgICAgICB2YXIgbmV3T2JqID0gT2JqZWN0LmNyZWF0ZSh7fSwgYXJnT2JqKTsNCg0KICAgICAgICByZXR1cm4gbmV3T2JqLmhhc093blByb3BlcnR5KCJwcm9wIik7DQogICAgfSwNCg0KICAgIHByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICAgICAgICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmNyZWF0ZSk7DQogICAgfQ0KfSk7DQo=]]></test>
     <test id="15.2.3.5-4-39"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC0zOSIsDQoNCiAgICBwYXRoOiAiVGVzdENhc2VzL2NoYXB0ZXIxNS8xNS4yLzE1LjIuMy8xNS4yLjMuNS8xNS4yLjMuNS00LTM5LmpzIiwNCg0KICAgIGRlc2NyaXB0aW9uOiAiT2JqZWN0LmNyZWF0ZSAtIGVuc3VyZSB0aGF0IHNpZGUtZWZmZWN0cyBvZiBnZXRzIG9jY3VyIGluIHRoZSBzYW1lIG9yZGVyIGFzIHRoZXkgd291bGQgZm9yOiBmb3IgKFAgaW4gcHJvcHMpIHByb3BzW1BdICgxNS4yLjMuNyBzdGVwIDUuYSkiLA0KDQogICAgdGVzdDogZnVuY3Rpb24gdGVzdGNhc2UoKSB7DQoNCiAgICAgICAgdmFyIHByb3BzID0ge307DQogICAgICAgIHByb3BzLnByb3AxID0geyB2YWx1ZTogMTIsIGVudW1lcmFibGU6IHRydWUgfTsNCiAgICAgICAgcHJvcHMucHJvcDIgPSB7IHZhbHVlOiB0cnVlLCBlbnVtZXJhYmxlOiB0cnVlIH07DQoNCiAgICAgICAgdmFyIHRlbXBBcnJheSA9IFtdOw0KICAgICAgICBmb3IgKHZhciBwIGluIHByb3BzKSB7DQogICAgICAgICAgICBpZiAocHJvcHMuaGFzT3duUHJvcGVydHkocCkpIHsNCiAgICAgICAgICAgICAgICB0ZW1wQXJyYXkucHVzaChwKTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgfQ0KDQogICAgICAgIHZhciBuZXdPYmogPSBPYmplY3QuY3JlYXRlKHt9LCBwcm9wcyk7DQogICAgICAgIHZhciBpbmRleCA9IDA7DQogICAgICAgIGZvciAodmFyIHEgaW4gbmV3T2JqKSB7DQogICAgICAgICAgICBpZiAodGVtcEFycmF5W2luZGV4KytdICE9PSBxICYmIG5ld09iai5oYXNPd25Qcm9wZXJ0eShxKSkgew0KICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gdHJ1ZTsgICAgICAgICANCiAgICB9LA0KDQogICAgcHJlY29uZGl0aW9uOiBmdW5jdGlvbiBwcmVyZXEoKSB7DQogICAgICAgIHJldHVybiBmbkV4aXN0cyhPYmplY3QuY3JlYXRlKTsNCiAgICB9DQp9KTsNCg==]]></test>
     <test id="15.2.3.5-4-4"><![CDATA[RVM1SGFybmVzcy5yZWdpc3RlclRlc3Qoew0KICAgIGlkOiAiMTUuMi4zLjUtNC00IiwNCg0KICAgIHBhdGg6ICJUZXN0Q2FzZXMvY2hhcHRlcjE1LzE1LjIvMTUuMi4zLzE1LjIuMy41LzE1LjIuMy41LTQtNC5qcyIsDQoNCiAgICBkZXNjcmlwdGlvbjogIk9iamVjdC5jcmVhdGUgLSBhcmd1bWVudCAnUHJvcGVydGllcycgaXMgYW4gb2JqZWN0ICgxNS4yLjMuNyBzdGVwIDIpLiIsDQoNCiAgICB0ZXN0OiBmdW5jdGlvbiB0ZXN0Y2FzZSgpIHsNCg0KICAgICAgICB2YXIgcHJvcHMgPSB7fTsNCiAgICAgICAgdmFyIHJlc3VsdCA9IGZhbHNlOw0KDQogICAgICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShwcm9wcywgInByb3AiLCB7DQogICAgICAgICAgICBnZXQ6IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzIGluc3RhbmNlb2YgT2JqZWN0Ow0KICAgICAgICAgICAgICAgIHJldHVybiB7fTsNCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICBlbnVtZXJhYmxlOiB0cnVlDQogICAgICAgIH0pOw0KICAgICAgICBPYmplY3QuY3JlYXRlKHt9LCBwcm9wcyk7DQogICAgICAgIHJldHVybiByZXN1bHQ7DQogICAgfSwNCg0KICAgIHByZWNvbmRpdGlvbjogZnVuY3Rpb24gcHJlcmVxKCkgew0KICAgICAgICByZXR1cm4gZm5FeGlzdHMoT2JqZWN0LmNyZWF0ZSkgJiYgZm5FeGlzdHMoT2JqZWN0LmRlZmluZVByb3BlcnR5KTsNCiAgICB9DQp9KTsNCg==]]></test>
diff --git a/website/resources/scripts/testcases/testcaseslist.xml b/website/resources/scripts/testcases/testcaseslist.xml
index ea5a8d8a1b..bbe9f8804e 100644
--- a/website/resources/scripts/testcases/testcaseslist.xml
+++ b/website/resources/scripts/testcases/testcaseslist.xml
@@ -1,4 +1,4 @@
-<testSuite numTests="9702" version="0.5.1" date="02/28/2011">
+<testSuite numTests="9703" version="0.5.1" date="03/01/2011">
   <testGroup>resources/scripts/testcases/07_Lexical_Conventions.xml</testGroup>
   <testGroup>resources/scripts/testcases/08_Types.xml</testGroup>
   <testGroup>resources/scripts/testcases/09_Type_Conversion.xml</testGroup>