From ebdd0a99e6cd293b5a00af52ef3ef91eddd6e089 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@microsoft.com>
Date: Thu, 9 Aug 2012 12:29:48 -0700
Subject: [PATCH] Fixing Intl402 and BestPractice pages as per bug
https://bugs.ecmascript.org/show_bug.cgi?id=611
---
.../templates/runner.bestPractice.html | 36 ++++++++++++-------
tools/packaging/templates/runner.intl402.html | 35 ++++++++++++------
website/json/suiteDescrip.json | 2 +-
website/testcases_bestPractice.html | 36 ++++++++++++-------
website/testcases_intl402.html | 35 ++++++++++++------
5 files changed, 97 insertions(+), 47 deletions(-)
diff --git a/tools/packaging/templates/runner.bestPractice.html b/tools/packaging/templates/runner.bestPractice.html
index 0dd958ea6d..aafde33211 100644
--- a/tools/packaging/templates/runner.bestPractice.html
+++ b/tools/packaging/templates/runner.bestPractice.html
@@ -75,7 +75,7 @@
<div class="content-dev">
<p class="headers">Development</p>
- <p class="content">Test262 Best Practices is being developed by the members of Ecma TC39. Ecma's intellectual property policies, permit only Ecma
+ <p class="content">Test262 is being developed by the members of Ecma TC39. Ecma's intellectual property policies, permit only Ecma
members to directly contribute code to the project. However, a <a href='javascript:void(window.open("http://mail.mozilla.org/pipermail/test262-discuss/"));'>public mailing list</a> is used to coordinate development of Test262. If you wish to participate in the discussion please <a href='javascript:void(window.open("http://mail.mozilla.org/listinfo/test262-discuss"));'>subscribe</a>. Bug reports and suggestions should be sent to the mailing list.
</p>
<p class="content">
@@ -85,31 +85,43 @@
<div class="content-tests">
<!-- This is the Main Content Container -->
- <p class="content">Please click on the Start button to start the test. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run.</p>
-<!--
- <div class="progressBarHolder">
- Chapter Index: <input type="text" size="2" maxlength="2" value="" id="chapterId" onkeypress="if(event.keyCode < 48 || event.keyCode > 57){return false;}"/>
- </div>
--->
+ <p class="content">Please click on the Run All button to run all the tests. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run. You may run individual tests by clicking the Run button next to the tests listed below. If you wish to run several chapters in sequence, but not the entire test suite, click the Select button for the chapters you wish to run and then click the Run Selected button.</p>
+
<!-- This is the Progress Bar Holder -->
<div class="progressBarHolder">
<div id="progressbar"></div>
<div class="progressBarButtons">
- <img src="images/reset.png" class="button-reset"/> <img src="images/start.png" class="button-start" id="btnStart"/>
+ <!-- Loading: Run All, Run Selected -->
+ <!-- Loaded: Run All, Run Selected -->
+ <!-- Running: Pause -->
+ <!-- Paused: Resume, Reset -->
+ <img src="images/runall.png" alt="Run All" title="Run all tests." id="btnRunAll" />
+ <img src="images/runselected.png" alt="Run Selected Tests" title="Run the tests selected below." id="btnRunSelected" />
+ <img src="images/pause.png" alt="Pause" title="Pause the running tests." id="btnPause" />
+ <img src="images/resume.png" alt="Resume" title="Resume the running tests." id="btnResume" />
+ <img src="images/reset.png" alt="Reset" title="Reset testing status." id="btnReset" />
</div>
<div style="clear: both;"></div>
</div>
- <p class="hide">>
+ <p class="hide">
Timer Value(ms) : <input id="txtTimerValue" value="50" /> <input id="btnSetTimerValue" value="Set Timer Value" type="button"/>
</p>
+
<!-- This is the Results Text Holder -->
<div class="resultsHeader">
- <!--Total Loaded: <strong><span id="totalLoadedCounter"></span></strong><span class="Separator">|</span>-->
Tests To Run: <strong><span class="teststorun-counter" id="testsToRun"></span></strong> <span class="separator">|</span>
- Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span> Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span> Fail: <span class="fail" id="Fail"></span>
- <span class="separator">|</span> Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
+ Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span>
+ Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span>
+ Fail: <span class="fail" id="Fail"></span> <span class="separator">|</span>
+ Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
<p><span id="nextActivity"></span></p>
</div>
+
+ <!-- Test Chapter selector -->
+ <div id="chapterSelector">
+ <table width="100%" border="0" cellspacing="0" cellpadding="2"></table>
+ </div>
+
<!-- This is the Table -->
<div class="resultsTableHolder" id="tableLoggerParent">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table-logger" id="tableLogger"></table>
diff --git a/tools/packaging/templates/runner.intl402.html b/tools/packaging/templates/runner.intl402.html
index 13aa7db6cf..1c9a5e5893 100644
--- a/tools/packaging/templates/runner.intl402.html
+++ b/tools/packaging/templates/runner.intl402.html
@@ -89,31 +89,43 @@
<div class="content-tests">
<!-- This is the Main Content Container -->
- <p class="content">Please click on the Start button to start the test. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run.</p>
-<!--
- <div class="progressBarHolder">
- Chapter Index: <input type="text" size="2" maxlength="2" value="" id="chapterId" onkeypress="if(event.keyCode < 48 || event.keyCode > 57){return false;}"/>
- </div>
--->
+ <p class="content">Please click on the Run All button to run all the tests. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run. You may run individual tests by clicking the Run button next to the tests listed below. If you wish to run several chapters in sequence, but not the entire test suite, click the Select button for the chapters you wish to run and then click the Run Selected button.</p>
+
<!-- This is the Progress Bar Holder -->
<div class="progressBarHolder">
<div id="progressbar"></div>
<div class="progressBarButtons">
- <img src="images/reset.png" class="button-reset"/> <img src="images/start.png" class="button-start" id="btnStart"/>
+ <!-- Loading: Run All, Run Selected -->
+ <!-- Loaded: Run All, Run Selected -->
+ <!-- Running: Pause -->
+ <!-- Paused: Resume, Reset -->
+ <img src="images/runall.png" alt="Run All" title="Run all tests." id="btnRunAll" />
+ <img src="images/runselected.png" alt="Run Selected Tests" title="Run the tests selected below." id="btnRunSelected" />
+ <img src="images/pause.png" alt="Pause" title="Pause the running tests." id="btnPause" />
+ <img src="images/resume.png" alt="Resume" title="Resume the running tests." id="btnResume" />
+ <img src="images/reset.png" alt="Reset" title="Reset testing status." id="btnReset" />
</div>
<div style="clear: both;"></div>
</div>
- <p class="hide">>
+ <p class="hide">
Timer Value(ms) : <input id="txtTimerValue" value="50" /> <input id="btnSetTimerValue" value="Set Timer Value" type="button"/>
</p>
+
<!-- This is the Results Text Holder -->
<div class="resultsHeader">
- <!--Total Loaded: <strong><span id="totalLoadedCounter"></span></strong><span class="Separator">|</span>-->
Tests To Run: <strong><span class="teststorun-counter" id="testsToRun"></span></strong> <span class="separator">|</span>
- Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span> Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span> Fail: <span class="fail" id="Fail"></span>
- <span class="separator">|</span> Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
+ Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span>
+ Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span>
+ Fail: <span class="fail" id="Fail"></span> <span class="separator">|</span>
+ Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
<p><span id="nextActivity"></span></p>
</div>
+
+ <!-- Test Chapter selector -->
+ <div id="chapterSelector">
+ <table width="100%" border="0" cellspacing="0" cellpadding="2"></table>
+ </div>
+
<!-- This is the Table -->
<div class="resultsTableHolder" id="tableLoggerParent">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table-logger" id="tableLogger"></table>
@@ -142,6 +154,7 @@
Test Suite Ver.: <span class="targetTestSuiteVersion"></span> <span class="separator">|</span> Test Suite Date: <span class="targetTestSuiteDate"></span>
</div>
<div class="downloadLinks">
+ <p><a class="anchor-download-xml" id="ancGenXMLReport"><strong>Download results as XML</strong></a></p> <!--| <strong><a href="scripts/testcases.zip">Download Source</a></strong></p>-->
</div>
<div id="legend" class="hide">
<label class="reportGreen">Green:</label> 100%
diff --git a/website/json/suiteDescrip.json b/website/json/suiteDescrip.json
index 86dad2dc3d..f6170177f6 100644
--- a/website/json/suiteDescrip.json
+++ b/website/json/suiteDescrip.json
@@ -1 +1 @@
-{"date":"2012-08-08","version":"ES5.1"}
\ No newline at end of file
+{"date":"2012-08-09","version":"ES5.1"}
\ No newline at end of file
diff --git a/website/testcases_bestPractice.html b/website/testcases_bestPractice.html
index 51196b2741..aa1982b316 100644
--- a/website/testcases_bestPractice.html
+++ b/website/testcases_bestPractice.html
@@ -75,7 +75,7 @@
<div class="content-dev">
<p class="headers">Development</p>
- <p class="content">Test262 Best Practices is being developed by the members of Ecma TC39. Ecma's intellectual property policies, permit only Ecma
+ <p class="content">Test262 is being developed by the members of Ecma TC39. Ecma's intellectual property policies, permit only Ecma
members to directly contribute code to the project. However, a <a href='javascript:void(window.open("http://mail.mozilla.org/pipermail/test262-discuss/"));'>public mailing list</a> is used to coordinate development of Test262. If you wish to participate in the discussion please <a href='javascript:void(window.open("http://mail.mozilla.org/listinfo/test262-discuss"));'>subscribe</a>. Bug reports and suggestions should be sent to the mailing list.
</p>
<p class="content">
@@ -85,31 +85,43 @@
<div class="content-tests">
<!-- This is the Main Content Container -->
- <p class="content">Please click on the Start button to start the test. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run.</p>
-<!--
- <div class="progressBarHolder">
- Chapter Index: <input type="text" size="2" maxlength="2" value="" id="chapterId" onkeypress="if(event.keyCode < 48 || event.keyCode > 57){return false;}"/>
- </div>
--->
+ <p class="content">Please click on the Run All button to run all the tests. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run. You may run individual tests by clicking the Run button next to the tests listed below. If you wish to run several chapters in sequence, but not the entire test suite, click the Select button for the chapters you wish to run and then click the Run Selected button.</p>
+
<!-- This is the Progress Bar Holder -->
<div class="progressBarHolder">
<div id="progressbar"></div>
<div class="progressBarButtons">
- <img src="images/reset.png" class="button-reset"/> <img src="images/start.png" class="button-start" id="btnStart"/>
+ <!-- Loading: Run All, Run Selected -->
+ <!-- Loaded: Run All, Run Selected -->
+ <!-- Running: Pause -->
+ <!-- Paused: Resume, Reset -->
+ <img src="images/runall.png" alt="Run All" title="Run all tests." id="btnRunAll" />
+ <img src="images/runselected.png" alt="Run Selected Tests" title="Run the tests selected below." id="btnRunSelected" />
+ <img src="images/pause.png" alt="Pause" title="Pause the running tests." id="btnPause" />
+ <img src="images/resume.png" alt="Resume" title="Resume the running tests." id="btnResume" />
+ <img src="images/reset.png" alt="Reset" title="Reset testing status." id="btnReset" />
</div>
<div style="clear: both;"></div>
</div>
- <p class="hide">>
+ <p class="hide">
Timer Value(ms) : <input id="txtTimerValue" value="50" /> <input id="btnSetTimerValue" value="Set Timer Value" type="button"/>
</p>
+
<!-- This is the Results Text Holder -->
<div class="resultsHeader">
- <!--Total Loaded: <strong><span id="totalLoadedCounter"></span></strong><span class="Separator">|</span>-->
Tests To Run: <strong><span class="teststorun-counter" id="testsToRun"></span></strong> <span class="separator">|</span>
- Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span> Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span> Fail: <span class="fail" id="Fail"></span>
- <span class="separator">|</span> Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
+ Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span>
+ Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span>
+ Fail: <span class="fail" id="Fail"></span> <span class="separator">|</span>
+ Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
<p><span id="nextActivity"></span></p>
</div>
+
+ <!-- Test Chapter selector -->
+ <div id="chapterSelector">
+ <table width="100%" border="0" cellspacing="0" cellpadding="2"></table>
+ </div>
+
<!-- This is the Table -->
<div class="resultsTableHolder" id="tableLoggerParent">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table-logger" id="tableLogger"></table>
diff --git a/website/testcases_intl402.html b/website/testcases_intl402.html
index 344d44007a..44a2ea1573 100644
--- a/website/testcases_intl402.html
+++ b/website/testcases_intl402.html
@@ -89,31 +89,43 @@
<div class="content-tests">
<!-- This is the Main Content Container -->
- <p class="content">Please click on the Start button to start the test. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run.</p>
-<!--
- <div class="progressBarHolder">
- Chapter Index: <input type="text" size="2" maxlength="2" value="" id="chapterId" onkeypress="if(event.keyCode < 48 || event.keyCode > 57){return false;}"/>
- </div>
--->
+ <p class="content">Please click on the Run All button to run all the tests. Once you start the test you may pause the test anytime by clicking on the Pause button. You can click on the Results tab once the test is completed or after pausing the test. The Reset button is for restarting the test run. You may run individual tests by clicking the Run button next to the tests listed below. If you wish to run several chapters in sequence, but not the entire test suite, click the Select button for the chapters you wish to run and then click the Run Selected button.</p>
+
<!-- This is the Progress Bar Holder -->
<div class="progressBarHolder">
<div id="progressbar"></div>
<div class="progressBarButtons">
- <img src="images/reset.png" class="button-reset"/> <img src="images/start.png" class="button-start" id="btnStart"/>
+ <!-- Loading: Run All, Run Selected -->
+ <!-- Loaded: Run All, Run Selected -->
+ <!-- Running: Pause -->
+ <!-- Paused: Resume, Reset -->
+ <img src="images/runall.png" alt="Run All" title="Run all tests." id="btnRunAll" />
+ <img src="images/runselected.png" alt="Run Selected Tests" title="Run the tests selected below." id="btnRunSelected" />
+ <img src="images/pause.png" alt="Pause" title="Pause the running tests." id="btnPause" />
+ <img src="images/resume.png" alt="Resume" title="Resume the running tests." id="btnResume" />
+ <img src="images/reset.png" alt="Reset" title="Reset testing status." id="btnReset" />
</div>
<div style="clear: both;"></div>
</div>
- <p class="hide">>
+ <p class="hide">
Timer Value(ms) : <input id="txtTimerValue" value="50" /> <input id="btnSetTimerValue" value="Set Timer Value" type="button"/>
</p>
+
<!-- This is the Results Text Holder -->
<div class="resultsHeader">
- <!--Total Loaded: <strong><span id="totalLoadedCounter"></span></strong><span class="Separator">|</span>-->
Tests To Run: <strong><span class="teststorun-counter" id="testsToRun"></span></strong> <span class="separator">|</span>
- Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span> Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span> Fail: <span class="fail" id="Fail"></span>
- <span class="separator">|</span> Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
+ Total Tests Ran: <strong><span class="total-counter" id="totalCounter"></span></strong> <span class="separator">|</span>
+ Pass: <span class="pass" id="Pass"></span> <span class="separator">|</span>
+ Fail: <span class="fail" id="Fail"></span> <span class="separator">|</span>
+ Failed To Load: <span class="fail" id="failedToLoadCounter1"></span>
<p><span id="nextActivity"></span></p>
</div>
+
+ <!-- Test Chapter selector -->
+ <div id="chapterSelector">
+ <table width="100%" border="0" cellspacing="0" cellpadding="2"></table>
+ </div>
+
<!-- This is the Table -->
<div class="resultsTableHolder" id="tableLoggerParent">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table-logger" id="tableLogger"></table>
@@ -142,6 +154,7 @@
Test Suite Ver.: <span class="targetTestSuiteVersion"></span> <span class="separator">|</span> Test Suite Date: <span class="targetTestSuiteDate"></span>
</div>
<div class="downloadLinks">
+ <p><a class="anchor-download-xml" id="ancGenXMLReport"><strong>Download results as XML</strong></a></p> <!--| <strong><a href="scripts/testcases.zip">Download Source</a></strong></p>-->
</div>
<div id="legend" class="hide">
<label class="reportGreen">Green:</label> 100%
--
GitLab