Merge from 3.0 branch till 1264.

1 files changed, 69 insertions, 85 deletions

diff --git a/tests/test_tools/simpletest/docs/en/overview.html b/tests/test_tools/simpletest/docs/en/overview.html
index d4965de3..5d4e80e2 100755
--- a/tests/test_tools/simpletest/docs/en/overview.html
+++ b/tests/test_tools/simpletest/docs/en/overview.html
@@ -23,9 +23,6 @@
 <a href="group_test_documentation.html">Group tests</a>
 </li>
 <li>
-<a href="server_stubs_documentation.html">Server stubs</a>
-</li>
-<li>
 <a href="mock_objects_documentation.html">Mock objects</a>
 </li>
 <li>
@@ -151,8 +148,7 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                 milestones rather depends on time available.
                 Green stuff has been coded, but not necessarily released yet.
                 If you have a pressing need for a green but unreleased feature
-                then you should check-out the code from sourceforge CVS directly.
-                A released feature is marked as "Done".
+                then you should check-out the code from Sourceforge CVS directly.
                 <table>
 <thead>
                     <tr>
@@ -163,12 +159,12 @@ class <strong>MySiteTest</strong> extends WebTestCase {
 <tr>
                         <td>Unit test case</td>
                         <td>Core test case class and assertions</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Html display</td>
                         <td>Simplest possible display</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Autoloading of test cases</td>
@@ -176,41 +172,20 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                             Reading a file with test cases and loading them into a
                             group test automatically
                         </td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
-                        <td>Mock objects code generator</td>
+                        <td>Mock objects</td>
                         <td>
                             Objects capable of simulating other objects removing
                             test dependencies
                         </td>
-                        <td style="color: green;">Done</td>
-                    </tr>
-                    <tr>
-                        <td>Server stubs</td>
-                        <td>
-                            Mocks without expectations to be used outside of test cases,
-                            e.g. for prototyping
-                        </td>
-                        <td style="color: green;">Done</td>
-                    </tr>
-                    <tr>
-                        <td>Integration of other unit testers</td>
-                        <td>
-                            The ability to read and simulate test cases from PHPUnit
-                            and PEAR::PhpUnit
-                        </td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Web test case</td>
-                        <td>Basic pattern matching of fetched pages</td>
-                        <td style="color: green;">Done</td>
-                    </tr>
-                    <tr>
-                        <td>HTML parsing of pages</td>
                         <td>Allows link following and title tag matching</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Partial mocks</td>
@@ -218,32 +193,32 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                             Mocking parts of a class for testing less than a class
                             or for complex simulations
                         </td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Web cookie handling</td>
                         <td>Correct handling of cookies when fetching pages</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Following redirects</td>
                         <td>Page fetching automatically follows 300 redirects</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Form parsing</td>
                         <td>Ability to submit simple forms and read default form values</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Command line interface</td>
                         <td>Test display without the need of a web browser</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Exposure of expectation classes</td>
                         <td>Can create precise tests with mocks as well as test cases</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>XML output and parsing</td>
@@ -251,25 +226,15 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                             Allows multi host testing and the integration of acceptance
                             testing extensions
                         </td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
-                        <td>Command line test case</td>
-                        <td>Allows testing of utilities and file handling</td>
-                        <td style="color: green;">Done</td>
-                    </tr>
-                    <tr>
-                        <td>PHP Documentor compatibility</td>
-                        <td>Fully generated class level documentation</td>
-                        <td style="color: green;">Done</td>
-                    </tr>
-                    <tr>
-                        <td>Browser interface</td>
+                        <td>Browser component</td>
                         <td>
                             Exposure of lower level web browser interface for more
                             detailed test cases
                         </td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>HTTP authentication</td>
@@ -277,31 +242,39 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                             Fetching protected web pages with basic authentication
                             only
                         </td>
-                        <td style="color: green;">Done</td>
-                    </tr>
-                    <tr>
-                        <td>Browser navigation buttons</td>
-                        <td>Back, forward and retry</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>SSL support</td>
                         <td>Can connect to https: pages</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Proxy support</td>
                         <td>Can connect via. common proxies</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
                     </tr>
                     <tr>
                         <td>Frames support</td>
                         <td>Handling of frames in web test cases</td>
-                        <td style="color: green;">Done</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>File upload testing</td>
+                        <td>Can simulate the input type file tag</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Mocking interfaces</td>
+                        <td>
+                            Can generate mock objects to interfaces as well as classes
+                            and class interfaces are carried for type hints
+                        </td>
+                        <td style="color: green;">1.0.1</td>
                     </tr>
                     <tr>
-                        <td>Improved display</td>
-                        <td>Better web GUI with tree display of test cases</td>
+                        <td>Reporting machinery enhancements</td>
+                        <td>Improved message passing for better cooperation with IDEs</td>
                         <td style="color: red;">1.1</td>
                     </tr>
                     <tr>
@@ -310,28 +283,43 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                         <td style="color: red;">1.1</td>
                     </tr>
                     <tr>
-                        <td>File upload testing</td>
-                        <td>Can simulate the input type file tag</td>
+                        <td>Testing exceptions</td>
+                        <td>Similar to testing PHP errors</td>
                         <td style="color: red;">1.1</td>
                     </tr>
                     <tr>
-                        <td>Mocking interfaces</td>
-                        <td>Can generate mock objects to interfaces as well as classes</td>
+                        <td>IFrame support</td>
+                        <td>Reads IFrame content that can be refreshed</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Improved mock interface</td>
+                        <td>More compact way of expressing mocks</td>
                         <td style="color: red;">2.0</td>
                     </tr>
                     <tr>
-                        <td>Testing exceptions</td>
-                        <td>Similar to testing PHP errors</td>
+                        <td>HTML table assertions</td>
+                        <td>Can match table elements to numerical assertions</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>XPath searching of HTML elements</td>
+                        <td>More flexible content matching</td>
                         <td style="color: red;">2.0</td>
                     </tr>
                     <tr>
-                        <td>XPath searching of elements</td>
-                        <td>Can make use of HTML tidy for faster and more flexible content matching</td>
+                        <td>Alternate HTML parsers</td>
+                        <td>Can detect compiled parsers for performance improvements</td>
                         <td style="color: red;">2.0</td>
                     </tr>
+                    <tr>
+                        <td>Javascript suport</td>
+                        <td>Use of PECL module to add Javascript</td>
+                        <td style="color: red;">3.0</td>
+                    </tr>
                 </tbody>
 </table>
-                PHP5 migraton will start straight after the version 1.1 series,
+                PHP5 migraton will start straight after the version 1.0.1 series,
                 whereupon PHP4 will no longer be supported.
                 SimpleTest is currently compatible with PHP5, but will not
                 make use of all of the new features until version 2.
@@ -375,18 +363,6 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                 existing <a href="http://www.junit.org/">JUnit</a> test cases.
             </p>
             <p>
-                Library writers don't seem to ship tests with their code very often
-                which is a shame.
-                Library code that includes tests can be more safely refactored and
-                the test code can act as additional documentation in a fairly standard
-                form.
-                This can save trawling the source code for clues when problems occour,
-                especially when upgrading such a library.
-                Libraries using SimpleTest for their unit testing include
-                <a href="http://wact.sourceforge.net/">WACT</a> and
-                <a href="http://sourceforge.net/projects/htmlsax">PEAR::XML_HTMLSax</a>.
-            </p>
-            <p>
                 There is currently a sad lack of material on mock objects, which is a shame
                 as unit testing without them is a lot more work.
                 The <a href="http://www.sidewize.com/company/mockobjects.pdf">original mock objects paper</a>
@@ -394,14 +370,15 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                 As a new technology there are plenty of discussions and debate on how to use mocks,
                 often on Wikis such as
                 <a href="http://xpdeveloper.com/cgi-bin/oldwiki.cgi?MockObjects">Extreme Tuesday</a>
-                or <a href="http://www.mockobjects.com/wiki/MocksObjectsPaper">www.mockobjects.com</a>
+                or <a href="http://www.mockobjects.com/MocksObjectsPaper.html">www.mockobjects.com</a>
                 or <a href="http://c2.com/cgi/wiki?MockObject">the original C2 Wiki</a>.
                 Injecting mocks into a class is the main area of debate for which this
                 <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">paper on IBM</a>
                 makes a good starting point.
             </p>
             <p>
-                There are plenty of web testing tools, but most are written in Java and
+                There are plenty of web testing tools, but the scriptable ones
+                are mostly are written in Java and
                 tutorials and advice are rather thin on the ground.
                 The only hope is to look at the documentation for
                 <a href="http://httpunit.sourceforge.net/">HTTPUnit</a>,
@@ -409,6 +386,13 @@ class <strong>MySiteTest</strong> extends WebTestCase {
                 or <a href="http://jwebunit.sourceforge.net/">JWebUnit</a> and hope for clues.
                 There are some XML driven test frameworks, but again most
                 require Java to run.
+            </p>
+            <p>
+                A new generation of tools that run directly in the web browser
+                are now available.
+                These include
+                <a href="http://www.openqa.org/selenium/">Selenium</a> and
+                <a href="http://wtr.rubyforge.org/">Watir</a>.
                 As SimpleTest does not support JavaScript you would probably
                 have to look at these tools anyway if you have highly dynamic
                 pages.