Just change in generated formatting

This commit is contained in:
Mark Miller 2011-09-30 04:03:28 -04:00
parent 64db10aa2d
commit 68f00c57a3
2 changed files with 56 additions and 28 deletions

View File

@ -1,14 +1,14 @@
/// Copyright (c) 2011 Microsoft Corporation /// Copyright (c) 2011 Microsoft Corporation
/// ///
/// Redistribution and use in source and binary forms, with or without modification, are permitted provided /// Redistribution and use in source and binary forms, with or without modification, are permitted provided
/// that the following conditions are met: /// that the following conditions are met:
/// * Redistributions of source code must retain the above copyright notice, this list of conditions and /// * Redistributions of source code must retain the above copyright notice, this list of conditions and
/// the following disclaimer. /// the following disclaimer.
/// * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and /// * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
/// the following disclaimer in the documentation and/or other materials provided with the distribution. /// the following disclaimer in the documentation and/or other materials provided with the distribution.
/// * Neither the name of Microsoft nor the names of its contributors may be used to /// * Neither the name of Microsoft nor the names of its contributors may be used to
/// endorse or promote products derived from this software without specific prior written permission. /// endorse or promote products derived from this software without specific prior written permission.
/// ///
/// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR /// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
/// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS /// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
/// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE /// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
@ -16,40 +16,68 @@
/// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS /// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
/// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, /// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
/// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF /// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
/// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//Global Scope Test Case Validator //Global Scope Test Case Validator
//An exception is expected //An exception is expected
if (testDescrip.negative !== undefined) { if (testDescrip.negative !== undefined) {
//TODO - come up with a generic way of catching the error type from this.onerror //TODO - come up with a generic way of catching the error type
//from this.onerror
testDescrip.negative = testDescrip.negative === "NotEarlyError" ? testDescrip.negative = testDescrip.negative === "NotEarlyError" ?
testDescrip.negative : (testDescrip.negative === "^((?!NotEarlyError).)*$" ? testDescrip.negative :
testDescrip.negative : "."); (testDescrip.negative === "^((?!NotEarlyError).)*$" ?
testDescrip.negative : ".");
if (this.iframeError === undefined) { //no exception was thrown if (this.iframeError === undefined) { //no exception was thrown
testRun(testDescrip.id, testDescrip.path, testDescrip.description, testDescrip.code, testRun(testDescrip.id,
'fail', testDescrip.path,
Error('No exception was thrown; expected an error "message" property matching the regular expression "' + testDescrip.negative + '".')); testDescrip.description,
} else if (!(new RegExp(testDescrip.negative, "i").test(this.iframeError))) { //wrong type of exception thrown testDescrip.code,
testRun(testDescrip.id, testDescrip.path, testDescrip.description, testDescrip.code, 'fail',
'fail', Error('No exception was thrown; expected an error "message"' +
Error('Expected an exception with a "message" property matching the regular expression "' + testDescrip.negative +'" to be thrown; actual was "' + this.iframeError + '".')); ' property matching the regular expression "' +
testDescrip.negative + '".'));
} else if (!(new RegExp(testDescrip.negative,
"i").test(this.iframeError))) {
//wrong type of exception thrown
testRun(testDescrip.id,
testDescrip.path,
testDescrip.description,
testDescrip.code,
'fail',
Error('Expected an exception with a "message"' +
' property matching the regular expression "' +
testDescrip.negative +
'" to be thrown; actual was "' +
this.iframeError + '".'));
} else { } else {
testRun(testDescrip.id, testDescrip.path, testDescrip.description, testDescrip.code, testRun(testDescrip.id,
'pass', undefined); testDescrip.path,
testDescrip.description,
testDescrip.code,
'pass',
undefined);
} }
} }
//Exception was not expected to be thrown //Exception was not expected to be thrown
else if (this.iframeError !== undefined) { else if (this.iframeError !== undefined) {
testRun(testDescrip.id, testDescrip.path, testDescrip.description, testDescrip.code, testRun(testDescrip.id,
'fail', testDescrip.path,
Error('Unexpected exception, "' + this.iframeError + '" was thrown.')); testDescrip.description,
} testDescrip.code,
'fail',
Error('Unexpected exception, "' +
this.iframeError + '" was thrown.'));
}
else { else {
testRun(testDescrip.id, testDescrip.path, testDescrip.description, testDescrip.code, testRun(testDescrip.id,
'pass', undefined); testDescrip.path,
testDescrip.description,
testDescrip.code,
'pass',
undefined);
} }
testFinished(); testFinished();

View File

@ -6,7 +6,7 @@
<script type="text/javascript" src="harness/sections.js"></script> <script type="text/javascript" src="harness/sections.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//Globals //Globals
var TEST_LIST_PATH = "json/default.json"; var TEST_LIST_PATH = "json/default.json";
</script> </script>
<script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="harness/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script> <script type="text/javascript" src="harness/sta.js"></script>