pradosoft / prado

tests/test_tools/simpletest/shell_tester.php

Indentation +267 added lines, -267 removed lines

@@ -1,305 +1,305 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: shell_tester.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: shell_tester.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/test_case.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/test_case.php');
+	/**#@-*/
 
-    /**
-     *    Wrapper for exec() functionality.
+	/**
+	 *    Wrapper for exec() functionality.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleShell {
-        protected $_output;
+	 */
+	class SimpleShell {
+		protected $_output;
 
-        /**
-         *    Executes the shell comand and stashes the output.
-         *    @access public
-         */
-        function SimpleShell() {
-            $this->_output = false;
-        }
+		/**
+		 *    Executes the shell comand and stashes the output.
+		 *    @access public
+		 */
+		function SimpleShell() {
+			$this->_output = false;
+		}
 
-        /**
-         *    Actually runs the command. Does not trap the
-         *    error stream output as this need PHP 4.3+.
-         *    @param string $command    The actual command line
-         *                              to run.
-         *    @return integer           Exit code.
-         *    @access public
-         */
-        function execute($command) {
-            $this->_output = false;
-            exec($command, $this->_output, $ret);
-            return $ret;
-        }
+		/**
+		 *    Actually runs the command. Does not trap the
+		 *    error stream output as this need PHP 4.3+.
+		 *    @param string $command    The actual command line
+		 *                              to run.
+		 *    @return integer           Exit code.
+		 *    @access public
+		 */
+		function execute($command) {
+			$this->_output = false;
+			exec($command, $this->_output, $ret);
+			return $ret;
+		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return string        Output as text.
-         *    @access public
-         */
-        function getOutput() {
-            return implode("\n", $this->_output);
-        }
+		/**
+		 *    Accessor for the last output.
+		 *    @return string        Output as text.
+		 *    @access public
+		 */
+		function getOutput() {
+			return implode("\n", $this->_output);
+		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return array         Output as array of lines.
-         *    @access public
-         */
+		/**
+		 *    Accessor for the last output.
+		 *    @return array         Output as array of lines.
+		 *    @access public
+		 */
 		function getOutputAsList() {
 			return $this->_output;
 		}
-    }
+	}
 
-    /**
-     *    Test case for testing of command line scripts and
-     *    utilities. Usually scripts taht are external to the
-     *    PHP code, but support it in some way.
+	/**
+	 *    Test case for testing of command line scripts and
+	 *    utilities. Usually scripts taht are external to the
+	 *    PHP code, but support it in some way.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class ShellTestCase extends SimpleTestCase {
-        protected $_current_shell;
-        protected $_last_status;
-        protected $_last_command;
+	 */
+	class ShellTestCase extends SimpleTestCase {
+		protected $_current_shell;
+		protected $_last_status;
+		protected $_last_command;
 
-        /**
-         *    Creates an empty test case. Should be subclassed
-         *    with test methods for a functional test case.
-         *    @param string $label     Name of test case. Will use
-         *                             the class name if none specified.
-         *    @access public
-         */
-        function ShellTestCase($label = false) {
-            $this->SimpleTestCase($label);
-            $this->_current_shell = $this->_createShell();
-            $this->_last_status = false;
-            $this->_last_command = '';
-        }
+		/**
+		 *    Creates an empty test case. Should be subclassed
+		 *    with test methods for a functional test case.
+		 *    @param string $label     Name of test case. Will use
+		 *                             the class name if none specified.
+		 *    @access public
+		 */
+		function ShellTestCase($label = false) {
+			$this->SimpleTestCase($label);
+			$this->_current_shell = $this->_createShell();
+			$this->_last_status = false;
+			$this->_last_command = '';
+		}
 
-        /**
-         *    Executes a command and buffers the results.
-         *    @param string $command     Command to run.
-         *    @return boolean            True if zero exit code.
-         *    @access public
-         */
-        function execute($command) {
-            $shell = $this->_getShell();
-            $this->_last_status = $shell->execute($command);
-            $this->_last_command = $command;
-            return ($this->_last_status === 0);
-        }
+		/**
+		 *    Executes a command and buffers the results.
+		 *    @param string $command     Command to run.
+		 *    @return boolean            True if zero exit code.
+		 *    @access public
+		 */
+		function execute($command) {
+			$shell = $this->_getShell();
+			$this->_last_status = $shell->execute($command);
+			$this->_last_command = $command;
+			return ($this->_last_status === 0);
+		}
 
-        /**
-         *    Dumps the output of the last command.
-         *    @access public
-         */
-        function dumpOutput() {
-            $this->dump($this->getOutput());
-        }
+		/**
+		 *    Dumps the output of the last command.
+		 *    @access public
+		 */
+		function dumpOutput() {
+			$this->dump($this->getOutput());
+		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return string        Output as text.
-         *    @access public
-         */
+		/**
+		 *    Accessor for the last output.
+		 *    @return string        Output as text.
+		 *    @access public
+		 */
 		function getOutput() {
-            $shell = $this->_getShell();
-            return $shell->getOutput();
+			$shell = $this->_getShell();
+			return $shell->getOutput();
 		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return array         Output as array of lines.
-         *    @access public
-         */
+		/**
+		 *    Accessor for the last output.
+		 *    @return array         Output as array of lines.
+		 *    @access public
+		 */
 		function getOutputAsList() {
-            $shell = $this->_getShell();
-            return $shell->getOutputAsList();
+			$shell = $this->_getShell();
+			return $shell->getOutputAsList();
 		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the same value only. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new EqualExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the same value only. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new EqualExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    a different value. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertNotEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new NotEqualExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    a different value. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertNotEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new NotEqualExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Tests the last status code from the shell.
-         *    @param integer $status   Expected status of last
-         *                             command.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertExitCode($status, $message = "%s") {
-            $message = sprintf($message, "Expected status code of [$status] from [" .
-                    $this->_last_command . "], but got [" .
-                    $this->_last_status . "]");
-            return $this->assertTrue($status === $this->_last_status, $message);
-        }
+		/**
+		 *    Tests the last status code from the shell.
+		 *    @param integer $status   Expected status of last
+		 *                             command.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertExitCode($status, $message = "%s") {
+			$message = sprintf($message, "Expected status code of [$status] from [" .
+					$this->_last_command . "], but got [" .
+					$this->_last_status . "]");
+			return $this->assertTrue($status === $this->_last_status, $message);
+		}
 
-        /**
-         *    Attempt to exactly match the combined STDERR and
-         *    STDOUT output.
-         *    @param string $expected  Expected output.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertOutput($expected, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new EqualExpectation($expected),
-                    $shell->getOutput(),
-                    $message);
-        }
+		/**
+		 *    Attempt to exactly match the combined STDERR and
+		 *    STDOUT output.
+		 *    @param string $expected  Expected output.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertOutput($expected, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new EqualExpectation($expected),
+					$shell->getOutput(),
+					$message);
+		}
 
-        /**
-         *    Scans the output for a Perl regex. If found
-         *    anywhere it passes, else it fails.
-         *    @param string $pattern    Regex to search for.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertOutputPattern($pattern, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    $shell->getOutput(),
-                    $message);
-        }
+		/**
+		 *    Scans the output for a Perl regex. If found
+		 *    anywhere it passes, else it fails.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertOutputPattern($pattern, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new PatternExpectation($pattern),
+					$shell->getOutput(),
+					$message);
+		}
 
-        /**
-         *    If a Perl regex is found anywhere in the current
-         *    output then a failure is generated, else a pass.
-         *    @param string $pattern    Regex to search for.
-         *    @param $message           Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoOutputPattern($pattern, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    $shell->getOutput(),
-                    $message);
-        }
+		/**
+		 *    If a Perl regex is found anywhere in the current
+		 *    output then a failure is generated, else a pass.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param $message           Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoOutputPattern($pattern, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					$shell->getOutput(),
+					$message);
+		}
 
-        /**
-         *    File existence check.
-         *    @param string $path      Full filename and path.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertFileExists($path, $message = "%s") {
-            $message = sprintf($message, "File [$path] should exist");
-            return $this->assertTrue(file_exists($path), $message);
-        }
+		/**
+		 *    File existence check.
+		 *    @param string $path      Full filename and path.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertFileExists($path, $message = "%s") {
+			$message = sprintf($message, "File [$path] should exist");
+			return $this->assertTrue(file_exists($path), $message);
+		}
 
-        /**
-         *    File non-existence check.
-         *    @param string $path      Full filename and path.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertFileNotExists($path, $message = "%s") {
-            $message = sprintf($message, "File [$path] should not exist");
-            return $this->assertFalse(file_exists($path), $message);
-        }
+		/**
+		 *    File non-existence check.
+		 *    @param string $path      Full filename and path.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertFileNotExists($path, $message = "%s") {
+			$message = sprintf($message, "File [$path] should not exist");
+			return $this->assertFalse(file_exists($path), $message);
+		}
 
-        /**
-         *    Scans a file for a Perl regex. If found
-         *    anywhere it passes, else it fails.
-         *    @param string $pattern    Regex to search for.
-         *    @param string $path       Full filename and path.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertFilePattern($pattern, $path, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    implode('', file($path)),
-                    $message);
-        }
+		/**
+		 *    Scans a file for a Perl regex. If found
+		 *    anywhere it passes, else it fails.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param string $path       Full filename and path.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertFilePattern($pattern, $path, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new PatternExpectation($pattern),
+					implode('', file($path)),
+					$message);
+		}
 
-        /**
-         *    If a Perl regex is found anywhere in the named
-         *    file then a failure is generated, else a pass.
-         *    @param string $pattern    Regex to search for.
-         *    @param string $path       Full filename and path.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoFilePattern($pattern, $path, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    implode('', file($path)),
-                    $message);
-        }
+		/**
+		 *    If a Perl regex is found anywhere in the named
+		 *    file then a failure is generated, else a pass.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param string $path       Full filename and path.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoFilePattern($pattern, $path, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					implode('', file($path)),
+					$message);
+		}
 
-        /**
-         *    Accessor for current shell. Used for testing the
-         *    the tester itself.
-         *    @return Shell        Current shell.
-         *    @access protected
-         */
-        function &_getShell() {
-            return $this->_current_shell;
-        }
+		/**
+		 *    Accessor for current shell. Used for testing the
+		 *    the tester itself.
+		 *    @return Shell        Current shell.
+		 *    @access protected
+		 */
+		function &_getShell() {
+			return $this->_current_shell;
+		}
 
-        /**
-         *    Factory for the shell to run the command on.
-         *    @return Shell        New shell object.
-         *    @access protected
-         */
-        function &_createShell() {
-            $shell = new SimpleShell();
-            return $shell;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Factory for the shell to run the command on.
+		 *    @return Shell        New shell object.
+		 *    @access protected
+		 */
+		function &_createShell() {
+			$shell = new SimpleShell();
+			return $shell;
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/test_case.php

Indentation +672 added lines, -672 removed lines

@@ -1,689 +1,689 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: test_case.php 2309 2007-10-08 03:24:07Z wei $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: test_case.php 2309 2007-10-08 03:24:07Z wei $
+	 */
+
+	/**#@+
      * Includes SimpleTest files and defined the root constant
      * for dependent libraries.
      */
-    require_once(dirname(__FILE__) . '/invoker.php');
-    require_once(dirname(__FILE__) . '/errors.php');
-    require_once(dirname(__FILE__) . '/compatibility.php');
-    require_once(dirname(__FILE__) . '/scorer.php');
-    require_once(dirname(__FILE__) . '/expectation.php');
-    require_once(dirname(__FILE__) . '/dumper.php');
-    require_once(dirname(__FILE__) . '/simpletest.php');
-    if (version_compare(phpversion(), '5') >= 0) {
-        require_once(dirname(__FILE__) . '/exceptions.php');
-        require_once(dirname(__FILE__) . '/reflection_php5.php');
-    } else {
-        require_once(dirname(__FILE__) . '/reflection_php4.php');
-    }
-    if (! defined('SIMPLE_TEST')) {
-        /**
-         * @ignore
-         */
-        define('SIMPLE_TEST', dirname(__FILE__) . '/');
-    }
-    /**#@-*/
-
-    /**
-     *    Basic test case. This is the smallest unit of a test
-     *    suite. It searches for
-     *    all methods that start with the the string "test" and
-     *    runs them. Working test cases extend this class.
+	require_once(dirname(__FILE__) . '/invoker.php');
+	require_once(dirname(__FILE__) . '/errors.php');
+	require_once(dirname(__FILE__) . '/compatibility.php');
+	require_once(dirname(__FILE__) . '/scorer.php');
+	require_once(dirname(__FILE__) . '/expectation.php');
+	require_once(dirname(__FILE__) . '/dumper.php');
+	require_once(dirname(__FILE__) . '/simpletest.php');
+	if (version_compare(phpversion(), '5') >= 0) {
+		require_once(dirname(__FILE__) . '/exceptions.php');
+		require_once(dirname(__FILE__) . '/reflection_php5.php');
+	} else {
+		require_once(dirname(__FILE__) . '/reflection_php4.php');
+	}
+	if (! defined('SIMPLE_TEST')) {
+		/**
+		 * @ignore
+		 */
+		define('SIMPLE_TEST', dirname(__FILE__) . '/');
+	}
+	/**#@-*/
+
+	/**
+	 *    Basic test case. This is the smallest unit of a test
+	 *    suite. It searches for
+	 *    all methods that start with the the string "test" and
+	 *    runs them. Working test cases extend this class.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class SimpleTestCase {
-        protected $_label = false;
-        protected $_reporter;
-        protected $_observers;
-
-        /**
-         *    Sets up the test with no display.
-         *    @param string $label    If no test name is given then
-         *                            the class name is used.
-         *    @access public
-         */
-        function SimpleTestCase($label = false) {
-            if ($label) {
-                $this->_label = $label;
-            }
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label ? $this->_label : get_class($this);
-        }
-
-        /**
-         *    Used to invoke the single tests.
-         *    @return SimpleInvoker        Individual test runner.
-         *    @access public
-         */
-        function createInvoker() {
-            $invoker = new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
-            if (version_compare(phpversion(), '5') >= 0) {
-                $invoker = new SimpleExceptionTrappingInvoker($invoker);
-            }
-            return $invoker;
-        }
-
-        /**
-         *    Uses reflection to run every method within itself
-         *    starting with the string "test" unless a method
-         *    is specified.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            SimpleTest::setCurrent($this);
-            $this->_reporter = $reporter;
-            $this->_reporter->paintCaseStart($this->getLabel());
-            foreach ($this->getTests() as $method) {
-                if ($this->_reporter->shouldInvoke($this->getLabel(), $method)) {
-                    $invoker = $this->_reporter->createInvoker($this->createInvoker());
-                    $invoker->before($method);
-                    $invoker->invoke($method);
-                    $invoker->after($method);
-                }
-            }
-            $this->_reporter->paintCaseEnd($this->getLabel());
-            unset($this->_reporter);
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Gets a list of test names. Normally that will
-         *    be all internal methods that start with the
-         *    name "test". This method should be overridden
-         *    if you want a different rule.
-         *    @return array        List of test names.
-         *    @access public
-         */
-        function getTests() {
-            $methods = array();
-            foreach (get_class_methods(get_class($this)) as $method) {
-                if ($this->_isTest($method)) {
-                    $methods[] = $method;
-                }
-            }
-            return $methods;
-        }
-
-        /**
-         *    Tests to see if the method is a test that should
-         *    be run. Currently any method that starts with 'test'
-         *    is a candidate unless it is the constructor.
-         *    @param string $method        Method name to try.
-         *    @return boolean              True if test method.
-         *    @access protected
-         */
-        function _isTest($method) {
-            if (strtolower(substr($method, 0, 4)) == 'test') {
-                return ! SimpleTestCompatibility::isA($this, strtolower($method));
-            }
-            return false;
-        }
-
-        /**
-         *    Announces the start of the test.
-         *    @param string $method    Test method just started.
-         *    @access public
-         */
-        function before($method) {
-            $this->_reporter->paintMethodStart($method);
-            $this->_observers = array();
-        }
-
-        /**
-         *    Sets up unit test wide variables at the start
-         *    of each test method. To be overridden in
-         *    actual user test cases.
-         *    @access public
-         */
-        function setUp() {
-        }
-
-        /**
-         *    Clears the data set in the setUp() method call.
-         *    To be overridden by the user in actual user test cases.
-         *    @access public
-         */
-        function tearDown() {
-        }
-
-        /**
-         *    Announces the end of the test. Includes private clean up.
-         *    @param string $method    Test method just finished.
-         *    @access public
-         */
-        function after($method) {
-            for ($i = 0; $i < count($this->_observers); $i++) {
-                $this->_observers[$i]->atTestEnd($method);
-            }
-            $this->_reporter->paintMethodEnd($method);
-        }
-
-        /**
-         *    Sets up an observer for the test end.
-         *    @param object $observer    Must have atTestEnd()
-         *                               method.
-         *    @access public
-         */
-        function tell($observer) {
-            $this->_observers[] = $observer;
-        }
-
-        /**
-         *    Sends a pass event with a message.
-         *    @param string $message        Message to send.
-         *    @access public
-         */
-        function pass($message = "Pass") {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintPass(
-                    $message . $this->getAssertionLine());
-            return true;
-        }
-
-        /**
-         *    Sends a fail event with a message.
-         *    @param string $message        Message to send.
-         *    @access public
-         */
-        function fail($message = "Fail") {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintFail(
-                    $message . $this->getAssertionLine());
-            return false;
-        }
-
-        /**
-         *    Formats a PHP error and dispatches it to the
-         *    reporter.
-         *    @param integer $severity  PHP error code.
-         *    @param string $message    Text of error.
-         *    @param string $file       File error occoured in.
-         *    @param integer $line      Line number of error.
-         *    @access public
-         */
-        function error($severity, $message, $file, $line) {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintError(
-                    "Unexpected PHP error [$message] severity [$severity] in [$file] line [$line]");
-        }
-
-        /**
-         *    Formats an exception and dispatches it to the
-         *    reporter.
-         *    @param Exception $exception    Object thrown.
-         *    @access public
-         */
-        function exception($exception) {
-            $this->_reporter->paintError(
-                    'Unexpected exception of type [' . get_class($exception) .
-                    '] with message ['. $exception->getMessage() .
-                    '] in ['. $exception->getFile() .
-                    '] line [' . $exception->getLine() .
+	 */
+	class SimpleTestCase {
+		protected $_label = false;
+		protected $_reporter;
+		protected $_observers;
+
+		/**
+		 *    Sets up the test with no display.
+		 *    @param string $label    If no test name is given then
+		 *                            the class name is used.
+		 *    @access public
+		 */
+		function SimpleTestCase($label = false) {
+			if ($label) {
+				$this->_label = $label;
+			}
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label ? $this->_label : get_class($this);
+		}
+
+		/**
+		 *    Used to invoke the single tests.
+		 *    @return SimpleInvoker        Individual test runner.
+		 *    @access public
+		 */
+		function createInvoker() {
+			$invoker = new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
+			if (version_compare(phpversion(), '5') >= 0) {
+				$invoker = new SimpleExceptionTrappingInvoker($invoker);
+			}
+			return $invoker;
+		}
+
+		/**
+		 *    Uses reflection to run every method within itself
+		 *    starting with the string "test" unless a method
+		 *    is specified.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			SimpleTest::setCurrent($this);
+			$this->_reporter = $reporter;
+			$this->_reporter->paintCaseStart($this->getLabel());
+			foreach ($this->getTests() as $method) {
+				if ($this->_reporter->shouldInvoke($this->getLabel(), $method)) {
+					$invoker = $this->_reporter->createInvoker($this->createInvoker());
+					$invoker->before($method);
+					$invoker->invoke($method);
+					$invoker->after($method);
+				}
+			}
+			$this->_reporter->paintCaseEnd($this->getLabel());
+			unset($this->_reporter);
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Gets a list of test names. Normally that will
+		 *    be all internal methods that start with the
+		 *    name "test". This method should be overridden
+		 *    if you want a different rule.
+		 *    @return array        List of test names.
+		 *    @access public
+		 */
+		function getTests() {
+			$methods = array();
+			foreach (get_class_methods(get_class($this)) as $method) {
+				if ($this->_isTest($method)) {
+					$methods[] = $method;
+				}
+			}
+			return $methods;
+		}
+
+		/**
+		 *    Tests to see if the method is a test that should
+		 *    be run. Currently any method that starts with 'test'
+		 *    is a candidate unless it is the constructor.
+		 *    @param string $method        Method name to try.
+		 *    @return boolean              True if test method.
+		 *    @access protected
+		 */
+		function _isTest($method) {
+			if (strtolower(substr($method, 0, 4)) == 'test') {
+				return ! SimpleTestCompatibility::isA($this, strtolower($method));
+			}
+			return false;
+		}
+
+		/**
+		 *    Announces the start of the test.
+		 *    @param string $method    Test method just started.
+		 *    @access public
+		 */
+		function before($method) {
+			$this->_reporter->paintMethodStart($method);
+			$this->_observers = array();
+		}
+
+		/**
+		 *    Sets up unit test wide variables at the start
+		 *    of each test method. To be overridden in
+		 *    actual user test cases.
+		 *    @access public
+		 */
+		function setUp() {
+		}
+
+		/**
+		 *    Clears the data set in the setUp() method call.
+		 *    To be overridden by the user in actual user test cases.
+		 *    @access public
+		 */
+		function tearDown() {
+		}
+
+		/**
+		 *    Announces the end of the test. Includes private clean up.
+		 *    @param string $method    Test method just finished.
+		 *    @access public
+		 */
+		function after($method) {
+			for ($i = 0; $i < count($this->_observers); $i++) {
+				$this->_observers[$i]->atTestEnd($method);
+			}
+			$this->_reporter->paintMethodEnd($method);
+		}
+
+		/**
+		 *    Sets up an observer for the test end.
+		 *    @param object $observer    Must have atTestEnd()
+		 *                               method.
+		 *    @access public
+		 */
+		function tell($observer) {
+			$this->_observers[] = $observer;
+		}
+
+		/**
+		 *    Sends a pass event with a message.
+		 *    @param string $message        Message to send.
+		 *    @access public
+		 */
+		function pass($message = "Pass") {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintPass(
+					$message . $this->getAssertionLine());
+			return true;
+		}
+
+		/**
+		 *    Sends a fail event with a message.
+		 *    @param string $message        Message to send.
+		 *    @access public
+		 */
+		function fail($message = "Fail") {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintFail(
+					$message . $this->getAssertionLine());
+			return false;
+		}
+
+		/**
+		 *    Formats a PHP error and dispatches it to the
+		 *    reporter.
+		 *    @param integer $severity  PHP error code.
+		 *    @param string $message    Text of error.
+		 *    @param string $file       File error occoured in.
+		 *    @param integer $line      Line number of error.
+		 *    @access public
+		 */
+		function error($severity, $message, $file, $line) {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintError(
+					"Unexpected PHP error [$message] severity [$severity] in [$file] line [$line]");
+		}
+
+		/**
+		 *    Formats an exception and dispatches it to the
+		 *    reporter.
+		 *    @param Exception $exception    Object thrown.
+		 *    @access public
+		 */
+		function exception($exception) {
+			$this->_reporter->paintError(
+					'Unexpected exception of type [' . get_class($exception) .
+					'] with message ['. $exception->getMessage() .
+					'] in ['. $exception->getFile() .
+					'] line [' . $exception->getLine() .
 					'] stack [' . $exception->getTraceAsString() .']');
-        }
-
-        /**
-         *    Sends a user defined event to the test reporter.
-         *    This is for small scale extension where
-         *    both the test case and either the reporter or
-         *    display are subclassed.
-         *    @param string $type       Type of event.
-         *    @param mixed $payload     Object or message to deliver.
-         *    @access public
-         */
-        function signal($type, $payload) {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintSignal($type, $payload);
-        }
-
-        /**
-         *    Cancels any outstanding errors.
-         *    @access public
-         */
-        function swallowErrors() {
-            $queue = &SimpleErrorQueue::instance();
-            $queue->clear();
-        }
-
-        /**
-         *    Runs an expectation directly, for extending the
-         *    tests with new expectation classes.
-         *    @param SimpleExpectation $expectation  Expectation subclass.
-         *    @param mixed $compare               Value to compare.
-         *    @param string $message                 Message to display.
-         *    @return boolean                        True on pass
-         *    @access public
-         */
-        function assert($expectation, $compare, $message = '%s') {
-            return $this->assertTrue(
-                    $expectation->test($compare),
-                    sprintf($message, $expectation->overlayMessage($compare)));
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertExpectation($expectation, $compare, $message = '%s') {
-        	return $this->assert($expectation, $compare, $message);
-        }
-
-        /**
-         *    Called from within the test methods to register
-         *    passes and failures.
-         *    @param boolean $result    Pass on true.
-         *    @param string $message    Message to display describing
-         *                              the test state.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertTrue($result, $message = false) {
-            if (! $message) {
-                $message = 'True assertion got ' . ($result ? 'True' : 'False');
-            }
-            if ($result) {
-                return $this->pass($message);
-            } else {
-                return $this->fail($message);
-            }
-        }
-
-        /**
-         *    Will be true on false and vice versa. False
-         *    is the PHP definition of false, so that null,
-         *    empty strings, zero and an empty array all count
-         *    as false.
-         *    @param boolean $result    Pass on false.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertFalse($result, $message = false) {
-            if (! $message) {
-                $message = 'False assertion got ' . ($result ? 'True' : 'False');
-            }
-            return $this->assertTrue(! $result, $message);
-        }
-
-        /**
-         *    Uses a stack trace to find the line of an assertion.
-         *    @param string $format    String formatting.
-         *    @param array $stack      Stack frames top most first. Only
-         *                             needed if not using the PHP
-         *                             backtrace function.
-         *    @return string           Line number of first assert*
-         *                             method embedded in format string.
-         *    @access public
-         */
-        function getAssertionLine($stack = false) {
-            if ($stack === false) {
-                $stack = SimpleTestCompatibility::getStackTrace();
-            }
-            return SimpleDumper::getFormattedAssertionLine($stack);
-        }
-
-        /**
-         *    Sends a formatted dump of a variable to the
-         *    test suite for those emergency debugging
-         *    situations.
-         *    @param mixed $variable    Variable to display.
-         *    @param string $message    Message to display.
-         *    @return mixed             The original variable.
-         *    @access public
-         */
-        function dump($variable, $message = false) {
-            $formatted = SimpleDumper::dump($variable);
-            if ($message) {
-                $formatted = $message . "\n" . $formatted;
-            }
-            $this->_reporter->paintFormattedMessage($formatted);
-            return $variable;
-        }
-
-        /**
-         *    Dispatches a text message straight to the
-         *    test suite. Useful for status bar displays.
-         *    @param string $message        Message to show.
-         *    @access public
-         */
-        function sendMessage($message) {
-            $this->_reporter->PaintMessage($message);
-        }
-
-        /**
-         *    Accessor for the number of subtests.
-         *    @return integer           Number of test cases.
-         *    @access public
-         *    @static
-         */
-        static function getSize() {
-            return 1;
-        }
-    }
-
-    /**
-     *    This is a composite test class for combining
-     *    test cases and other RunnableTest classes into
-     *    a group test.
+		}
+
+		/**
+		 *    Sends a user defined event to the test reporter.
+		 *    This is for small scale extension where
+		 *    both the test case and either the reporter or
+		 *    display are subclassed.
+		 *    @param string $type       Type of event.
+		 *    @param mixed $payload     Object or message to deliver.
+		 *    @access public
+		 */
+		function signal($type, $payload) {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintSignal($type, $payload);
+		}
+
+		/**
+		 *    Cancels any outstanding errors.
+		 *    @access public
+		 */
+		function swallowErrors() {
+			$queue = &SimpleErrorQueue::instance();
+			$queue->clear();
+		}
+
+		/**
+		 *    Runs an expectation directly, for extending the
+		 *    tests with new expectation classes.
+		 *    @param SimpleExpectation $expectation  Expectation subclass.
+		 *    @param mixed $compare               Value to compare.
+		 *    @param string $message                 Message to display.
+		 *    @return boolean                        True on pass
+		 *    @access public
+		 */
+		function assert($expectation, $compare, $message = '%s') {
+			return $this->assertTrue(
+					$expectation->test($compare),
+					sprintf($message, $expectation->overlayMessage($compare)));
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertExpectation($expectation, $compare, $message = '%s') {
+			return $this->assert($expectation, $compare, $message);
+		}
+
+		/**
+		 *    Called from within the test methods to register
+		 *    passes and failures.
+		 *    @param boolean $result    Pass on true.
+		 *    @param string $message    Message to display describing
+		 *                              the test state.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertTrue($result, $message = false) {
+			if (! $message) {
+				$message = 'True assertion got ' . ($result ? 'True' : 'False');
+			}
+			if ($result) {
+				return $this->pass($message);
+			} else {
+				return $this->fail($message);
+			}
+		}
+
+		/**
+		 *    Will be true on false and vice versa. False
+		 *    is the PHP definition of false, so that null,
+		 *    empty strings, zero and an empty array all count
+		 *    as false.
+		 *    @param boolean $result    Pass on false.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertFalse($result, $message = false) {
+			if (! $message) {
+				$message = 'False assertion got ' . ($result ? 'True' : 'False');
+			}
+			return $this->assertTrue(! $result, $message);
+		}
+
+		/**
+		 *    Uses a stack trace to find the line of an assertion.
+		 *    @param string $format    String formatting.
+		 *    @param array $stack      Stack frames top most first. Only
+		 *                             needed if not using the PHP
+		 *                             backtrace function.
+		 *    @return string           Line number of first assert*
+		 *                             method embedded in format string.
+		 *    @access public
+		 */
+		function getAssertionLine($stack = false) {
+			if ($stack === false) {
+				$stack = SimpleTestCompatibility::getStackTrace();
+			}
+			return SimpleDumper::getFormattedAssertionLine($stack);
+		}
+
+		/**
+		 *    Sends a formatted dump of a variable to the
+		 *    test suite for those emergency debugging
+		 *    situations.
+		 *    @param mixed $variable    Variable to display.
+		 *    @param string $message    Message to display.
+		 *    @return mixed             The original variable.
+		 *    @access public
+		 */
+		function dump($variable, $message = false) {
+			$formatted = SimpleDumper::dump($variable);
+			if ($message) {
+				$formatted = $message . "\n" . $formatted;
+			}
+			$this->_reporter->paintFormattedMessage($formatted);
+			return $variable;
+		}
+
+		/**
+		 *    Dispatches a text message straight to the
+		 *    test suite. Useful for status bar displays.
+		 *    @param string $message        Message to show.
+		 *    @access public
+		 */
+		function sendMessage($message) {
+			$this->_reporter->PaintMessage($message);
+		}
+
+		/**
+		 *    Accessor for the number of subtests.
+		 *    @return integer           Number of test cases.
+		 *    @access public
+		 *    @static
+		 */
+		static function getSize() {
+			return 1;
+		}
+	}
+
+	/**
+	 *    This is a composite test class for combining
+	 *    test cases and other RunnableTest classes into
+	 *    a group test.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class GroupTest {
-        protected $_label;
-        protected $_test_cases;
-        protected $_old_track_errors;
-        protected $_xdebug_is_enabled;
-
-        /**
-         *    Sets the name of the test suite.
-         *    @param string $label    Name sent at the start and end
-         *                            of the test.
-         *    @access public
-         */
-        function GroupTest($label = false) {
-            $this->_label = $label ? $label : get_class($this);
-            $this->_test_cases = array();
-            $this->_old_track_errors = ini_get('track_errors');
-            $this->_xdebug_is_enabled = function_exists('xdebug_is_enabled') ?
-                    xdebug_is_enabled() : false;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
+	 */
+	class GroupTest {
+		protected $_label;
+		protected $_test_cases;
+		protected $_old_track_errors;
+		protected $_xdebug_is_enabled;
+
+		/**
+		 *    Sets the name of the test suite.
+		 *    @param string $label    Name sent at the start and end
+		 *                            of the test.
+		 *    @access public
+		 */
+		function GroupTest($label = false) {
+			$this->_label = $label ? $label : get_class($this);
+			$this->_test_cases = array();
+			$this->_old_track_errors = ini_get('track_errors');
+			$this->_xdebug_is_enabled = function_exists('xdebug_is_enabled') ?
+					xdebug_is_enabled() : false;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
 
 		function setLabel($value)
 		{
 			$this->_label = $value;
 		}
 
-        /**
-         *    Adds a test into the suite. Can be either a group
-         *    test or some other unit test.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
-         */
-        function addTestCase($test_case) {
-            $this->_test_cases[] = $test_case;
-        }
-
-        /**
-         *    Adds a test into the suite by class name. The class will
-         *    be instantiated as needed.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
-         */
-        function addTestClass($class) {
-            if ($this->_getBaseTestCase($class) == 'grouptest') {
-                $this->_test_cases[] = new $class();
-            } else {
-                $this->_test_cases[] = $class;
-            }
-        }
-
-        /**
-         *    Builds a group test from a library of test cases.
-         *    The new group is composed into this one.
-         *    @param string $test_file        File name of library with
-         *                                    test case classes.
-         *    @access public
-         */
-        function addTestFile($test_file) {
-            $existing_classes = get_declared_classes();
-            if ($error = $this->_requireWithError($test_file)) {
-                $this->addTestCase(new BadGroupTest($test_file, $error));
-                return;
-            }
-            $classes = $this->_selectRunnableTests($existing_classes, get_declared_classes());
-            if (count($classes) == 0) {
-                $this->addTestCase(new BadGroupTest($test_file, "No runnable test cases in [$test_file]"));
-                return;
-            }
-            $group = $this->_createGroupFromClasses($test_file, $classes);
-            $this->addTestCase($group);
-        }
-
-        /**
-         *    Requires a source file recording any syntax errors.
-         *    @param string $file        File name to require in.
-         *    @return string/boolean     An error message on failure or false
-         *                               if no errors.
-         *    @access private
-         */
-        function _requireWithError($file) {
-            $this->_enableErrorReporting();
-            include_once($file);
-            $error = isset($php_errormsg) ? $php_errormsg : false;
-            $this->_disableErrorReporting();
-            $self_inflicted_errors = array(
-                    'Assigning the return value of new by reference is deprecated',
-                    'var: Deprecated. Please use the public/private/protected modifiers');
-            if (in_array($error, $self_inflicted_errors)) {
-                return false;
-            }
-            return $error;
-        }
-
-        /**
-         *    Sets up detection of parse errors. Note that XDebug
-         *    interferes with this and has to be disabled. This is
-         *    to make sure the correct error code is returned
-         *    from unattended scripts.
-         *    @access private
-         */
-        function _enableErrorReporting() {
-            if ($this->_xdebug_is_enabled) {
-                xdebug_disable();
-            }
-            ini_set('track_errors', true);
-        }
-
-        /**
-         *    Resets detection of parse errors to their old values.
-         *    This is to make sure the correct error code is returned
-         *    from unattended scripts.
-         *    @access private
-         */
-        function _disableErrorReporting() {
-            ini_set('track_errors', $this->_old_track_errors);
-            if ($this->_xdebug_is_enabled) {
-                xdebug_enable();
-            }
-        }
-
-        /**
-         *    Calculates the incoming test cases from a before
-         *    and after list of loaded classes. Skips abstract
-         *    classes.
-         *    @param array $existing_classes   Classes before require().
-         *    @param array $new_classes        Classes after require().
-         *    @return array                    New classes which are test
-         *                                     cases that shouldn't be ignored.
-         *    @access private
-         */
-        function _selectRunnableTests($existing_classes, $new_classes) {
-            $classes = array();
-            foreach ($new_classes as $class) {
-                if (in_array($class, $existing_classes)) {
-                    continue;
-                }
-                if ($this->_getBaseTestCase($class)) {
-                    $reflection = new SimpleReflection($class);
-                    if ($reflection->isAbstract()) {
-                        SimpleTest::ignore($class);
-                    }
-                    $classes[] = $class;
-                }
-            }
-            return $classes;
-        }
-
-        /**
-         *    Builds a group test from a class list.
-         *    @param string $title       Title of new group.
-         *    @param array $classes      Test classes.
-         *    @return GroupTest          Group loaded with the new
-         *                               test cases.
-         *    @access private
-         */
-        function &_createGroupFromClasses($title, $classes) {
-            SimpleTest::ignoreParentsIfIgnored($classes);
-            $group = new GroupTest($title);
-            foreach ($classes as $class) {
-                if (! SimpleTest::isIgnored($class)) {
-                    $group->addTestClass($class);
-                }
-            }
-            return $group;
-        }
-
-        /**
-         *    Test to see if a class is derived from the
-         *    SimpleTestCase class.
-         *    @param string $class     Class name.
-         *    @access private
-         */
-        function _getBaseTestCase($class) {
-            while ($class = get_parent_class($class)) {
-                $class = strtolower($class);
-                if ($class == "simpletestcase" || $class == "grouptest") {
-                    return $class;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Delegates to a visiting collector to add test
-         *    files.
-         *    @param string $path                  Path to scan from.
-         *    @param SimpleCollector $collector    Directory scanner.
-         *    @access public
-         */
-        function collect($path, $collector) {
-            $collector->collect($this, $path);
-        }
-
-        /**
-         *    Invokes run() on all of the held test cases, instantiating
-         *    them if necessary.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-            for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
-                if (is_string($this->_test_cases[$i])) {
-                    $class = $this->_test_cases[$i];
-                    $test = new $class();
-                    $test->run($reporter);
-                } else {
-                    $this->_test_cases[$i]->run($reporter);
-                }
-            }
-            $reporter->paintGroupEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Number of contained test cases.
-         *    @return integer     Total count of cases in the group.
-         *    @access public
-         */
-        function getSize() {
-            $count = 0;
-            foreach ($this->_test_cases as $case) {
-                if (is_string($case)) {
-                    $count++;
-                } else {
-                    $count += $case->getSize();
-                }
-            }
-            return $count;
-        }
-    }
-
-    /**
-     *    This is a failing group test for when a test suite hasn't
-     *    loaded properly.
+		/**
+		 *    Adds a test into the suite. Can be either a group
+		 *    test or some other unit test.
+		 *    @param SimpleTestCase $test_case  Suite or individual test
+		 *                                      case implementing the
+		 *                                      runnable test interface.
+		 *    @access public
+		 */
+		function addTestCase($test_case) {
+			$this->_test_cases[] = $test_case;
+		}
+
+		/**
+		 *    Adds a test into the suite by class name. The class will
+		 *    be instantiated as needed.
+		 *    @param SimpleTestCase $test_case  Suite or individual test
+		 *                                      case implementing the
+		 *                                      runnable test interface.
+		 *    @access public
+		 */
+		function addTestClass($class) {
+			if ($this->_getBaseTestCase($class) == 'grouptest') {
+				$this->_test_cases[] = new $class();
+			} else {
+				$this->_test_cases[] = $class;
+			}
+		}
+
+		/**
+		 *    Builds a group test from a library of test cases.
+		 *    The new group is composed into this one.
+		 *    @param string $test_file        File name of library with
+		 *                                    test case classes.
+		 *    @access public
+		 */
+		function addTestFile($test_file) {
+			$existing_classes = get_declared_classes();
+			if ($error = $this->_requireWithError($test_file)) {
+				$this->addTestCase(new BadGroupTest($test_file, $error));
+				return;
+			}
+			$classes = $this->_selectRunnableTests($existing_classes, get_declared_classes());
+			if (count($classes) == 0) {
+				$this->addTestCase(new BadGroupTest($test_file, "No runnable test cases in [$test_file]"));
+				return;
+			}
+			$group = $this->_createGroupFromClasses($test_file, $classes);
+			$this->addTestCase($group);
+		}
+
+		/**
+		 *    Requires a source file recording any syntax errors.
+		 *    @param string $file        File name to require in.
+		 *    @return string/boolean     An error message on failure or false
+		 *                               if no errors.
+		 *    @access private
+		 */
+		function _requireWithError($file) {
+			$this->_enableErrorReporting();
+			include_once($file);
+			$error = isset($php_errormsg) ? $php_errormsg : false;
+			$this->_disableErrorReporting();
+			$self_inflicted_errors = array(
+					'Assigning the return value of new by reference is deprecated',
+					'var: Deprecated. Please use the public/private/protected modifiers');
+			if (in_array($error, $self_inflicted_errors)) {
+				return false;
+			}
+			return $error;
+		}
+
+		/**
+		 *    Sets up detection of parse errors. Note that XDebug
+		 *    interferes with this and has to be disabled. This is
+		 *    to make sure the correct error code is returned
+		 *    from unattended scripts.
+		 *    @access private
+		 */
+		function _enableErrorReporting() {
+			if ($this->_xdebug_is_enabled) {
+				xdebug_disable();
+			}
+			ini_set('track_errors', true);
+		}
+
+		/**
+		 *    Resets detection of parse errors to their old values.
+		 *    This is to make sure the correct error code is returned
+		 *    from unattended scripts.
+		 *    @access private
+		 */
+		function _disableErrorReporting() {
+			ini_set('track_errors', $this->_old_track_errors);
+			if ($this->_xdebug_is_enabled) {
+				xdebug_enable();
+			}
+		}
+
+		/**
+		 *    Calculates the incoming test cases from a before
+		 *    and after list of loaded classes. Skips abstract
+		 *    classes.
+		 *    @param array $existing_classes   Classes before require().
+		 *    @param array $new_classes        Classes after require().
+		 *    @return array                    New classes which are test
+		 *                                     cases that shouldn't be ignored.
+		 *    @access private
+		 */
+		function _selectRunnableTests($existing_classes, $new_classes) {
+			$classes = array();
+			foreach ($new_classes as $class) {
+				if (in_array($class, $existing_classes)) {
+					continue;
+				}
+				if ($this->_getBaseTestCase($class)) {
+					$reflection = new SimpleReflection($class);
+					if ($reflection->isAbstract()) {
+						SimpleTest::ignore($class);
+					}
+					$classes[] = $class;
+				}
+			}
+			return $classes;
+		}
+
+		/**
+		 *    Builds a group test from a class list.
+		 *    @param string $title       Title of new group.
+		 *    @param array $classes      Test classes.
+		 *    @return GroupTest          Group loaded with the new
+		 *                               test cases.
+		 *    @access private
+		 */
+		function &_createGroupFromClasses($title, $classes) {
+			SimpleTest::ignoreParentsIfIgnored($classes);
+			$group = new GroupTest($title);
+			foreach ($classes as $class) {
+				if (! SimpleTest::isIgnored($class)) {
+					$group->addTestClass($class);
+				}
+			}
+			return $group;
+		}
+
+		/**
+		 *    Test to see if a class is derived from the
+		 *    SimpleTestCase class.
+		 *    @param string $class     Class name.
+		 *    @access private
+		 */
+		function _getBaseTestCase($class) {
+			while ($class = get_parent_class($class)) {
+				$class = strtolower($class);
+				if ($class == "simpletestcase" || $class == "grouptest") {
+					return $class;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Delegates to a visiting collector to add test
+		 *    files.
+		 *    @param string $path                  Path to scan from.
+		 *    @param SimpleCollector $collector    Directory scanner.
+		 *    @access public
+		 */
+		function collect($path, $collector) {
+			$collector->collect($this, $path);
+		}
+
+		/**
+		 *    Invokes run() on all of the held test cases, instantiating
+		 *    them if necessary.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintGroupStart($this->getLabel(), $this->getSize());
+			for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
+				if (is_string($this->_test_cases[$i])) {
+					$class = $this->_test_cases[$i];
+					$test = new $class();
+					$test->run($reporter);
+				} else {
+					$this->_test_cases[$i]->run($reporter);
+				}
+			}
+			$reporter->paintGroupEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Number of contained test cases.
+		 *    @return integer     Total count of cases in the group.
+		 *    @access public
+		 */
+		function getSize() {
+			$count = 0;
+			foreach ($this->_test_cases as $case) {
+				if (is_string($case)) {
+					$count++;
+				} else {
+					$count += $case->getSize();
+				}
+			}
+			return $count;
+		}
+	}
+
+	/**
+	 *    This is a failing group test for when a test suite hasn't
+	 *    loaded properly.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class BadGroupTest {
-        protected $_label;
-        protected $_error;
-
-        /**
-         *    Sets the name of the test suite and error message.
-         *    @param string $label    Name sent at the start and end
-         *                            of the test.
-         *    @access public
-         */
-        function BadGroupTest($label, $error) {
-            $this->_label = $label;
-            $this->_error = $error;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
-
-        /**
-         *    Sends a single error to the reporter.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-            $reporter->paintFail('Bad GroupTest [' . $this->getLabel() .
-                    '] with error [' . $this->_error . ']');
-            $reporter->paintGroupEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Number of contained test cases. Always zero.
-         *    @return integer     Total count of cases in the group.
-         *    @access public
-         */
-        function getSize() {
-            return 0;
-        }
-    }
+	 */
+	class BadGroupTest {
+		protected $_label;
+		protected $_error;
+
+		/**
+		 *    Sets the name of the test suite and error message.
+		 *    @param string $label    Name sent at the start and end
+		 *                            of the test.
+		 *    @access public
+		 */
+		function BadGroupTest($label, $error) {
+			$this->_label = $label;
+			$this->_error = $error;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
+
+		/**
+		 *    Sends a single error to the reporter.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintGroupStart($this->getLabel(), $this->getSize());
+			$reporter->paintFail('Bad GroupTest [' . $this->getLabel() .
+					'] with error [' . $this->_error . ']');
+			$reporter->paintGroupEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Number of contained test cases. Always zero.
+		 *    @return integer     Total count of cases in the group.
+		 *    @access public
+		 */
+		function getSize() {
+			return 0;
+		}
+	}

tests/test_tools/simpletest/url.php

Indentation +519 added lines, -519 removed lines

@@ -1,524 +1,524 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: url.php 1532 2006-12-01 12:28:55Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: url.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/encoding.php');
-    /**#@-*/
-
-    /**
-     *    URL parser to replace parse_url() PHP function which
-     *    got broken in PHP 4.3.0. Adds some browser specific
-     *    functionality such as expandomatics.
-     *    Guesses a bit trying to separate the host from
-     *    the path and tries to keep a raw, possibly unparsable,
-     *    request string as long as possible.
+	require_once(dirname(__FILE__) . '/encoding.php');
+	/**#@-*/
+
+	/**
+	 *    URL parser to replace parse_url() PHP function which
+	 *    got broken in PHP 4.3.0. Adds some browser specific
+	 *    functionality such as expandomatics.
+	 *    Guesses a bit trying to separate the host from
+	 *    the path and tries to keep a raw, possibly unparsable,
+	 *    request string as long as possible.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleUrl {
-        protected $_scheme;
-        protected $_username;
-        protected $_password;
-        protected $_host;
-        protected $_port;
-        protected $_path;
-        protected $_request;
-        protected $_fragment;
-        protected $_x;
-        protected $_y;
-        protected $_target;
-        protected $_raw = false;
-
-        /**
-         *    Constructor. Parses URL into sections.
-         *    @param string $url        Incoming URL.
-         *    @access public
-         */
-        function SimpleUrl($url) {
-            list($x, $y) = $this->_chompCoordinates($url);
-            $this->setCoordinates($x, $y);
-            $this->_scheme = $this->_chompScheme($url);
-            list($this->_username, $this->_password) = $this->_chompLogin($url);
-            $this->_host = $this->_chompHost($url);
-            $this->_port = false;
-            if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
-                $this->_host = $host_parts[1];
-                $this->_port = (integer)$host_parts[2];
-            }
-            $this->_path = $this->_chompPath($url);
-            $this->_request = $this->_parseRequest($this->_chompRequest($url));
-            $this->_fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
-            $this->_target = false;
-        }
-
-        /**
-         *    Extracts the X, Y coordinate pair from an image map.
-         *    @param string $url   URL so far. The coordinates will be
-         *                         removed.
-         *    @return array        X, Y as a pair of integers.
-         *    @access private
-         */
-        function _chompCoordinates($url) {
-            if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
-                $url = $matches[1];
-                return array((integer)$matches[2], (integer)$matches[3]);
-            }
-            return array(false, false);
-        }
-
-        /**
-         *    Extracts the scheme part of an incoming URL.
-         *    @param string $url   URL so far. The scheme will be
-         *                         removed.
-         *    @return string       Scheme part or false.
-         *    @access private
-         */
-        function _chompScheme($url) {
-            if (preg_match('/(.*?):(\/\/)(.*)/', $url, $matches)) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-            return false;
-        }
-
-        /**
-         *    Extracts the username and password from the
-         *    incoming URL. The // prefix will be reattached
-         *    to the URL after the doublet is extracted.
-         *    @param string $url    URL so far. The username and
-         *                          password are removed.
-         *    @return array         Two item list of username and
-         *                          password. Will urldecode() them.
-         *    @access private
-         */
-        function _chompLogin($url) {
-            $prefix = '';
-            if (preg_match('/^(\/\/)(.*)/', $url, $matches)) {
-                $prefix = $matches[1];
-                $url = $matches[2];
-            }
-            if (preg_match('/(.*?)@(.*)/', $url, $matches)) {
-                $url = $prefix . $matches[2];
-                $parts = split(":", $matches[1]);
-                return array(
-                        urldecode($parts[0]),
-                        isset($parts[1]) ? urldecode($parts[1]) : false);
-            }
-            $url = $prefix . $url;
-            return array(false, false);
-        }
-
-        /**
-         *    Extracts the host part of an incoming URL.
-         *    Includes the port number part. Will extract
-         *    the host if it starts with // or it has
-         *    a top level domain or it has at least two
-         *    dots.
-         *    @param string $url    URL so far. The host will be
-         *                          removed.
-         *    @return string        Host part guess or false.
-         *    @access private
-         */
-        function _chompHost($url) {
-            if (preg_match('/^(\/\/)(.*?)(\/.*|\?.*|#.*|$)/', $url, $matches)) {
-                $url = $matches[3];
-                return $matches[2];
-            }
-            if (preg_match('/(.*?)(\.\.\/|\.\/|\/|\?|#|$)(.*)/', $url, $matches)) {
-                $tlds = SimpleUrl::getAllTopLevelDomains();
-                if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
-                    $url = $matches[2] . $matches[3];
-                    return $matches[1];
-                } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
-                    $url = $matches[2] . $matches[3];
-                    return $matches[1];
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Extracts the path information from the incoming
-         *    URL. Strips this path from the URL.
-         *    @param string $url     URL so far. The host will be
-         *                           removed.
-         *    @return string         Path part or '/'.
-         *    @access private
-         */
-        function _chompPath($url) {
-            if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
-                $url = $matches[2] . $matches[3];
-                return ($matches[1] ? $matches[1] : '');
-            }
-            return '';
-        }
-
-        /**
-         *    Strips off the request data.
-         *    @param string $url  URL so far. The request will be
-         *                        removed.
-         *    @return string      Raw request part.
-         *    @access private
-         */
-        function _chompRequest($url) {
-            if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-            return '';
-        }
-
-        /**
-         *    Breaks the request down into an object.
-         *    @param string $raw           Raw request.
-         *    @return SimpleFormEncoding    Parsed data.
-         *    @access private
-         */
-        function _parseRequest($raw) {
-            $this->_raw = $raw;
-            $request = new SimpleGetEncoding();
-            foreach (split("&", $raw) as $pair) {
-                if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
-                    $request->add($matches[1], urldecode($matches[2]));
-                } elseif ($pair) {
-                    $request->add($pair, '');
-                }
-            }
-            return $request;
-        }
-
-        /**
-         *    Accessor for protocol part.
-         *    @param string $default    Value to use if not present.
-         *    @return string            Scheme name, e.g "http".
-         *    @access public
-         */
-        function getScheme($default = false) {
-            return $this->_scheme ? $this->_scheme : $default;
-        }
-
-        /**
-         *    Accessor for user name.
-         *    @return string    Username preceding host.
-         *    @access public
-         */
-        function getUsername() {
-            return $this->_username;
-        }
-
-        /**
-         *    Accessor for password.
-         *    @return string    Password preceding host.
-         *    @access public
-         */
-        function getPassword() {
-            return $this->_password;
-        }
-
-        /**
-         *    Accessor for hostname and port.
-         *    @param string $default    Value to use if not present.
-         *    @return string            Hostname only.
-         *    @access public
-         */
-        function getHost($default = false) {
-            return $this->_host ? $this->_host : $default;
-        }
-
-        /**
-         *    Accessor for top level domain.
-         *    @return string       Last part of host.
-         *    @access public
-         */
-        function getTld() {
-            $path_parts = pathinfo($this->getHost());
-            return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
-        }
-
-        /**
-         *    Accessor for port number.
-         *    @return integer    TCP/IP port number.
-         *    @access public
-         */
-        function getPort() {
-            return $this->_port;
-        }
-
-       /**
-         *    Accessor for path.
-         *    @return string    Full path including leading slash if implied.
-         *    @access public
-         */
-        function getPath() {
-            if (! $this->_path && $this->_host) {
-                return '/';
-            }
-            return $this->_path;
-        }
-
-        /**
-         *    Accessor for page if any. This may be a
-         *    directory name if ambiguious.
-         *    @return            Page name.
-         *    @access public
-         */
-        function getPage() {
-            if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
-                return false;
-            }
-            return $matches[1];
-        }
-
-        /**
-         *    Gets the path to the page.
-         *    @return string       Path less the page.
-         *    @access public
-         */
-        function getBasePath() {
-            if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
-                return false;
-            }
-            return $matches[1];
-        }
-
-        /**
-         *    Accessor for fragment at end of URL after the "#".
-         *    @return string    Part after "#".
-         *    @access public
-         */
-        function getFragment() {
-            return $this->_fragment;
-        }
-
-        /**
-         *    Sets image coordinates. Set to false to clear
-         *    them.
-         *    @param integer $x    Horizontal position.
-         *    @param integer $y    Vertical position.
-         *    @access public
-         */
-        function setCoordinates($x = false, $y = false) {
-            if (($x === false) || ($y === false)) {
-                $this->_x = $this->_y = false;
-                return;
-            }
-            $this->_x = (integer)$x;
-            $this->_y = (integer)$y;
-        }
-
-        /**
-         *    Accessor for horizontal image coordinate.
-         *    @return integer        X value.
-         *    @access public
-         */
-        function getX() {
-            return $this->_x;
-        }
-
-        /**
-         *    Accessor for vertical image coordinate.
-         *    @return integer        Y value.
-         *    @access public
-         */
-        function getY() {
-            return $this->_y;
-        }
-
-        /**
-         *    Accessor for current request parameters
-         *    in URL string form. Will return teh original request
-         *    if at all possible even if it doesn't make much
-         *    sense.
-         *    @return string   Form is string "?a=1&b=2", etc.
-         *    @access public
-         */
-        function getEncodedRequest() {
-            if ($this->_raw) {
-                $encoded = $this->_raw;
-            } else {
-                $encoded = $this->_request->asUrlRequest();
-            }
-            if ($encoded) {
-                return '?' . preg_replace('/^\?/', '', $encoded);
-            }
-            return '';
-        }
-
-        /**
-         *    Adds an additional parameter to the request.
-         *    @param string $key            Name of parameter.
-         *    @param string $value          Value as string.
-         *    @access public
-         */
-        function addRequestParameter($key, $value) {
-            $this->_raw = false;
-            $this->_request->add($key, $value);
-        }
-
-        /**
-         *    Adds additional parameters to the request.
-         *    @param hash/SimpleFormEncoding $parameters   Additional
-         *                                                parameters.
-         *    @access public
-         */
-        function addRequestParameters($parameters) {
-            $this->_raw = false;
-            $this->_request->merge($parameters);
-        }
-
-        /**
-         *    Clears down all parameters.
-         *    @access public
-         */
-        function clearRequest() {
-            $this->_raw = false;
-            $this->_request = new SimpleGetEncoding();
-        }
-
-        /**
-         *    Gets the frame target if present. Although
-         *    not strictly part of the URL specification it
-         *    acts as similarily to the browser.
-         *    @return boolean/string    Frame name or false if none.
-         *    @access public
-         */
-        function getTarget() {
-            return $this->_target;
-        }
-
-        /**
-         *    Attaches a frame target.
-         *    @param string $frame        Name of frame.
-         *    @access public
-         */
-        function setTarget($frame) {
-            $this->_raw = false;
-            $this->_target = $frame;
-        }
-
-        /**
-         *    Renders the URL back into a string.
-         *    @return string        URL in canonical form.
-         *    @access public
-         */
-        function asString() {
-            $scheme = $identity = $host = $path = $encoded = $fragment = '';
-            if ($this->_username && $this->_password) {
-                $identity = $this->_username . ':' . $this->_password . '@';
-            }
-            if ($this->getHost()) {
-                $scheme = $this->getScheme() ? $this->getScheme() : 'http';
-                $host = $this->getHost();
-            }
-            if (substr($this->_path, 0, 1) == '/') {
-                $path = $this->normalisePath($this->_path);
-            }
-            $encoded = $this->getEncodedRequest();
-            $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-            $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-            return "$scheme://$identity$host$path$encoded$fragment$coords";
-        }
-
-        /**
-         *    Replaces unknown sections to turn a relative
-         *    URL into an absolute one. The base URL can
-         *    be either a string or a SimpleUrl object.
-         *    @param string/SimpleUrl $base       Base URL.
-         *    @access public
-         */
-        function makeAbsolute($base) {
-            if (! is_object($base)) {
-                $base = new SimpleUrl($base);
-            }
-            $scheme = $this->getScheme() ? $this->getScheme() : $base->getScheme();
-            if ($this->getHost()) {
-                $host = $this->getHost();
-                $port = $this->getPort() ? ':' . $this->getPort() : '';
-                $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
-                if (! $identity) {
-                    $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-                }
-            } else {
-                $host = $base->getHost();
-                $port = $base->getPort() ? ':' . $base->getPort() : '';
-                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-            }
-            $path = $this->normalisePath($this->_extractAbsolutePath($base));
-            $encoded = $this->getEncodedRequest();
-            $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-            $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-            return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
-        }
-
-        /**
-         *    Replaces unknown sections of the path with base parts
-         *    to return a complete absolute one.
-         *    @param string/SimpleUrl $base       Base URL.
-         *    @param string                       Absolute path.
-         *    @access private
-         */
-        function _extractAbsolutePath($base) {
-            if ($this->getHost()) {
-                return $this->_path;
-            }
-            if (! $this->_isRelativePath($this->_path)) {
-                return $this->_path;
-            }
-            if ($this->_path) {
-                return $base->getBasePath() . $this->_path;
-            }
-            return $base->getPath();
-        }
-
-        /**
-         *    Simple test to see if a path part is relative.
-         *    @param string $path        Path to test.
-         *    @return boolean            True if starts with a "/".
-         *    @access private
-         */
-        function _isRelativePath($path) {
-            return (substr($path, 0, 1) != '/');
-        }
-
-        /**
-         *    Extracts the username and password for use in rendering
-         *    a URL.
-         *    @return string/boolean    Form of username:password or false.
-         *    @access public
-         */
-        function getIdentity() {
-            if ($this->_username && $this->_password) {
-                return $this->_username . ':' . $this->_password;
-            }
-            return false;
-        }
-
-        /**
-         *    Replaces . and .. sections of the path.
-         *    @param string $path    Unoptimised path.
-         *    @return string         Path with dots removed if possible.
-         *    @access public
-         */
-        function normalisePath($path) {
-            $path = preg_replace('|/[^/]+/\.\./|', '/', $path);
-            return preg_replace('|/\./|', '/', $path);
-        }
-
-        /**
-         *    A pipe seperated list of all TLDs that result in two part
-         *    domain names.
-         *    @return string        Pipe separated list.
-         *    @access public
-         *    @static
-         */
-        static function getAllTopLevelDomains() {
-            return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleUrl {
+		protected $_scheme;
+		protected $_username;
+		protected $_password;
+		protected $_host;
+		protected $_port;
+		protected $_path;
+		protected $_request;
+		protected $_fragment;
+		protected $_x;
+		protected $_y;
+		protected $_target;
+		protected $_raw = false;
+
+		/**
+		 *    Constructor. Parses URL into sections.
+		 *    @param string $url        Incoming URL.
+		 *    @access public
+		 */
+		function SimpleUrl($url) {
+			list($x, $y) = $this->_chompCoordinates($url);
+			$this->setCoordinates($x, $y);
+			$this->_scheme = $this->_chompScheme($url);
+			list($this->_username, $this->_password) = $this->_chompLogin($url);
+			$this->_host = $this->_chompHost($url);
+			$this->_port = false;
+			if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
+				$this->_host = $host_parts[1];
+				$this->_port = (integer)$host_parts[2];
+			}
+			$this->_path = $this->_chompPath($url);
+			$this->_request = $this->_parseRequest($this->_chompRequest($url));
+			$this->_fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
+			$this->_target = false;
+		}
+
+		/**
+		 *    Extracts the X, Y coordinate pair from an image map.
+		 *    @param string $url   URL so far. The coordinates will be
+		 *                         removed.
+		 *    @return array        X, Y as a pair of integers.
+		 *    @access private
+		 */
+		function _chompCoordinates($url) {
+			if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
+				$url = $matches[1];
+				return array((integer)$matches[2], (integer)$matches[3]);
+			}
+			return array(false, false);
+		}
+
+		/**
+		 *    Extracts the scheme part of an incoming URL.
+		 *    @param string $url   URL so far. The scheme will be
+		 *                         removed.
+		 *    @return string       Scheme part or false.
+		 *    @access private
+		 */
+		function _chompScheme($url) {
+			if (preg_match('/(.*?):(\/\/)(.*)/', $url, $matches)) {
+				$url = $matches[2] . $matches[3];
+				return $matches[1];
+			}
+			return false;
+		}
+
+		/**
+		 *    Extracts the username and password from the
+		 *    incoming URL. The // prefix will be reattached
+		 *    to the URL after the doublet is extracted.
+		 *    @param string $url    URL so far. The username and
+		 *                          password are removed.
+		 *    @return array         Two item list of username and
+		 *                          password. Will urldecode() them.
+		 *    @access private
+		 */
+		function _chompLogin($url) {
+			$prefix = '';
+			if (preg_match('/^(\/\/)(.*)/', $url, $matches)) {
+				$prefix = $matches[1];
+				$url = $matches[2];
+			}
+			if (preg_match('/(.*?)@(.*)/', $url, $matches)) {
+				$url = $prefix . $matches[2];
+				$parts = split(":", $matches[1]);
+				return array(
+						urldecode($parts[0]),
+						isset($parts[1]) ? urldecode($parts[1]) : false);
+			}
+			$url = $prefix . $url;
+			return array(false, false);
+		}
+
+		/**
+		 *    Extracts the host part of an incoming URL.
+		 *    Includes the port number part. Will extract
+		 *    the host if it starts with // or it has
+		 *    a top level domain or it has at least two
+		 *    dots.
+		 *    @param string $url    URL so far. The host will be
+		 *                          removed.
+		 *    @return string        Host part guess or false.
+		 *    @access private
+		 */
+		function _chompHost($url) {
+			if (preg_match('/^(\/\/)(.*?)(\/.*|\?.*|#.*|$)/', $url, $matches)) {
+				$url = $matches[3];
+				return $matches[2];
+			}
+			if (preg_match('/(.*?)(\.\.\/|\.\/|\/|\?|#|$)(.*)/', $url, $matches)) {
+				$tlds = SimpleUrl::getAllTopLevelDomains();
+				if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
+					$url = $matches[2] . $matches[3];
+					return $matches[1];
+				} elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
+					$url = $matches[2] . $matches[3];
+					return $matches[1];
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Extracts the path information from the incoming
+		 *    URL. Strips this path from the URL.
+		 *    @param string $url     URL so far. The host will be
+		 *                           removed.
+		 *    @return string         Path part or '/'.
+		 *    @access private
+		 */
+		function _chompPath($url) {
+			if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
+				$url = $matches[2] . $matches[3];
+				return ($matches[1] ? $matches[1] : '');
+			}
+			return '';
+		}
+
+		/**
+		 *    Strips off the request data.
+		 *    @param string $url  URL so far. The request will be
+		 *                        removed.
+		 *    @return string      Raw request part.
+		 *    @access private
+		 */
+		function _chompRequest($url) {
+			if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
+				$url = $matches[2] . $matches[3];
+				return $matches[1];
+			}
+			return '';
+		}
+
+		/**
+		 *    Breaks the request down into an object.
+		 *    @param string $raw           Raw request.
+		 *    @return SimpleFormEncoding    Parsed data.
+		 *    @access private
+		 */
+		function _parseRequest($raw) {
+			$this->_raw = $raw;
+			$request = new SimpleGetEncoding();
+			foreach (split("&", $raw) as $pair) {
+				if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
+					$request->add($matches[1], urldecode($matches[2]));
+				} elseif ($pair) {
+					$request->add($pair, '');
+				}
+			}
+			return $request;
+		}
+
+		/**
+		 *    Accessor for protocol part.
+		 *    @param string $default    Value to use if not present.
+		 *    @return string            Scheme name, e.g "http".
+		 *    @access public
+		 */
+		function getScheme($default = false) {
+			return $this->_scheme ? $this->_scheme : $default;
+		}
+
+		/**
+		 *    Accessor for user name.
+		 *    @return string    Username preceding host.
+		 *    @access public
+		 */
+		function getUsername() {
+			return $this->_username;
+		}
+
+		/**
+		 *    Accessor for password.
+		 *    @return string    Password preceding host.
+		 *    @access public
+		 */
+		function getPassword() {
+			return $this->_password;
+		}
+
+		/**
+		 *    Accessor for hostname and port.
+		 *    @param string $default    Value to use if not present.
+		 *    @return string            Hostname only.
+		 *    @access public
+		 */
+		function getHost($default = false) {
+			return $this->_host ? $this->_host : $default;
+		}
+
+		/**
+		 *    Accessor for top level domain.
+		 *    @return string       Last part of host.
+		 *    @access public
+		 */
+		function getTld() {
+			$path_parts = pathinfo($this->getHost());
+			return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
+		}
+
+		/**
+		 *    Accessor for port number.
+		 *    @return integer    TCP/IP port number.
+		 *    @access public
+		 */
+		function getPort() {
+			return $this->_port;
+		}
+
+	   /**
+	    *    Accessor for path.
+	    *    @return string    Full path including leading slash if implied.
+	    *    @access public
+	    */
+		function getPath() {
+			if (! $this->_path && $this->_host) {
+				return '/';
+			}
+			return $this->_path;
+		}
+
+		/**
+		 *    Accessor for page if any. This may be a
+		 *    directory name if ambiguious.
+		 *    @return            Page name.
+		 *    @access public
+		 */
+		function getPage() {
+			if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
+				return false;
+			}
+			return $matches[1];
+		}
+
+		/**
+		 *    Gets the path to the page.
+		 *    @return string       Path less the page.
+		 *    @access public
+		 */
+		function getBasePath() {
+			if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
+				return false;
+			}
+			return $matches[1];
+		}
+
+		/**
+		 *    Accessor for fragment at end of URL after the "#".
+		 *    @return string    Part after "#".
+		 *    @access public
+		 */
+		function getFragment() {
+			return $this->_fragment;
+		}
+
+		/**
+		 *    Sets image coordinates. Set to false to clear
+		 *    them.
+		 *    @param integer $x    Horizontal position.
+		 *    @param integer $y    Vertical position.
+		 *    @access public
+		 */
+		function setCoordinates($x = false, $y = false) {
+			if (($x === false) || ($y === false)) {
+				$this->_x = $this->_y = false;
+				return;
+			}
+			$this->_x = (integer)$x;
+			$this->_y = (integer)$y;
+		}
+
+		/**
+		 *    Accessor for horizontal image coordinate.
+		 *    @return integer        X value.
+		 *    @access public
+		 */
+		function getX() {
+			return $this->_x;
+		}
+
+		/**
+		 *    Accessor for vertical image coordinate.
+		 *    @return integer        Y value.
+		 *    @access public
+		 */
+		function getY() {
+			return $this->_y;
+		}
+
+		/**
+		 *    Accessor for current request parameters
+		 *    in URL string form. Will return teh original request
+		 *    if at all possible even if it doesn't make much
+		 *    sense.
+		 *    @return string   Form is string "?a=1&b=2", etc.
+		 *    @access public
+		 */
+		function getEncodedRequest() {
+			if ($this->_raw) {
+				$encoded = $this->_raw;
+			} else {
+				$encoded = $this->_request->asUrlRequest();
+			}
+			if ($encoded) {
+				return '?' . preg_replace('/^\?/', '', $encoded);
+			}
+			return '';
+		}
+
+		/**
+		 *    Adds an additional parameter to the request.
+		 *    @param string $key            Name of parameter.
+		 *    @param string $value          Value as string.
+		 *    @access public
+		 */
+		function addRequestParameter($key, $value) {
+			$this->_raw = false;
+			$this->_request->add($key, $value);
+		}
+
+		/**
+		 *    Adds additional parameters to the request.
+		 *    @param hash/SimpleFormEncoding $parameters   Additional
+		 *                                                parameters.
+		 *    @access public
+		 */
+		function addRequestParameters($parameters) {
+			$this->_raw = false;
+			$this->_request->merge($parameters);
+		}
+
+		/**
+		 *    Clears down all parameters.
+		 *    @access public
+		 */
+		function clearRequest() {
+			$this->_raw = false;
+			$this->_request = new SimpleGetEncoding();
+		}
+
+		/**
+		 *    Gets the frame target if present. Although
+		 *    not strictly part of the URL specification it
+		 *    acts as similarily to the browser.
+		 *    @return boolean/string    Frame name or false if none.
+		 *    @access public
+		 */
+		function getTarget() {
+			return $this->_target;
+		}
+
+		/**
+		 *    Attaches a frame target.
+		 *    @param string $frame        Name of frame.
+		 *    @access public
+		 */
+		function setTarget($frame) {
+			$this->_raw = false;
+			$this->_target = $frame;
+		}
+
+		/**
+		 *    Renders the URL back into a string.
+		 *    @return string        URL in canonical form.
+		 *    @access public
+		 */
+		function asString() {
+			$scheme = $identity = $host = $path = $encoded = $fragment = '';
+			if ($this->_username && $this->_password) {
+				$identity = $this->_username . ':' . $this->_password . '@';
+			}
+			if ($this->getHost()) {
+				$scheme = $this->getScheme() ? $this->getScheme() : 'http';
+				$host = $this->getHost();
+			}
+			if (substr($this->_path, 0, 1) == '/') {
+				$path = $this->normalisePath($this->_path);
+			}
+			$encoded = $this->getEncodedRequest();
+			$fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+			$coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+			return "$scheme://$identity$host$path$encoded$fragment$coords";
+		}
+
+		/**
+		 *    Replaces unknown sections to turn a relative
+		 *    URL into an absolute one. The base URL can
+		 *    be either a string or a SimpleUrl object.
+		 *    @param string/SimpleUrl $base       Base URL.
+		 *    @access public
+		 */
+		function makeAbsolute($base) {
+			if (! is_object($base)) {
+				$base = new SimpleUrl($base);
+			}
+			$scheme = $this->getScheme() ? $this->getScheme() : $base->getScheme();
+			if ($this->getHost()) {
+				$host = $this->getHost();
+				$port = $this->getPort() ? ':' . $this->getPort() : '';
+				$identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
+				if (! $identity) {
+					$identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+				}
+			} else {
+				$host = $base->getHost();
+				$port = $base->getPort() ? ':' . $base->getPort() : '';
+				$identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+			}
+			$path = $this->normalisePath($this->_extractAbsolutePath($base));
+			$encoded = $this->getEncodedRequest();
+			$fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+			$coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+			return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
+		}
+
+		/**
+		 *    Replaces unknown sections of the path with base parts
+		 *    to return a complete absolute one.
+		 *    @param string/SimpleUrl $base       Base URL.
+		 *    @param string                       Absolute path.
+		 *    @access private
+		 */
+		function _extractAbsolutePath($base) {
+			if ($this->getHost()) {
+				return $this->_path;
+			}
+			if (! $this->_isRelativePath($this->_path)) {
+				return $this->_path;
+			}
+			if ($this->_path) {
+				return $base->getBasePath() . $this->_path;
+			}
+			return $base->getPath();
+		}
+
+		/**
+		 *    Simple test to see if a path part is relative.
+		 *    @param string $path        Path to test.
+		 *    @return boolean            True if starts with a "/".
+		 *    @access private
+		 */
+		function _isRelativePath($path) {
+			return (substr($path, 0, 1) != '/');
+		}
+
+		/**
+		 *    Extracts the username and password for use in rendering
+		 *    a URL.
+		 *    @return string/boolean    Form of username:password or false.
+		 *    @access public
+		 */
+		function getIdentity() {
+			if ($this->_username && $this->_password) {
+				return $this->_username . ':' . $this->_password;
+			}
+			return false;
+		}
+
+		/**
+		 *    Replaces . and .. sections of the path.
+		 *    @param string $path    Unoptimised path.
+		 *    @return string         Path with dots removed if possible.
+		 *    @access public
+		 */
+		function normalisePath($path) {
+			$path = preg_replace('|/[^/]+/\.\./|', '/', $path);
+			return preg_replace('|/\./|', '/', $path);
+		}
+
+		/**
+		 *    A pipe seperated list of all TLDs that result in two part
+		 *    domain names.
+		 *    @return string        Pipe separated list.
+		 *    @access public
+		 *    @static
+		 */
+		static function getAllTopLevelDomains() {
+			return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/web_tester.php

Indentation +1439 added lines, -1439 removed lines

@@ -1,1454 +1,1454 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: web_tester.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: web_tester.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/test_case.php');
-    require_once(dirname(__FILE__) . '/browser.php');
-    require_once(dirname(__FILE__) . '/page.php');
-    require_once(dirname(__FILE__) . '/expectation.php');
-    /**#@-*/
-
-    /**
-     *    Test for an HTML widget value match.
+	require_once(dirname(__FILE__) . '/test_case.php');
+	require_once(dirname(__FILE__) . '/browser.php');
+	require_once(dirname(__FILE__) . '/page.php');
+	require_once(dirname(__FILE__) . '/expectation.php');
+	/**#@-*/
+
+	/**
+	 *    Test for an HTML widget value match.
 	 *	  @package SimpleTest
 	 *	  @subpackage WebTester
-     */
-    class FieldExpectation extends SimpleExpectation {
-        protected $_value;
-
-        /**
-         *    Sets the field value to compare against.
-         *    @param mixed $value     Test value to match. Can be an
-         *                            expectation for say pattern matching.
-         *    @param string $message  Optiona message override. Can use %s as
-         *                            a placeholder for the original message.
-         *    @access public
-         */
-        function FieldExpectation($value, $message = '%s') {
-            $this->SimpleExpectation($message);
-            if (is_array($value)) {
-                sort($value);
-            }
-            $this->_value = $value;
-        }
-
-        /**
-         *    Tests the expectation. True if it matches
-         *    a string value or an array value in any order.
-         *    @param mixed $compare        Comparison value. False for
-         *                                 an unset field.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            if ($this->_value === false) {
-                return ($compare === false);
-            }
-            if ($this->_isSingle($this->_value)) {
-                return $this->_testSingle($compare);
-            }
-            if (is_array($this->_value)) {
-                return $this->_testMultiple($compare);
-            }
-            return false;
-        }
-
-        /**
-         *    Tests for valid field comparisons with a single option.
-         *    @param mixed $value       Value to type check.
-         *    @return boolean           True if integer, string or float.
-         *    @access private
-         */
-        function _isSingle($value) {
-            return is_string($value) || is_integer($value) || is_float($value);
-        }
-
-        /**
-         *    String comparison for simple field with a single option.
-         *    @param mixed $compare    String to test against.
-         *    @returns boolean         True if matching.
-         *    @access private
-         */
-        function _testSingle($compare) {
-            if (is_array($compare) && count($compare) == 1) {
-                $compare = $compare[0];
-            }
-            if (! $this->_isSingle($compare)) {
-                return false;
-            }
-            return ($this->_value == $compare);
-        }
-
-        /**
-         *    List comparison for multivalue field.
-         *    @param mixed $compare    List in any order to test against.
-         *    @returns boolean         True if matching.
-         *    @access private
-         */
-        function _testMultiple($compare) {
-            if (is_string($compare)) {
-                $compare = array($compare);
-            }
-            if (! is_array($compare)) {
-                return false;
-            }
-            sort($compare);
-            return ($this->_value === $compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            if (is_array($compare)) {
-                sort($compare);
-            }
-            if ($this->test($compare)) {
-                return "Field expectation [" . $dumper->describeValue($this->_value) . "]";
-            } else {
-                return "Field expectation [" . $dumper->describeValue($this->_value) .
-                        "] fails with [" .
-                        $this->_dumper->describeValue($compare) . "] " .
-                        $this->_dumper->describeDifference($this->_value, $compare);
-            }
-        }
-    }
-
-    /**
-     *    Test for a specific HTTP header within a header block.
+	 */
+	class FieldExpectation extends SimpleExpectation {
+		protected $_value;
+
+		/**
+		 *    Sets the field value to compare against.
+		 *    @param mixed $value     Test value to match. Can be an
+		 *                            expectation for say pattern matching.
+		 *    @param string $message  Optiona message override. Can use %s as
+		 *                            a placeholder for the original message.
+		 *    @access public
+		 */
+		function FieldExpectation($value, $message = '%s') {
+			$this->SimpleExpectation($message);
+			if (is_array($value)) {
+				sort($value);
+			}
+			$this->_value = $value;
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches
+		 *    a string value or an array value in any order.
+		 *    @param mixed $compare        Comparison value. False for
+		 *                                 an unset field.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			if ($this->_value === false) {
+				return ($compare === false);
+			}
+			if ($this->_isSingle($this->_value)) {
+				return $this->_testSingle($compare);
+			}
+			if (is_array($this->_value)) {
+				return $this->_testMultiple($compare);
+			}
+			return false;
+		}
+
+		/**
+		 *    Tests for valid field comparisons with a single option.
+		 *    @param mixed $value       Value to type check.
+		 *    @return boolean           True if integer, string or float.
+		 *    @access private
+		 */
+		function _isSingle($value) {
+			return is_string($value) || is_integer($value) || is_float($value);
+		}
+
+		/**
+		 *    String comparison for simple field with a single option.
+		 *    @param mixed $compare    String to test against.
+		 *    @returns boolean         True if matching.
+		 *    @access private
+		 */
+		function _testSingle($compare) {
+			if (is_array($compare) && count($compare) == 1) {
+				$compare = $compare[0];
+			}
+			if (! $this->_isSingle($compare)) {
+				return false;
+			}
+			return ($this->_value == $compare);
+		}
+
+		/**
+		 *    List comparison for multivalue field.
+		 *    @param mixed $compare    List in any order to test against.
+		 *    @returns boolean         True if matching.
+		 *    @access private
+		 */
+		function _testMultiple($compare) {
+			if (is_string($compare)) {
+				$compare = array($compare);
+			}
+			if (! is_array($compare)) {
+				return false;
+			}
+			sort($compare);
+			return ($this->_value === $compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			if (is_array($compare)) {
+				sort($compare);
+			}
+			if ($this->test($compare)) {
+				return "Field expectation [" . $dumper->describeValue($this->_value) . "]";
+			} else {
+				return "Field expectation [" . $dumper->describeValue($this->_value) .
+						"] fails with [" .
+						$this->_dumper->describeValue($compare) . "] " .
+						$this->_dumper->describeDifference($this->_value, $compare);
+			}
+		}
+	}
+
+	/**
+	 *    Test for a specific HTTP header within a header block.
 	 *	  @package SimpleTest
 	 *	  @subpackage WebTester
-     */
-    class HttpHeaderExpectation extends SimpleExpectation {
-        protected $_expected_header;
-        protected $_expected_value;
-
-        /**
-         *    Sets the field and value to compare against.
-         *    @param string $header   Case insenstive trimmed header name.
-         *    @param mixed $value     Optional value to compare. If not
-         *                            given then any value will match. If
-         *                            an expectation object then that will
-         *                            be used instead.
-         *    @param string $message  Optiona message override. Can use %s as
-         *                            a placeholder for the original message.
-         */
-        function HttpHeaderExpectation($header, $value = false, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_expected_header = $this->_normaliseHeader($header);
-            $this->_expected_value = $value;
-        }
-
-        /**
-         *    Accessor for aggregated object.
-         *    @return mixed        Expectation set in constructor.
-         *    @access protected
-         */
-        function _getExpectation() {
-            return $this->_expected_value;
-        }
-
-        /**
-         *    Removes whitespace at ends and case variations.
-         *    @param string $header    Name of header.
-         *    @param string            Trimmed and lowecased header
-         *                             name.
-         *    @access private
-         */
-        function _normaliseHeader($header) {
-            return strtolower(trim($header));
-        }
-
-        /**
-         *    Tests the expectation. True if it matches
-         *    a string value or an array value in any order.
-         *    @param mixed $compare   Raw header block to search.
-         *    @return boolean         True if header present.
-         *    @access public
-         */
-        function test($compare) {
-            return is_string($this->_findHeader($compare));
-        }
-
-        /**
-         *    Searches the incoming result. Will extract the matching
-         *    line as text.
-         *    @param mixed $compare   Raw header block to search.
-         *    @return string          Matching header line.
-         *    @access protected
-         */
-        function _findHeader($compare) {
-            $lines = split("\r\n", $compare);
-            foreach ($lines as $line) {
-                if ($this->_testHeaderLine($line)) {
-                    return $line;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Compares a single header line against the expectation.
-         *    @param string $line      A single line to compare.
-         *    @return boolean          True if matched.
-         *    @access private
-         */
-        function _testHeaderLine($line) {
-            if (count($parsed = split(':', $line, 2)) < 2) {
-                return false;
-            }
-            list($header, $value) = $parsed;
-            if ($this->_normaliseHeader($header) != $this->_expected_header) {
-                return false;
-            }
-            return $this->_testHeaderValue($value, $this->_expected_value);
-        }
-
-        /**
-         *    Tests the value part of the header.
-         *    @param string $value        Value to test.
-         *    @param mixed $expected      Value to test against.
-         *    @return boolean             True if matched.
-         *    @access protected
-         */
-        function _testHeaderValue($value, $expected) {
-            if ($expected === false) {
-                return true;
-            }
-            if (SimpleExpectation::isExpectation($expected)) {
-                return $expected->test(trim($value));
-            }
-            return (trim($value) == trim($expected));
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Raw header block to search.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if (SimpleExpectation::isExpectation($this->_expected_value)) {
-                $message = $this->_expected_value->testMessage($compare);
-            } else {
-                $message = $this->_expected_header .
-                        ($this->_expected_value ? ': ' . $this->_expected_value : '');
-            }
-            if (is_string($line = $this->_findHeader($compare))) {
-                return "Searching for header [$message] found [$line]";
-            } else {
-                return "Failed to find header [$message]";
-            }
-        }
-    }
-
-    /**
-     *    Test for a specific HTTP header within a header block that
-     *    should not be found.
+	 */
+	class HttpHeaderExpectation extends SimpleExpectation {
+		protected $_expected_header;
+		protected $_expected_value;
+
+		/**
+		 *    Sets the field and value to compare against.
+		 *    @param string $header   Case insenstive trimmed header name.
+		 *    @param mixed $value     Optional value to compare. If not
+		 *                            given then any value will match. If
+		 *                            an expectation object then that will
+		 *                            be used instead.
+		 *    @param string $message  Optiona message override. Can use %s as
+		 *                            a placeholder for the original message.
+		 */
+		function HttpHeaderExpectation($header, $value = false, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_expected_header = $this->_normaliseHeader($header);
+			$this->_expected_value = $value;
+		}
+
+		/**
+		 *    Accessor for aggregated object.
+		 *    @return mixed        Expectation set in constructor.
+		 *    @access protected
+		 */
+		function _getExpectation() {
+			return $this->_expected_value;
+		}
+
+		/**
+		 *    Removes whitespace at ends and case variations.
+		 *    @param string $header    Name of header.
+		 *    @param string            Trimmed and lowecased header
+		 *                             name.
+		 *    @access private
+		 */
+		function _normaliseHeader($header) {
+			return strtolower(trim($header));
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches
+		 *    a string value or an array value in any order.
+		 *    @param mixed $compare   Raw header block to search.
+		 *    @return boolean         True if header present.
+		 *    @access public
+		 */
+		function test($compare) {
+			return is_string($this->_findHeader($compare));
+		}
+
+		/**
+		 *    Searches the incoming result. Will extract the matching
+		 *    line as text.
+		 *    @param mixed $compare   Raw header block to search.
+		 *    @return string          Matching header line.
+		 *    @access protected
+		 */
+		function _findHeader($compare) {
+			$lines = split("\r\n", $compare);
+			foreach ($lines as $line) {
+				if ($this->_testHeaderLine($line)) {
+					return $line;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Compares a single header line against the expectation.
+		 *    @param string $line      A single line to compare.
+		 *    @return boolean          True if matched.
+		 *    @access private
+		 */
+		function _testHeaderLine($line) {
+			if (count($parsed = split(':', $line, 2)) < 2) {
+				return false;
+			}
+			list($header, $value) = $parsed;
+			if ($this->_normaliseHeader($header) != $this->_expected_header) {
+				return false;
+			}
+			return $this->_testHeaderValue($value, $this->_expected_value);
+		}
+
+		/**
+		 *    Tests the value part of the header.
+		 *    @param string $value        Value to test.
+		 *    @param mixed $expected      Value to test against.
+		 *    @return boolean             True if matched.
+		 *    @access protected
+		 */
+		function _testHeaderValue($value, $expected) {
+			if ($expected === false) {
+				return true;
+			}
+			if (SimpleExpectation::isExpectation($expected)) {
+				return $expected->test(trim($value));
+			}
+			return (trim($value) == trim($expected));
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Raw header block to search.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if (SimpleExpectation::isExpectation($this->_expected_value)) {
+				$message = $this->_expected_value->testMessage($compare);
+			} else {
+				$message = $this->_expected_header .
+						($this->_expected_value ? ': ' . $this->_expected_value : '');
+			}
+			if (is_string($line = $this->_findHeader($compare))) {
+				return "Searching for header [$message] found [$line]";
+			} else {
+				return "Failed to find header [$message]";
+			}
+		}
+	}
+
+	/**
+	 *    Test for a specific HTTP header within a header block that
+	 *    should not be found.
 	 *	  @package SimpleTest
 	 *	  @subpackage WebTester
-     */
-    class NoHttpHeaderExpectation extends HttpHeaderExpectation {
-        protected $_expected_header;
-        protected $_expected_value;
-
-        /**
-         *    Sets the field and value to compare against.
-         *    @param string $unwanted   Case insenstive trimmed header name.
-         *    @param string $message    Optiona message override. Can use %s as
-         *                              a placeholder for the original message.
-         */
-        function NoHttpHeaderExpectation($unwanted, $message = '%s') {
-            $this->HttpHeaderExpectation($unwanted, false, $message);
-        }
-
-        /**
-         *    Tests that the unwanted header is not found.
-         *    @param mixed $compare   Raw header block to search.
-         *    @return boolean         True if header present.
-         *    @access public
-         */
-        function test($compare) {
-            return ($this->_findHeader($compare) === false);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Raw header block to search.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $expectation = $this->_getExpectation();
-            if (is_string($line = $this->_findHeader($compare))) {
-                return "Found unwanted header [$expectation] with [$line]";
-            } else {
-                return "Did not find unwanted header [$expectation]";
-            }
-        }
-    }
-
-    /**
-     *    Test for a text substring.
+	 */
+	class NoHttpHeaderExpectation extends HttpHeaderExpectation {
+		protected $_expected_header;
+		protected $_expected_value;
+
+		/**
+		 *    Sets the field and value to compare against.
+		 *    @param string $unwanted   Case insenstive trimmed header name.
+		 *    @param string $message    Optiona message override. Can use %s as
+		 *                              a placeholder for the original message.
+		 */
+		function NoHttpHeaderExpectation($unwanted, $message = '%s') {
+			$this->HttpHeaderExpectation($unwanted, false, $message);
+		}
+
+		/**
+		 *    Tests that the unwanted header is not found.
+		 *    @param mixed $compare   Raw header block to search.
+		 *    @return boolean         True if header present.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ($this->_findHeader($compare) === false);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Raw header block to search.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$expectation = $this->_getExpectation();
+			if (is_string($line = $this->_findHeader($compare))) {
+				return "Found unwanted header [$expectation] with [$line]";
+			} else {
+				return "Did not find unwanted header [$expectation]";
+			}
+		}
+	}
+
+	/**
+	 *    Test for a text substring.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class TextExpectation extends SimpleExpectation {
-        protected $_substring;
-
-        /**
-         *    Sets the value to compare against.
-         *    @param string $substring  Text to search for.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function TextExpectation($substring, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_substring = $substring;
-        }
-
-        /**
-         *    Accessor for the substring.
-         *    @return string       Text to match.
-         *    @access protected
-         */
-        function _getSubstring() {
-            return $this->_substring;
-        }
-
-        /**
-         *    Tests the expectation. True if the text contains the
-         *    substring.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return (strpos($compare, $this->_substring) !== false);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                return $this->_describeTextMatch($this->_getSubstring(), $compare);
-            } else {
-                $dumper = $this->_getDumper();
-                return "Text [" . $this->_getSubstring() .
-                        "] not detected in [" .
-                        $dumper->describeValue($compare) . "]";
-            }
-        }
-
-        /**
-         *    Describes a pattern match including the string
-         *    found and it's position.
-         *    @param string $substring      Text to search for.
-         *    @param string $subject        Subject to search.
-         *    @access protected
-         */
-        function _describeTextMatch($substring, $subject) {
-            $position = strpos($subject, $substring);
-            $dumper = $this->_getDumper();
-            return "Text [$substring] detected at character [$position] in [" .
-                    $dumper->describeValue($subject) . "] in region [" .
-                    $dumper->clipString($subject, 100, $position) . "]";
-        }
-    }
-
-    /**
-     *    Fail if a substring is detected within the
-     *    comparison text.
+	 */
+	class TextExpectation extends SimpleExpectation {
+		protected $_substring;
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param string $substring  Text to search for.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function TextExpectation($substring, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_substring = $substring;
+		}
+
+		/**
+		 *    Accessor for the substring.
+		 *    @return string       Text to match.
+		 *    @access protected
+		 */
+		function _getSubstring() {
+			return $this->_substring;
+		}
+
+		/**
+		 *    Tests the expectation. True if the text contains the
+		 *    substring.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return (strpos($compare, $this->_substring) !== false);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				return $this->_describeTextMatch($this->_getSubstring(), $compare);
+			} else {
+				$dumper = $this->_getDumper();
+				return "Text [" . $this->_getSubstring() .
+						"] not detected in [" .
+						$dumper->describeValue($compare) . "]";
+			}
+		}
+
+		/**
+		 *    Describes a pattern match including the string
+		 *    found and it's position.
+		 *    @param string $substring      Text to search for.
+		 *    @param string $subject        Subject to search.
+		 *    @access protected
+		 */
+		function _describeTextMatch($substring, $subject) {
+			$position = strpos($subject, $substring);
+			$dumper = $this->_getDumper();
+			return "Text [$substring] detected at character [$position] in [" .
+					$dumper->describeValue($subject) . "] in region [" .
+					$dumper->clipString($subject, 100, $position) . "]";
+		}
+	}
+
+	/**
+	 *    Fail if a substring is detected within the
+	 *    comparison text.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class NoTextExpectation extends TextExpectation {
-
-        /**
-         *    Sets the reject pattern
-         *    @param string $substring  Text to search for.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function NoTextExpectation($substring, $message = '%s') {
-            $this->TextExpectation($substring, $message);
-        }
-
-        /**
-         *    Tests the expectation. False if the substring appears
-         *    in the text.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param string $compare      Comparison value.
-         *    @return string              Description of success
-         *                                or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                $dumper = $this->_getDumper();
-                return "Text [" . $this->_getSubstring() .
-                        "] not detected in [" .
-                        $dumper->describeValue($compare) . "]";
-            } else {
-                return $this->_describeTextMatch($this->_getSubstring(), $compare);
-            }
-        }
-    }
-
-    /**
-     *    Test case for testing of web pages. Allows
-     *    fetching of pages, parsing of HTML and
-     *    submitting forms.
+	 */
+	class NoTextExpectation extends TextExpectation {
+
+		/**
+		 *    Sets the reject pattern
+		 *    @param string $substring  Text to search for.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function NoTextExpectation($substring, $message = '%s') {
+			$this->TextExpectation($substring, $message);
+		}
+
+		/**
+		 *    Tests the expectation. False if the substring appears
+		 *    in the text.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param string $compare      Comparison value.
+		 *    @return string              Description of success
+		 *                                or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				$dumper = $this->_getDumper();
+				return "Text [" . $this->_getSubstring() .
+						"] not detected in [" .
+						$dumper->describeValue($compare) . "]";
+			} else {
+				return $this->_describeTextMatch($this->_getSubstring(), $compare);
+			}
+		}
+	}
+
+	/**
+	 *    Test case for testing of web pages. Allows
+	 *    fetching of pages, parsing of HTML and
+	 *    submitting forms.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class WebTestCase extends SimpleTestCase {
-        protected $_browser;
-        protected $_ignore_errors = false;
-
-        /**
-         *    Creates an empty test case. Should be subclassed
-         *    with test methods for a functional test case.
-         *    @param string $label     Name of test case. Will use
-         *                             the class name if none specified.
-         *    @access public
-         */
-        function WebTestCase($label = false) {
-            $this->SimpleTestCase($label);
-        }
-
-        /**
-         *    Announces the start of the test.
-         *    @param string $method    Test method just started.
-         *    @access public
-         */
-        function before($method) {
-            parent::before($method);
-            $this->setBrowser($this->createBrowser());
-        }
-
-        /**
-         *    Announces the end of the test. Includes private clean up.
-         *    @param string $method    Test method just finished.
-         *    @access public
-         */
-        function after($method) {
-            $this->unsetBrowser();
-            parent::after($method);
-        }
-
-        /**
-         *    Gets a current browser reference for setting
-         *    special expectations or for detailed
-         *    examination of page fetches.
-         *    @return SimpleBrowser     Current test browser object.
-         *    @access public
-         */
-        function &getBrowser() {
-            return $this->_browser;
-        }
-
-        /**
-         *    Gets a current browser reference for setting
-         *    special expectations or for detailed
-         *    examination of page fetches.
-         *    @param SimpleBrowser $browser    New test browser object.
-         *    @access public
-         */
-        function setBrowser($browser) {
-            return $this->_browser = $browser;
-        }
-
-        /**
-         *    Clears the current browser reference to help the
-         *    PHP garbage collector.
-         *    @access public
-         */
-        function unsetBrowser() {
-            unset($this->_browser);
-        }
-
-        /**
-         *    Creates a new default web browser object.
-         *    Will be cleared at the end of the test method.
-         *    @return TestBrowser           New browser.
-         *    @access public
-         */
-        function &createBrowser() {
-            $browser = new SimpleBrowser();
-            return $browser;
-        }
-
-        /**
-         *    Gets the last response error.
-         *    @return string    Last low level HTTP error.
-         *    @access public
-         */
-        function getTransportError() {
-            return $this->_browser->getTransportError();
-        }
-
-        /**
-         *    Accessor for the currently selected URL.
-         *    @return string        Current location or false if
-         *                          no page yet fetched.
-         *    @access public
-         */
-        function getUrl() {
-            return $this->_browser->getUrl();
-        }
-
-        /**
-         *    Dumps the current request for debugging.
-         *    @access public
-         */
-        function showRequest() {
-            $this->dump($this->_browser->getRequest());
-        }
-
-        /**
-         *    Dumps the current HTTP headers for debugging.
-         *    @access public
-         */
-        function showHeaders() {
-            $this->dump($this->_browser->getHeaders());
-        }
-
-        /**
-         *    Dumps the current HTML source for debugging.
-         *    @access public
-         */
-        function showSource() {
-            $this->dump($this->_browser->getContent());
-        }
-
-        /**
-         *    Dumps the visible text only for debugging.
-         *    @access public
-         */
-        function showText() {
-            $this->dump(wordwrap($this->_browser->getContentAsText(), 80));
-        }
-
-        /**
-         *    Simulates the closing and reopening of the browser.
-         *    Temporary cookies will be discarded and timed
-         *    cookies will be expired if later than the
-         *    specified time.
-         *    @param string/integer $date Time when session restarted.
-         *                                If ommitted then all persistent
-         *                                cookies are kept. Time is either
-         *                                Cookie format string or timestamp.
-         *    @access public
-         */
-        function restart($date = false) {
-            if ($date === false) {
-                $date = time();
-            }
-            $this->_browser->restart($date);
-        }
-
-        /**
-         *    Moves cookie expiry times back into the past.
-         *    Useful for testing timeouts and expiries.
-         *    @param integer $interval    Amount to age in seconds.
-         *    @access public
-         */
-        function ageCookies($interval) {
-            $this->_browser->ageCookies($interval);
-        }
-
-        /**
-         *    Disables frames support. Frames will not be fetched
-         *    and the frameset page will be used instead.
-         *    @access public
-         */
-        function ignoreFrames() {
-            $this->_browser->ignoreFrames();
-        }
-
-        /**
-         *    Switches off cookie sending and recieving.
-         *    @access public
-         */
-        function ignoreCookies() {
-            $this->_browser->ignoreCookies();
-        }
-
-        /**
-         *    Skips errors for the next request only. You might
-         *    want to confirm that a page is unreachable for
-         *    example.
-         *    @access public
-         */
-        function ignoreErrors() {
-            $this->_ignore_errors = true;
-        }
-
-        /**
-         *    Issues a fail if there is a transport error anywhere
-         *    in the current frameset. Only one such error is
-         *    reported.
-         *    @param string/boolean $result   HTML or failure.
-         *    @return string/boolean $result  Passes through result.
-         *    @access private
-         */
-        function _failOnError($result) {
-            if (! $this->_ignore_errors) {
-                if ($error = $this->_browser->getTransportError()) {
-                    $this->fail($error);
-                }
-            }
-            $this->_ignore_errors = false;
-            return $result;
-        }
-
-        /**
-         *    Adds a header to every fetch.
-         *    @param string $header       Header line to add to every
-         *                                request until cleared.
-         *    @access public
-         */
-        function addHeader($header) {
-            $this->_browser->addHeader($header);
-        }
-
-        /**
-         *    Sets the maximum number of redirects before
-         *    the web page is loaded regardless.
-         *    @param integer $max        Maximum hops.
-         *    @access public
-         */
-        function setMaximumRedirects($max) {
-            if (! $this->_browser) {
-                trigger_error(
-                        'Can only set maximum redirects in a test method, setUp() or tearDown()');
-            }
-            $this->_browser->setMaximumRedirects($max);
-        }
-
-        /**
-         *    Sets the socket timeout for opening a connection and
-         *    receiving at least one byte of information.
-         *    @param integer $timeout      Maximum time in seconds.
-         *    @access public
-         */
-        function setConnectionTimeout($timeout) {
-            $this->_browser->setConnectionTimeout($timeout);
-        }
-
-        /**
-         *    Sets proxy to use on all requests for when
-         *    testing from behind a firewall. Set URL
-         *    to false to disable.
-         *    @param string $proxy        Proxy URL.
-         *    @param string $username     Proxy username for authentication.
-         *    @param string $password     Proxy password for authentication.
-         *    @access public
-         */
-        function useProxy($proxy, $username = false, $password = false) {
-            $this->_browser->useProxy($proxy, $username, $password);
-        }
-
-        /**
-         *    Fetches a page into the page buffer. If
-         *    there is no base for the URL then the
-         *    current base URL is used. After the fetch
-         *    the base URL reflects the new location.
-         *    @param string $url          URL to fetch.
-         *    @param hash $parameters     Optional additional GET data.
-         *    @return boolean/string      Raw page on success.
-         *    @access public
-         */
-        function get($url, $parameters = false) {
-            return $this->_failOnError($this->_browser->get($url, $parameters));
-        }
-
-        /**
-         *    Fetches a page by POST into the page buffer.
-         *    If there is no base for the URL then the
-         *    current base URL is used. After the fetch
-         *    the base URL reflects the new location.
-         *    @param string $url          URL to fetch.
-         *    @param hash $parameters     Optional additional GET data.
-         *    @return boolean/string      Raw page on success.
-         *    @access public
-         */
-        function post($url, $parameters = false) {
-            return $this->_failOnError($this->_browser->post($url, $parameters));
-        }
-
-        /**
-         *    Does a HTTP HEAD fetch, fetching only the page
-         *    headers. The current base URL is unchanged by this.
-         *    @param string $url          URL to fetch.
-         *    @param hash $parameters     Optional additional GET data.
-         *    @return boolean             True on success.
-         *    @access public
-         */
-        function head($url, $parameters = false) {
-            return $this->_failOnError($this->_browser->head($url, $parameters));
-        }
-
-        /**
-         *    Equivalent to hitting the retry button on the
-         *    browser. Will attempt to repeat the page fetch.
-         *    @return boolean     True if fetch succeeded.
-         *    @access public
-         */
-        function retry() {
-            return $this->_failOnError($this->_browser->retry());
-        }
-
-        /**
-         *    Equivalent to hitting the back button on the
-         *    browser.
-         *    @return boolean     True if history entry and
-         *                        fetch succeeded.
-         *    @access public
-         */
-        function back() {
-            return $this->_failOnError($this->_browser->back());
-        }
-
-        /**
-         *    Equivalent to hitting the forward button on the
-         *    browser.
-         *    @return boolean     True if history entry and
-         *                        fetch succeeded.
-         *    @access public
-         */
-        function forward() {
-            return $this->_failOnError($this->_browser->forward());
-        }
-
-        /**
-         *    Retries a request after setting the authentication
-         *    for the current realm.
-         *    @param string $username    Username for realm.
-         *    @param string $password    Password for realm.
-         *    @return boolean/string     HTML on successful fetch. Note
-         *                               that authentication may still have
-         *                               failed.
-         *    @access public
-         */
-        function authenticate($username, $password) {
-            return $this->_failOnError(
-                    $this->_browser->authenticate($username, $password));
-        }
-
-        /**
-         *    Gets the cookie value for the current browser context.
-         *    @param string $name          Name of cookie.
-         *    @return string               Value of cookie or false if unset.
-         *    @access public
-         */
-        function getCookie($name) {
-            return $this->_browser->getCurrentCookieValue($name);
-        }
-
-        /**
-         *    Sets a cookie in the current browser.
-         *    @param string $name          Name of cookie.
-         *    @param string $value         Cookie value.
-         *    @param string $host          Host upon which the cookie is valid.
-         *    @param string $path          Cookie path if not host wide.
-         *    @param string $expiry        Expiry date.
-         *    @access public
-         */
-        function setCookie($name, $value, $host = false, $path = "/", $expiry = false) {
-            $this->_browser->setCookie($name, $value, $host, $path, $expiry);
-        }
-
-        /**
-         *    Accessor for current frame focus. Will be
-         *    false if no frame has focus.
-         *    @return integer/string/boolean    Label if any, otherwise
-         *                                      the position in the frameset
-         *                                      or false if none.
-         *    @access public
-         */
-        function getFrameFocus() {
-            return $this->_browser->getFrameFocus();
-        }
-
-        /**
-         *    Sets the focus by index. The integer index starts from 1.
-         *    @param integer $choice    Chosen frame.
-         *    @return boolean           True if frame exists.
-         *    @access public
-         */
-        function setFrameFocusByIndex($choice) {
-            return $this->_browser->setFrameFocusByIndex($choice);
-        }
-
-        /**
-         *    Sets the focus by name.
-         *    @param string $name    Chosen frame.
-         *    @return boolean        True if frame exists.
-         *    @access public
-         */
-        function setFrameFocus($name) {
-            return $this->_browser->setFrameFocus($name);
-        }
-
-        /**
-         *    Clears the frame focus. All frames will be searched
-         *    for content.
-         *    @access public
-         */
-        function clearFrameFocus() {
-            return $this->_browser->clearFrameFocus();
-        }
-
-        /**
-         *    Clicks a visible text item. Will first try buttons,
-         *    then links and then images.
-         *    @param string $label        Visible text or alt text.
-         *    @return string/boolean      Raw page or false.
-         *    @access public
-         */
-        function click($label) {
-            return $this->_failOnError($this->_browser->click($label));
-        }
-
-        /**
-         *    Clicks the submit button by label. The owning
-         *    form will be submitted by this.
-         *    @param string $label    Button label. An unlabeled
-         *                            button can be triggered by 'Submit'.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success, else false.
-         *    @access public
-         */
-        function clickSubmit($label = 'Submit', $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickSubmit($label, $additional));
-        }
-
-        /**
-         *    Clicks the submit button by name attribute. The owning
-         *    form will be submitted by this.
-         *    @param string $name     Name attribute of button.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickSubmitByName($name, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickSubmitByName($name, $additional));
-        }
-
-        /**
-         *    Clicks the submit button by ID attribute. The owning
-         *    form will be submitted by this.
-         *    @param string $id       ID attribute of button.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickSubmitById($id, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickSubmitById($id, $additional));
-        }
-
-        /**
-         *    Clicks the submit image by some kind of label. Usually
-         *    the alt tag or the nearest equivalent. The owning
-         *    form will be submitted by this. Clicking outside of
-         *    the boundary of the coordinates will result in
-         *    a failure.
-         *    @param string $label    Alt attribute of button.
-         *    @param integer $x       X-coordinate of imaginary click.
-         *    @param integer $y       Y-coordinate of imaginary click.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickImage($label, $x = 1, $y = 1, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickImage($label, $x, $y, $additional));
-        }
-
-        /**
-         *    Clicks the submit image by the name. Usually
-         *    the alt tag or the nearest equivalent. The owning
-         *    form will be submitted by this. Clicking outside of
-         *    the boundary of the coordinates will result in
-         *    a failure.
-         *    @param string $name     Name attribute of button.
-         *    @param integer $x       X-coordinate of imaginary click.
-         *    @param integer $y       Y-coordinate of imaginary click.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickImageByName($name, $x, $y, $additional));
-        }
-
-        /**
-         *    Clicks the submit image by ID attribute. The owning
-         *    form will be submitted by this. Clicking outside of
-         *    the boundary of the coordinates will result in
-         *    a failure.
-         *    @param integer/string $id   ID attribute of button.
-         *    @param integer $x           X-coordinate of imaginary click.
-         *    @param integer $y           Y-coordinate of imaginary click.
-         *    @param hash $additional     Additional form values.
-         *    @return boolean/string      Page on success.
-         *    @access public
-         */
-        function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickImageById($id, $x, $y, $additional));
-        }
-
-        /**
-         *    Submits a form by the ID.
-         *    @param string $id       Form ID. No button information
-         *                            is submitted this way.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function submitFormById($id) {
-            return $this->_failOnError($this->_browser->submitFormById($id));
-        }
-
-        /**
-         *    Follows a link by name. Will click the first link
-         *    found with this link text by default, or a later
-         *    one if an index is given. Match is case insensitive
-         *    with normalised space.
-         *    @param string $label     Text between the anchor tags.
-         *    @param integer $index    Link position counting from zero.
-         *    @return boolean/string   Page on success.
-         *    @access public
-         */
-        function clickLink($label, $index = 0) {
-            return $this->_failOnError($this->_browser->clickLink($label, $index));
-        }
-
-        /**
-         *    Follows a link by id attribute.
-         *    @param string $id        ID attribute value.
-         *    @return boolean/string   Page on success.
-         *    @access public
-         */
-        function clickLinkById($id) {
-            return $this->_failOnError($this->_browser->clickLinkById($id));
-        }
-
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the same value only. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new EqualExpectation($first),
-                    $second,
-                    $message);
-        }
-
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    a different value. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertNotEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new NotEqualExpectation($first),
-                    $second,
-                    $message);
-        }
-
-        /**
-         *    Tests for the presence of a link label. Match is
-         *    case insensitive with normalised space.
-         *    @param string $label     Text between the anchor tags.
-         *    @param string $message   Message to display. Default
-         *                             can be embedded with %s.
-         *    @return boolean          True if link present.
-         *    @access public
-         */
-        function assertLink($label, $message = "%s") {
-            return $this->assertTrue(
-                    $this->_browser->isLink($label),
-                    sprintf($message, "Link [$label] should exist"));
-        }
-
-        /**
-         *    Tests for the non-presence of a link label. Match is
-         *    case insensitive with normalised space.
-         *    @param string/integer $label    Text between the anchor tags
-         *                                    or ID attribute.
-         *    @param string $message          Message to display. Default
-         *                                    can be embedded with %s.
-         *    @return boolean                 True if link missing.
-         *    @access public
-         */
-        function assertNoLink($label, $message = "%s") {
-            return $this->assertFalse(
-                    $this->_browser->isLink($label),
-                    sprintf($message, "Link [$label] should not exist"));
-        }
-
-        /**
-         *    Tests for the presence of a link id attribute.
-         *    @param string $id        Id attribute value.
-         *    @param string $message   Message to display. Default
-         *                             can be embedded with %s.
-         *    @return boolean          True if link present.
-         *    @access public
-         */
-        function assertLinkById($id, $message = "%s") {
-            return $this->assertTrue(
-                    $this->_browser->isLinkById($id),
-                    sprintf($message, "Link ID [$id] should exist"));
-        }
-
-        /**
-         *    Tests for the non-presence of a link label. Match is
-         *    case insensitive with normalised space.
-         *    @param string $id        Id attribute value.
-         *    @param string $message   Message to display. Default
-         *                             can be embedded with %s.
-         *    @return boolean          True if link missing.
-         *    @access public
-         */
-        function assertNoLinkById($id, $message = "%s") {
-            return $this->assertFalse(
-                    $this->_browser->isLinkById($id),
-                    sprintf($message, "Link ID [$id] should not exist"));
-        }
-
-        /**
-         *    Sets all form fields with that label, or name if there
-         *    is no label attached.
-         *    @param string $name    Name of field in forms.
-         *    @param string $value   New value of field.
-         *    @return boolean        True if field exists, otherwise false.
-         *    @access public
-         */
-        function setField($label, $value) {
-            return $this->_browser->setField($label, $value);
-        }
-
-        /**
-         *    Sets all form fields with that name.
-         *    @param string $name    Name of field in forms.
-         *    @param string $value   New value of field.
-         *    @return boolean        True if field exists, otherwise false.
-         *    @access public
-         */
-        function setFieldByName($name, $value) {
-            return $this->_browser->setFieldByName($name, $value);
-        }
-
-        /**
-         *    Sets all form fields with that name.
-         *    @param string/integer $id   Id of field in forms.
-         *    @param string $value        New value of field.
-         *    @return boolean             True if field exists, otherwise false.
-         *    @access public
-         */
-        function setFieldById($id, $value) {
-            return $this->_browser->setFieldById($id, $value);
-        }
-
-        /**
-         *    Confirms that the form element is currently set
-         *    to the expected value. A missing form will always
-         *    fail. If no value is given then only the existence
-         *    of the field is checked.
-         *    @param string $name       Name of field in forms.
-         *    @param mixed $expected    Expected string/array value or
-         *                              false for unset fields.
-         *    @param string $message    Message to display. Default
-         *                              can be embedded with %s.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertField($label, $expected = true, $message = '%s') {
-            $value = $this->_browser->getField($label);
-            return $this->_assertFieldValue($label, $value, $expected, $message);
-        }
-
-        /**
-         *    Confirms that the form element is currently set
-         *    to the expected value. A missing form element will always
-         *    fail. If no value is given then only the existence
-         *    of the field is checked.
-         *    @param string $name       Name of field in forms.
-         *    @param mixed $expected    Expected string/array value or
-         *                              false for unset fields.
-         *    @param string $message    Message to display. Default
-         *                              can be embedded with %s.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertFieldByName($name, $expected = true, $message = '%s') {
-            $value = $this->_browser->getFieldByName($name);
-            return $this->_assertFieldValue($name, $value, $expected, $message);
-        }
-
-        /**
-         *    Confirms that the form element is currently set
-         *    to the expected value. A missing form will always
-         *    fail. If no ID is given then only the existence
-         *    of the field is checked.
-         *    @param string/integer $id  Name of field in forms.
-         *    @param mixed $expected     Expected string/array value or
-         *                               false for unset fields.
-         *    @param string $message     Message to display. Default
-         *                               can be embedded with %s.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertFieldById($id, $expected = true, $message = '%s') {
-            $value = $this->_browser->getFieldById($id);
-            return $this->_assertFieldValue($id, $value, $expected, $message);
-        }
-
-        /**
-         *    Tests the field value against the expectation.
-         *    @param string $identifier      Name, ID or label.
-         *    @param mixed $value            Current field value.
-         *    @param mixed $expected         Expected value to match.
-         *    @param string $message         Failure message.
-         *    @return boolean                True if pass
-         *    @access protected
-         */
-        function _assertFieldValue($identifier, $value, $expected, $message) {
-            if ($expected === true) {
-                return $this->assertTrue(
-                        isset($value),
-                        sprintf($message, "Field [$identifier] should exist"));
-            }
-            if (! SimpleExpectation::isExpectation($expected)) {
-                $identifier = str_replace('%', '%%', $identifier);
-                $expected = new FieldExpectation(
-                        $expected,
-                        "Field [$identifier] should match with [%s]");
-            }
-            return $this->assert($expected, $value, $message);
-        }
-
-        /**
-         *    Checks the response code against a list
-         *    of possible values.
-         *    @param array $responses    Possible responses for a pass.
-         *    @param string $message     Message to display. Default
-         *                               can be embedded with %s.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertResponse($responses, $message = '%s') {
-            $responses = (is_array($responses) ? $responses : array($responses));
-            $code = $this->_browser->getResponseCode();
-            $message = sprintf($message, "Expecting response in [" .
-                    implode(", ", $responses) . "] got [$code]");
-            return $this->assertTrue(in_array($code, $responses), $message);
-        }
-
-        /**
-         *    Checks the mime type against a list
-         *    of possible values.
-         *    @param array $types      Possible mime types for a pass.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertMime($types, $message = '%s') {
-            $types = (is_array($types) ? $types : array($types));
-            $type = $this->_browser->getMimeType();
-            $message = sprintf($message, "Expecting mime type in [" .
-                    implode(", ", $types) . "] got [$type]");
-            return $this->assertTrue(in_array($type, $types), $message);
-        }
-
-        /**
-         *    Attempt to match the authentication type within
-         *    the security realm we are currently matching.
-         *    @param string $authentication   Usually basic.
-         *    @param string $message          Message to display.
-         *    @return boolean                 True if pass.
-         *    @access public
-         */
-        function assertAuthentication($authentication = false, $message = '%s') {
-            if (! $authentication) {
-                $message = sprintf($message, "Expected any authentication type, got [" .
-                        $this->_browser->getAuthentication() . "]");
-                return $this->assertTrue(
-                        $this->_browser->getAuthentication(),
-                        $message);
-            } else {
-                $message = sprintf($message, "Expected authentication [$authentication] got [" .
-                        $this->_browser->getAuthentication() . "]");
-                return $this->assertTrue(
-                        strtolower($this->_browser->getAuthentication()) == strtolower($authentication),
-                        $message);
-            }
-        }
-
-        /**
-         *    Checks that no authentication is necessary to view
-         *    the desired page.
-         *    @param string $message     Message to display.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertNoAuthentication($message = '%s') {
-            $message = sprintf($message, "Expected no authentication type, got [" .
-                    $this->_browser->getAuthentication() . "]");
-            return $this->assertFalse($this->_browser->getAuthentication(), $message);
-        }
-
-        /**
-         *    Attempts to match the current security realm.
-         *    @param string $realm     Name of security realm.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertRealm($realm, $message = '%s') {
-            if (! SimpleExpectation::isExpectation($realm)) {
-                $realm = new EqualExpectation($realm);
-            }
-            return $this->assert(
-                    $realm,
-                    $this->_browser->getRealm(),
-                    "Expected realm -> $message");
-        }
-
-        /**
-         *    Checks each header line for the required value. If no
-         *    value is given then only an existence check is made.
-         *    @param string $header    Case insensitive header name.
-         *    @param mixed $value      Case sensitive trimmed string to
-         *                             match against. An expectation object
-         *                             can be used for pattern matching.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertHeader($header, $value = false, $message = '%s') {
-            return $this->assert(
-                    new HttpHeaderExpectation($header, $value),
-                    $this->_browser->getHeaders(),
-                    $message);
-        }
-
-        /**
-         *    @deprecated
-         */
-        function assertHeaderPattern($header, $pattern, $message = '%s') {
-            return $this->assert(
-                    new HttpHeaderExpectation($header, new PatternExpectation($pattern)),
-                    $this->_browser->getHeaders(),
-                    $message);
-        }
-
-        /**
-         *    Confirms that the header type has not been received.
-         *    Only the landing page is checked. If you want to check
-         *    redirect pages, then you should limit redirects so
-         *    as to capture the page you want.
-         *    @param string $header    Case insensitive header name.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertNoHeader($header, $message = '%s') {
-            return $this->assert(
-                    new NoHttpHeaderExpectation($header),
-                    $this->_browser->getHeaders(),
-                    $message);
-        }
-
-        /**
-         *    @deprecated
-         */
-        function assertNoUnwantedHeader($header, $message = '%s') {
-            return $this->assertNoHeader($header, $message);
-        }
-
-        /**
-         *    Tests the text between the title tags.
-         *    @param string $title      Expected title.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertTitle($title = false, $message = '%s') {
-            if (! SimpleExpectation::isExpectation($title)) {
-                $title = new EqualExpectation($title);
-            }
-            return $this->assert($title, $this->_browser->getTitle(), $message);
-        }
-
-        /**
-         *    Will trigger a pass if the text is found in the plain
-         *    text form of the page.
-         *    @param string $text       Text to look for.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertText($text, $message = '%s') {
-            return $this->assert(
-                    new TextExpectation($text),
-                    $this->_browser->getContentAsText(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertWantedText($text, $message = '%s') {
-        	return $this->assertText($text, $message);
-        }
-
-        /**
-         *    Will trigger a pass if the text is not found in the plain
-         *    text form of the page.
-         *    @param string $text       Text to look for.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoText($text, $message = '%s') {
-            return $this->assert(
-                    new NoTextExpectation($text),
-                    $this->_browser->getContentAsText(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertNoUnwantedText($text, $message = '%s') {
-        	return $this->assertNoText($text, $message);
-        }
-
-        /**
-         *    Will trigger a pass if the Perl regex pattern
-         *    is found in the raw content.
-         *    @param string $pattern    Perl regex to look for including
-         *                              the regex delimiters.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertPattern($pattern, $message = '%s') {
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    $this->_browser->getContent(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertWantedPattern($pattern, $message = '%s') {
-        	return $this->assertPattern($pattern, $message);
-        }
-
-        /**
-         *    Will trigger a pass if the perl regex pattern
-         *    is not present in raw content.
-         *    @param string $pattern    Perl regex to look for including
-         *                              the regex delimiters.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoPattern($pattern, $message = '%s') {
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    $this->_browser->getContent(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertNoUnwantedPattern($pattern, $message = '%s') {
-        	return $this->assertNoPattern($pattern, $message);
-        }
-
-        /**
-         *    Checks that a cookie is set for the current page
-         *    and optionally checks the value.
-         *    @param string $name        Name of cookie to test.
-         *    @param string $expected    Expected value as a string or
-         *                               false if any value will do.
-         *    @param string $message     Message to display.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertCookie($name, $expected = false, $message = '%s') {
-            $value = $this->getCookie($name);
-            if (! $expected) {
-                return $this->assertTrue(
-                        $value,
-                        sprintf($message, "Expecting cookie [$name]"));
-            }
-            if (! SimpleExpectation::isExpectation($expected)) {
-                $expected = new EqualExpectation($expected);
-            }
-            return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
-        }
-
-        /**
-         *    Checks that no cookie is present or that it has
-         *    been successfully cleared.
-         *    @param string $name        Name of cookie to test.
-         *    @param string $message     Message to display.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertNoCookie($name, $message = '%s') {
-            return $this->assertTrue(
-                    $this->getCookie($name) === false,
-                    sprintf($message, "Not expecting cookie [$name]"));
-        }
-    }
\ No newline at end of file
+	 */
+	class WebTestCase extends SimpleTestCase {
+		protected $_browser;
+		protected $_ignore_errors = false;
+
+		/**
+		 *    Creates an empty test case. Should be subclassed
+		 *    with test methods for a functional test case.
+		 *    @param string $label     Name of test case. Will use
+		 *                             the class name if none specified.
+		 *    @access public
+		 */
+		function WebTestCase($label = false) {
+			$this->SimpleTestCase($label);
+		}
+
+		/**
+		 *    Announces the start of the test.
+		 *    @param string $method    Test method just started.
+		 *    @access public
+		 */
+		function before($method) {
+			parent::before($method);
+			$this->setBrowser($this->createBrowser());
+		}
+
+		/**
+		 *    Announces the end of the test. Includes private clean up.
+		 *    @param string $method    Test method just finished.
+		 *    @access public
+		 */
+		function after($method) {
+			$this->unsetBrowser();
+			parent::after($method);
+		}
+
+		/**
+		 *    Gets a current browser reference for setting
+		 *    special expectations or for detailed
+		 *    examination of page fetches.
+		 *    @return SimpleBrowser     Current test browser object.
+		 *    @access public
+		 */
+		function &getBrowser() {
+			return $this->_browser;
+		}
+
+		/**
+		 *    Gets a current browser reference for setting
+		 *    special expectations or for detailed
+		 *    examination of page fetches.
+		 *    @param SimpleBrowser $browser    New test browser object.
+		 *    @access public
+		 */
+		function setBrowser($browser) {
+			return $this->_browser = $browser;
+		}
+
+		/**
+		 *    Clears the current browser reference to help the
+		 *    PHP garbage collector.
+		 *    @access public
+		 */
+		function unsetBrowser() {
+			unset($this->_browser);
+		}
+
+		/**
+		 *    Creates a new default web browser object.
+		 *    Will be cleared at the end of the test method.
+		 *    @return TestBrowser           New browser.
+		 *    @access public
+		 */
+		function &createBrowser() {
+			$browser = new SimpleBrowser();
+			return $browser;
+		}
+
+		/**
+		 *    Gets the last response error.
+		 *    @return string    Last low level HTTP error.
+		 *    @access public
+		 */
+		function getTransportError() {
+			return $this->_browser->getTransportError();
+		}
+
+		/**
+		 *    Accessor for the currently selected URL.
+		 *    @return string        Current location or false if
+		 *                          no page yet fetched.
+		 *    @access public
+		 */
+		function getUrl() {
+			return $this->_browser->getUrl();
+		}
+
+		/**
+		 *    Dumps the current request for debugging.
+		 *    @access public
+		 */
+		function showRequest() {
+			$this->dump($this->_browser->getRequest());
+		}
+
+		/**
+		 *    Dumps the current HTTP headers for debugging.
+		 *    @access public
+		 */
+		function showHeaders() {
+			$this->dump($this->_browser->getHeaders());
+		}
+
+		/**
+		 *    Dumps the current HTML source for debugging.
+		 *    @access public
+		 */
+		function showSource() {
+			$this->dump($this->_browser->getContent());
+		}
+
+		/**
+		 *    Dumps the visible text only for debugging.
+		 *    @access public
+		 */
+		function showText() {
+			$this->dump(wordwrap($this->_browser->getContentAsText(), 80));
+		}
+
+		/**
+		 *    Simulates the closing and reopening of the browser.
+		 *    Temporary cookies will be discarded and timed
+		 *    cookies will be expired if later than the
+		 *    specified time.
+		 *    @param string/integer $date Time when session restarted.
+		 *                                If ommitted then all persistent
+		 *                                cookies are kept. Time is either
+		 *                                Cookie format string or timestamp.
+		 *    @access public
+		 */
+		function restart($date = false) {
+			if ($date === false) {
+				$date = time();
+			}
+			$this->_browser->restart($date);
+		}
+
+		/**
+		 *    Moves cookie expiry times back into the past.
+		 *    Useful for testing timeouts and expiries.
+		 *    @param integer $interval    Amount to age in seconds.
+		 *    @access public
+		 */
+		function ageCookies($interval) {
+			$this->_browser->ageCookies($interval);
+		}
+
+		/**
+		 *    Disables frames support. Frames will not be fetched
+		 *    and the frameset page will be used instead.
+		 *    @access public
+		 */
+		function ignoreFrames() {
+			$this->_browser->ignoreFrames();
+		}
+
+		/**
+		 *    Switches off cookie sending and recieving.
+		 *    @access public
+		 */
+		function ignoreCookies() {
+			$this->_browser->ignoreCookies();
+		}
+
+		/**
+		 *    Skips errors for the next request only. You might
+		 *    want to confirm that a page is unreachable for
+		 *    example.
+		 *    @access public
+		 */
+		function ignoreErrors() {
+			$this->_ignore_errors = true;
+		}
+
+		/**
+		 *    Issues a fail if there is a transport error anywhere
+		 *    in the current frameset. Only one such error is
+		 *    reported.
+		 *    @param string/boolean $result   HTML or failure.
+		 *    @return string/boolean $result  Passes through result.
+		 *    @access private
+		 */
+		function _failOnError($result) {
+			if (! $this->_ignore_errors) {
+				if ($error = $this->_browser->getTransportError()) {
+					$this->fail($error);
+				}
+			}
+			$this->_ignore_errors = false;
+			return $result;
+		}
+
+		/**
+		 *    Adds a header to every fetch.
+		 *    @param string $header       Header line to add to every
+		 *                                request until cleared.
+		 *    @access public
+		 */
+		function addHeader($header) {
+			$this->_browser->addHeader($header);
+		}
+
+		/**
+		 *    Sets the maximum number of redirects before
+		 *    the web page is loaded regardless.
+		 *    @param integer $max        Maximum hops.
+		 *    @access public
+		 */
+		function setMaximumRedirects($max) {
+			if (! $this->_browser) {
+				trigger_error(
+						'Can only set maximum redirects in a test method, setUp() or tearDown()');
+			}
+			$this->_browser->setMaximumRedirects($max);
+		}
+
+		/**
+		 *    Sets the socket timeout for opening a connection and
+		 *    receiving at least one byte of information.
+		 *    @param integer $timeout      Maximum time in seconds.
+		 *    @access public
+		 */
+		function setConnectionTimeout($timeout) {
+			$this->_browser->setConnectionTimeout($timeout);
+		}
+
+		/**
+		 *    Sets proxy to use on all requests for when
+		 *    testing from behind a firewall. Set URL
+		 *    to false to disable.
+		 *    @param string $proxy        Proxy URL.
+		 *    @param string $username     Proxy username for authentication.
+		 *    @param string $password     Proxy password for authentication.
+		 *    @access public
+		 */
+		function useProxy($proxy, $username = false, $password = false) {
+			$this->_browser->useProxy($proxy, $username, $password);
+		}
+
+		/**
+		 *    Fetches a page into the page buffer. If
+		 *    there is no base for the URL then the
+		 *    current base URL is used. After the fetch
+		 *    the base URL reflects the new location.
+		 *    @param string $url          URL to fetch.
+		 *    @param hash $parameters     Optional additional GET data.
+		 *    @return boolean/string      Raw page on success.
+		 *    @access public
+		 */
+		function get($url, $parameters = false) {
+			return $this->_failOnError($this->_browser->get($url, $parameters));
+		}
+
+		/**
+		 *    Fetches a page by POST into the page buffer.
+		 *    If there is no base for the URL then the
+		 *    current base URL is used. After the fetch
+		 *    the base URL reflects the new location.
+		 *    @param string $url          URL to fetch.
+		 *    @param hash $parameters     Optional additional GET data.
+		 *    @return boolean/string      Raw page on success.
+		 *    @access public
+		 */
+		function post($url, $parameters = false) {
+			return $this->_failOnError($this->_browser->post($url, $parameters));
+		}
+
+		/**
+		 *    Does a HTTP HEAD fetch, fetching only the page
+		 *    headers. The current base URL is unchanged by this.
+		 *    @param string $url          URL to fetch.
+		 *    @param hash $parameters     Optional additional GET data.
+		 *    @return boolean             True on success.
+		 *    @access public
+		 */
+		function head($url, $parameters = false) {
+			return $this->_failOnError($this->_browser->head($url, $parameters));
+		}
+
+		/**
+		 *    Equivalent to hitting the retry button on the
+		 *    browser. Will attempt to repeat the page fetch.
+		 *    @return boolean     True if fetch succeeded.
+		 *    @access public
+		 */
+		function retry() {
+			return $this->_failOnError($this->_browser->retry());
+		}
+
+		/**
+		 *    Equivalent to hitting the back button on the
+		 *    browser.
+		 *    @return boolean     True if history entry and
+		 *                        fetch succeeded.
+		 *    @access public
+		 */
+		function back() {
+			return $this->_failOnError($this->_browser->back());
+		}
+
+		/**
+		 *    Equivalent to hitting the forward button on the
+		 *    browser.
+		 *    @return boolean     True if history entry and
+		 *                        fetch succeeded.
+		 *    @access public
+		 */
+		function forward() {
+			return $this->_failOnError($this->_browser->forward());
+		}
+
+		/**
+		 *    Retries a request after setting the authentication
+		 *    for the current realm.
+		 *    @param string $username    Username for realm.
+		 *    @param string $password    Password for realm.
+		 *    @return boolean/string     HTML on successful fetch. Note
+		 *                               that authentication may still have
+		 *                               failed.
+		 *    @access public
+		 */
+		function authenticate($username, $password) {
+			return $this->_failOnError(
+					$this->_browser->authenticate($username, $password));
+		}
+
+		/**
+		 *    Gets the cookie value for the current browser context.
+		 *    @param string $name          Name of cookie.
+		 *    @return string               Value of cookie or false if unset.
+		 *    @access public
+		 */
+		function getCookie($name) {
+			return $this->_browser->getCurrentCookieValue($name);
+		}
+
+		/**
+		 *    Sets a cookie in the current browser.
+		 *    @param string $name          Name of cookie.
+		 *    @param string $value         Cookie value.
+		 *    @param string $host          Host upon which the cookie is valid.
+		 *    @param string $path          Cookie path if not host wide.
+		 *    @param string $expiry        Expiry date.
+		 *    @access public
+		 */
+		function setCookie($name, $value, $host = false, $path = "/", $expiry = false) {
+			$this->_browser->setCookie($name, $value, $host, $path, $expiry);
+		}
+
+		/**
+		 *    Accessor for current frame focus. Will be
+		 *    false if no frame has focus.
+		 *    @return integer/string/boolean    Label if any, otherwise
+		 *                                      the position in the frameset
+		 *                                      or false if none.
+		 *    @access public
+		 */
+		function getFrameFocus() {
+			return $this->_browser->getFrameFocus();
+		}
+
+		/**
+		 *    Sets the focus by index. The integer index starts from 1.
+		 *    @param integer $choice    Chosen frame.
+		 *    @return boolean           True if frame exists.
+		 *    @access public
+		 */
+		function setFrameFocusByIndex($choice) {
+			return $this->_browser->setFrameFocusByIndex($choice);
+		}
+
+		/**
+		 *    Sets the focus by name.
+		 *    @param string $name    Chosen frame.
+		 *    @return boolean        True if frame exists.
+		 *    @access public
+		 */
+		function setFrameFocus($name) {
+			return $this->_browser->setFrameFocus($name);
+		}
+
+		/**
+		 *    Clears the frame focus. All frames will be searched
+		 *    for content.
+		 *    @access public
+		 */
+		function clearFrameFocus() {
+			return $this->_browser->clearFrameFocus();
+		}
+
+		/**
+		 *    Clicks a visible text item. Will first try buttons,
+		 *    then links and then images.
+		 *    @param string $label        Visible text or alt text.
+		 *    @return string/boolean      Raw page or false.
+		 *    @access public
+		 */
+		function click($label) {
+			return $this->_failOnError($this->_browser->click($label));
+		}
+
+		/**
+		 *    Clicks the submit button by label. The owning
+		 *    form will be submitted by this.
+		 *    @param string $label    Button label. An unlabeled
+		 *                            button can be triggered by 'Submit'.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success, else false.
+		 *    @access public
+		 */
+		function clickSubmit($label = 'Submit', $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickSubmit($label, $additional));
+		}
+
+		/**
+		 *    Clicks the submit button by name attribute. The owning
+		 *    form will be submitted by this.
+		 *    @param string $name     Name attribute of button.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickSubmitByName($name, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickSubmitByName($name, $additional));
+		}
+
+		/**
+		 *    Clicks the submit button by ID attribute. The owning
+		 *    form will be submitted by this.
+		 *    @param string $id       ID attribute of button.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickSubmitById($id, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickSubmitById($id, $additional));
+		}
+
+		/**
+		 *    Clicks the submit image by some kind of label. Usually
+		 *    the alt tag or the nearest equivalent. The owning
+		 *    form will be submitted by this. Clicking outside of
+		 *    the boundary of the coordinates will result in
+		 *    a failure.
+		 *    @param string $label    Alt attribute of button.
+		 *    @param integer $x       X-coordinate of imaginary click.
+		 *    @param integer $y       Y-coordinate of imaginary click.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickImage($label, $x = 1, $y = 1, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickImage($label, $x, $y, $additional));
+		}
+
+		/**
+		 *    Clicks the submit image by the name. Usually
+		 *    the alt tag or the nearest equivalent. The owning
+		 *    form will be submitted by this. Clicking outside of
+		 *    the boundary of the coordinates will result in
+		 *    a failure.
+		 *    @param string $name     Name attribute of button.
+		 *    @param integer $x       X-coordinate of imaginary click.
+		 *    @param integer $y       Y-coordinate of imaginary click.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickImageByName($name, $x, $y, $additional));
+		}
+
+		/**
+		 *    Clicks the submit image by ID attribute. The owning
+		 *    form will be submitted by this. Clicking outside of
+		 *    the boundary of the coordinates will result in
+		 *    a failure.
+		 *    @param integer/string $id   ID attribute of button.
+		 *    @param integer $x           X-coordinate of imaginary click.
+		 *    @param integer $y           Y-coordinate of imaginary click.
+		 *    @param hash $additional     Additional form values.
+		 *    @return boolean/string      Page on success.
+		 *    @access public
+		 */
+		function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickImageById($id, $x, $y, $additional));
+		}
+
+		/**
+		 *    Submits a form by the ID.
+		 *    @param string $id       Form ID. No button information
+		 *                            is submitted this way.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function submitFormById($id) {
+			return $this->_failOnError($this->_browser->submitFormById($id));
+		}
+
+		/**
+		 *    Follows a link by name. Will click the first link
+		 *    found with this link text by default, or a later
+		 *    one if an index is given. Match is case insensitive
+		 *    with normalised space.
+		 *    @param string $label     Text between the anchor tags.
+		 *    @param integer $index    Link position counting from zero.
+		 *    @return boolean/string   Page on success.
+		 *    @access public
+		 */
+		function clickLink($label, $index = 0) {
+			return $this->_failOnError($this->_browser->clickLink($label, $index));
+		}
+
+		/**
+		 *    Follows a link by id attribute.
+		 *    @param string $id        ID attribute value.
+		 *    @return boolean/string   Page on success.
+		 *    @access public
+		 */
+		function clickLinkById($id) {
+			return $this->_failOnError($this->_browser->clickLinkById($id));
+		}
+
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the same value only. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new EqualExpectation($first),
+					$second,
+					$message);
+		}
+
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    a different value. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertNotEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new NotEqualExpectation($first),
+					$second,
+					$message);
+		}
+
+		/**
+		 *    Tests for the presence of a link label. Match is
+		 *    case insensitive with normalised space.
+		 *    @param string $label     Text between the anchor tags.
+		 *    @param string $message   Message to display. Default
+		 *                             can be embedded with %s.
+		 *    @return boolean          True if link present.
+		 *    @access public
+		 */
+		function assertLink($label, $message = "%s") {
+			return $this->assertTrue(
+					$this->_browser->isLink($label),
+					sprintf($message, "Link [$label] should exist"));
+		}
+
+		/**
+		 *    Tests for the non-presence of a link label. Match is
+		 *    case insensitive with normalised space.
+		 *    @param string/integer $label    Text between the anchor tags
+		 *                                    or ID attribute.
+		 *    @param string $message          Message to display. Default
+		 *                                    can be embedded with %s.
+		 *    @return boolean                 True if link missing.
+		 *    @access public
+		 */
+		function assertNoLink($label, $message = "%s") {
+			return $this->assertFalse(
+					$this->_browser->isLink($label),
+					sprintf($message, "Link [$label] should not exist"));
+		}
+
+		/**
+		 *    Tests for the presence of a link id attribute.
+		 *    @param string $id        Id attribute value.
+		 *    @param string $message   Message to display. Default
+		 *                             can be embedded with %s.
+		 *    @return boolean          True if link present.
+		 *    @access public
+		 */
+		function assertLinkById($id, $message = "%s") {
+			return $this->assertTrue(
+					$this->_browser->isLinkById($id),
+					sprintf($message, "Link ID [$id] should exist"));
+		}
+
+		/**
+		 *    Tests for the non-presence of a link label. Match is
+		 *    case insensitive with normalised space.
+		 *    @param string $id        Id attribute value.
+		 *    @param string $message   Message to display. Default
+		 *                             can be embedded with %s.
+		 *    @return boolean          True if link missing.
+		 *    @access public
+		 */
+		function assertNoLinkById($id, $message = "%s") {
+			return $this->assertFalse(
+					$this->_browser->isLinkById($id),
+					sprintf($message, "Link ID [$id] should not exist"));
+		}
+
+		/**
+		 *    Sets all form fields with that label, or name if there
+		 *    is no label attached.
+		 *    @param string $name    Name of field in forms.
+		 *    @param string $value   New value of field.
+		 *    @return boolean        True if field exists, otherwise false.
+		 *    @access public
+		 */
+		function setField($label, $value) {
+			return $this->_browser->setField($label, $value);
+		}
+
+		/**
+		 *    Sets all form fields with that name.
+		 *    @param string $name    Name of field in forms.
+		 *    @param string $value   New value of field.
+		 *    @return boolean        True if field exists, otherwise false.
+		 *    @access public
+		 */
+		function setFieldByName($name, $value) {
+			return $this->_browser->setFieldByName($name, $value);
+		}
+
+		/**
+		 *    Sets all form fields with that name.
+		 *    @param string/integer $id   Id of field in forms.
+		 *    @param string $value        New value of field.
+		 *    @return boolean             True if field exists, otherwise false.
+		 *    @access public
+		 */
+		function setFieldById($id, $value) {
+			return $this->_browser->setFieldById($id, $value);
+		}
+
+		/**
+		 *    Confirms that the form element is currently set
+		 *    to the expected value. A missing form will always
+		 *    fail. If no value is given then only the existence
+		 *    of the field is checked.
+		 *    @param string $name       Name of field in forms.
+		 *    @param mixed $expected    Expected string/array value or
+		 *                              false for unset fields.
+		 *    @param string $message    Message to display. Default
+		 *                              can be embedded with %s.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertField($label, $expected = true, $message = '%s') {
+			$value = $this->_browser->getField($label);
+			return $this->_assertFieldValue($label, $value, $expected, $message);
+		}
+
+		/**
+		 *    Confirms that the form element is currently set
+		 *    to the expected value. A missing form element will always
+		 *    fail. If no value is given then only the existence
+		 *    of the field is checked.
+		 *    @param string $name       Name of field in forms.
+		 *    @param mixed $expected    Expected string/array value or
+		 *                              false for unset fields.
+		 *    @param string $message    Message to display. Default
+		 *                              can be embedded with %s.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertFieldByName($name, $expected = true, $message = '%s') {
+			$value = $this->_browser->getFieldByName($name);
+			return $this->_assertFieldValue($name, $value, $expected, $message);
+		}
+
+		/**
+		 *    Confirms that the form element is currently set
+		 *    to the expected value. A missing form will always
+		 *    fail. If no ID is given then only the existence
+		 *    of the field is checked.
+		 *    @param string/integer $id  Name of field in forms.
+		 *    @param mixed $expected     Expected string/array value or
+		 *                               false for unset fields.
+		 *    @param string $message     Message to display. Default
+		 *                               can be embedded with %s.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertFieldById($id, $expected = true, $message = '%s') {
+			$value = $this->_browser->getFieldById($id);
+			return $this->_assertFieldValue($id, $value, $expected, $message);
+		}
+
+		/**
+		 *    Tests the field value against the expectation.
+		 *    @param string $identifier      Name, ID or label.
+		 *    @param mixed $value            Current field value.
+		 *    @param mixed $expected         Expected value to match.
+		 *    @param string $message         Failure message.
+		 *    @return boolean                True if pass
+		 *    @access protected
+		 */
+		function _assertFieldValue($identifier, $value, $expected, $message) {
+			if ($expected === true) {
+				return $this->assertTrue(
+						isset($value),
+						sprintf($message, "Field [$identifier] should exist"));
+			}
+			if (! SimpleExpectation::isExpectation($expected)) {
+				$identifier = str_replace('%', '%%', $identifier);
+				$expected = new FieldExpectation(
+						$expected,
+						"Field [$identifier] should match with [%s]");
+			}
+			return $this->assert($expected, $value, $message);
+		}
+
+		/**
+		 *    Checks the response code against a list
+		 *    of possible values.
+		 *    @param array $responses    Possible responses for a pass.
+		 *    @param string $message     Message to display. Default
+		 *                               can be embedded with %s.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertResponse($responses, $message = '%s') {
+			$responses = (is_array($responses) ? $responses : array($responses));
+			$code = $this->_browser->getResponseCode();
+			$message = sprintf($message, "Expecting response in [" .
+					implode(", ", $responses) . "] got [$code]");
+			return $this->assertTrue(in_array($code, $responses), $message);
+		}
+
+		/**
+		 *    Checks the mime type against a list
+		 *    of possible values.
+		 *    @param array $types      Possible mime types for a pass.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertMime($types, $message = '%s') {
+			$types = (is_array($types) ? $types : array($types));
+			$type = $this->_browser->getMimeType();
+			$message = sprintf($message, "Expecting mime type in [" .
+					implode(", ", $types) . "] got [$type]");
+			return $this->assertTrue(in_array($type, $types), $message);
+		}
+
+		/**
+		 *    Attempt to match the authentication type within
+		 *    the security realm we are currently matching.
+		 *    @param string $authentication   Usually basic.
+		 *    @param string $message          Message to display.
+		 *    @return boolean                 True if pass.
+		 *    @access public
+		 */
+		function assertAuthentication($authentication = false, $message = '%s') {
+			if (! $authentication) {
+				$message = sprintf($message, "Expected any authentication type, got [" .
+						$this->_browser->getAuthentication() . "]");
+				return $this->assertTrue(
+						$this->_browser->getAuthentication(),
+						$message);
+			} else {
+				$message = sprintf($message, "Expected authentication [$authentication] got [" .
+						$this->_browser->getAuthentication() . "]");
+				return $this->assertTrue(
+						strtolower($this->_browser->getAuthentication()) == strtolower($authentication),
+						$message);
+			}
+		}
+
+		/**
+		 *    Checks that no authentication is necessary to view
+		 *    the desired page.
+		 *    @param string $message     Message to display.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertNoAuthentication($message = '%s') {
+			$message = sprintf($message, "Expected no authentication type, got [" .
+					$this->_browser->getAuthentication() . "]");
+			return $this->assertFalse($this->_browser->getAuthentication(), $message);
+		}
+
+		/**
+		 *    Attempts to match the current security realm.
+		 *    @param string $realm     Name of security realm.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertRealm($realm, $message = '%s') {
+			if (! SimpleExpectation::isExpectation($realm)) {
+				$realm = new EqualExpectation($realm);
+			}
+			return $this->assert(
+					$realm,
+					$this->_browser->getRealm(),
+					"Expected realm -> $message");
+		}
+
+		/**
+		 *    Checks each header line for the required value. If no
+		 *    value is given then only an existence check is made.
+		 *    @param string $header    Case insensitive header name.
+		 *    @param mixed $value      Case sensitive trimmed string to
+		 *                             match against. An expectation object
+		 *                             can be used for pattern matching.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertHeader($header, $value = false, $message = '%s') {
+			return $this->assert(
+					new HttpHeaderExpectation($header, $value),
+					$this->_browser->getHeaders(),
+					$message);
+		}
+
+		/**
+		 *    @deprecated
+		 */
+		function assertHeaderPattern($header, $pattern, $message = '%s') {
+			return $this->assert(
+					new HttpHeaderExpectation($header, new PatternExpectation($pattern)),
+					$this->_browser->getHeaders(),
+					$message);
+		}
+
+		/**
+		 *    Confirms that the header type has not been received.
+		 *    Only the landing page is checked. If you want to check
+		 *    redirect pages, then you should limit redirects so
+		 *    as to capture the page you want.
+		 *    @param string $header    Case insensitive header name.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertNoHeader($header, $message = '%s') {
+			return $this->assert(
+					new NoHttpHeaderExpectation($header),
+					$this->_browser->getHeaders(),
+					$message);
+		}
+
+		/**
+		 *    @deprecated
+		 */
+		function assertNoUnwantedHeader($header, $message = '%s') {
+			return $this->assertNoHeader($header, $message);
+		}
+
+		/**
+		 *    Tests the text between the title tags.
+		 *    @param string $title      Expected title.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertTitle($title = false, $message = '%s') {
+			if (! SimpleExpectation::isExpectation($title)) {
+				$title = new EqualExpectation($title);
+			}
+			return $this->assert($title, $this->_browser->getTitle(), $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the text is found in the plain
+		 *    text form of the page.
+		 *    @param string $text       Text to look for.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertText($text, $message = '%s') {
+			return $this->assert(
+					new TextExpectation($text),
+					$this->_browser->getContentAsText(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertWantedText($text, $message = '%s') {
+			return $this->assertText($text, $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the text is not found in the plain
+		 *    text form of the page.
+		 *    @param string $text       Text to look for.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoText($text, $message = '%s') {
+			return $this->assert(
+					new NoTextExpectation($text),
+					$this->_browser->getContentAsText(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertNoUnwantedText($text, $message = '%s') {
+			return $this->assertNoText($text, $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the Perl regex pattern
+		 *    is found in the raw content.
+		 *    @param string $pattern    Perl regex to look for including
+		 *                              the regex delimiters.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertPattern($pattern, $message = '%s') {
+			return $this->assert(
+					new PatternExpectation($pattern),
+					$this->_browser->getContent(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertWantedPattern($pattern, $message = '%s') {
+			return $this->assertPattern($pattern, $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the perl regex pattern
+		 *    is not present in raw content.
+		 *    @param string $pattern    Perl regex to look for including
+		 *                              the regex delimiters.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoPattern($pattern, $message = '%s') {
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					$this->_browser->getContent(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertNoUnwantedPattern($pattern, $message = '%s') {
+			return $this->assertNoPattern($pattern, $message);
+		}
+
+		/**
+		 *    Checks that a cookie is set for the current page
+		 *    and optionally checks the value.
+		 *    @param string $name        Name of cookie to test.
+		 *    @param string $expected    Expected value as a string or
+		 *                               false if any value will do.
+		 *    @param string $message     Message to display.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertCookie($name, $expected = false, $message = '%s') {
+			$value = $this->getCookie($name);
+			if (! $expected) {
+				return $this->assertTrue(
+						$value,
+						sprintf($message, "Expecting cookie [$name]"));
+			}
+			if (! SimpleExpectation::isExpectation($expected)) {
+				$expected = new EqualExpectation($expected);
+			}
+			return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
+		}
+
+		/**
+		 *    Checks that no cookie is present or that it has
+		 *    been successfully cleared.
+		 *    @param string $name        Name of cookie to test.
+		 *    @param string $message     Message to display.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertNoCookie($name, $message = '%s') {
+			return $this->assertTrue(
+					$this->getCookie($name) === false,
+					sprintf($message, "Not expecting cookie [$name]"));
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/dumper.php

Indentation +378 added lines, -378 removed lines

@@ -1,401 +1,401 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: dumper.php 1532 2006-12-01 12:28:55Z xue $
-     */
-    /**
-     * does type matter
-     */
-    if (! defined('TYPE_MATTERS')) {
-        define('TYPE_MATTERS', true);
-    }
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: dumper.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+	/**
+	 * does type matter
+	 */
+	if (! defined('TYPE_MATTERS')) {
+		define('TYPE_MATTERS', true);
+	}
 
-    /**
-     *    Displays variables as text and does diffs.
+	/**
+	 *    Displays variables as text and does diffs.
 	 *	  @package	SimpleTest
 	 *	  @subpackage	UnitTester
-     */
-    class SimpleDumper {
+	 */
+	class SimpleDumper {
 
-        /**
-         *    Renders a variable in a shorter form than print_r().
-         *    @param mixed $value      Variable to render as a string.
-         *    @return string           Human readable string form.
-         *    @access public
-         */
-        function describeValue($value) {
-            $type = $this->getType($value);
-            switch($type) {
-                case "Null":
-                    return "NULL";
-                case "Boolean":
-                    return "Boolean: " . ($value ? "true" : "false");
-                case "Array":
-                    return "Array: " . count($value) . " items";
-                case "Object":
-                    return "Object: of " . get_class($value);
-                case "String":
-                    return "String: " . $this->clipString($value, 200);
-                default:
-                    return "$type: $value";
-            }
-            return "Unknown";
-        }
+		/**
+		 *    Renders a variable in a shorter form than print_r().
+		 *    @param mixed $value      Variable to render as a string.
+		 *    @return string           Human readable string form.
+		 *    @access public
+		 */
+		function describeValue($value) {
+			$type = $this->getType($value);
+			switch($type) {
+				case "Null":
+					return "NULL";
+				case "Boolean":
+					return "Boolean: " . ($value ? "true" : "false");
+				case "Array":
+					return "Array: " . count($value) . " items";
+				case "Object":
+					return "Object: of " . get_class($value);
+				case "String":
+					return "String: " . $this->clipString($value, 200);
+				default:
+					return "$type: $value";
+			}
+			return "Unknown";
+		}
 
-        /**
-         *    Gets the string representation of a type.
-         *    @param mixed $value    Variable to check against.
-         *    @return string         Type.
-         *    @access public
-         */
-        function getType($value) {
-            if (! isset($value)) {
-                return "Null";
-            } elseif (is_bool($value)) {
-                return "Boolean";
-            } elseif (is_string($value)) {
-                return "String";
-            } elseif (is_integer($value)) {
-                return "Integer";
-            } elseif (is_float($value)) {
-                return "Float";
-            } elseif (is_array($value)) {
-                return "Array";
-            } elseif (is_resource($value)) {
-                return "Resource";
-            } elseif (is_object($value)) {
-                return "Object";
-            }
-            return "Unknown";
-        }
+		/**
+		 *    Gets the string representation of a type.
+		 *    @param mixed $value    Variable to check against.
+		 *    @return string         Type.
+		 *    @access public
+		 */
+		function getType($value) {
+			if (! isset($value)) {
+				return "Null";
+			} elseif (is_bool($value)) {
+				return "Boolean";
+			} elseif (is_string($value)) {
+				return "String";
+			} elseif (is_integer($value)) {
+				return "Integer";
+			} elseif (is_float($value)) {
+				return "Float";
+			} elseif (is_array($value)) {
+				return "Array";
+			} elseif (is_resource($value)) {
+				return "Resource";
+			} elseif (is_object($value)) {
+				return "Object";
+			}
+			return "Unknown";
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two variables. Uses a
-         *    dynamic call.
-         *    @param mixed $first        First variable.
-         *    @param mixed $second       Value to compare with.
-         *    @param boolean $identical  If true then type anomolies count.
-         *    @return string             Description of difference.
-         *    @access public
-         */
-        function describeDifference($first, $second, $identical = false) {
-            if ($identical) {
-                if (! $this->_isTypeMatch($first, $second)) {
-                    return "with type mismatch as [" . $this->describeValue($first) .
-                        "] does not match [" . $this->describeValue($second) . "]";
-                }
-            }
-            $type = $this->getType($first);
-            if ($type == "Unknown") {
-                return "with unknown type";
-            }
-            $method = '_describe' . $type . 'Difference';
-            return $this->$method($first, $second, $identical);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two variables. Uses a
+		 *    dynamic call.
+		 *    @param mixed $first        First variable.
+		 *    @param mixed $second       Value to compare with.
+		 *    @param boolean $identical  If true then type anomolies count.
+		 *    @return string             Description of difference.
+		 *    @access public
+		 */
+		function describeDifference($first, $second, $identical = false) {
+			if ($identical) {
+				if (! $this->_isTypeMatch($first, $second)) {
+					return "with type mismatch as [" . $this->describeValue($first) .
+						"] does not match [" . $this->describeValue($second) . "]";
+				}
+			}
+			$type = $this->getType($first);
+			if ($type == "Unknown") {
+				return "with unknown type";
+			}
+			$method = '_describe' . $type . 'Difference';
+			return $this->$method($first, $second, $identical);
+		}
 
-        /**
-         *    Tests to see if types match.
-         *    @param mixed $first        First variable.
-         *    @param mixed $second       Value to compare with.
-         *    @return boolean            True if matches.
-         *    @access private
-         */
-        function _isTypeMatch($first, $second) {
-            return ($this->getType($first) == $this->getType($second));
-        }
+		/**
+		 *    Tests to see if types match.
+		 *    @param mixed $first        First variable.
+		 *    @param mixed $second       Value to compare with.
+		 *    @return boolean            True if matches.
+		 *    @access private
+		 */
+		function _isTypeMatch($first, $second) {
+			return ($this->getType($first) == $this->getType($second));
+		}
 
-        /**
-         *    Clips a string to a maximum length.
-         *    @param string $value         String to truncate.
-         *    @param integer $size         Minimum string size to show.
-         *    @param integer $position     Centre of string section.
-         *    @return string               Shortened version.
-         *    @access public
-         */
-        function clipString($value, $size, $position = 0) {
-            $length = strlen($value);
-            if ($length <= $size) {
-                return $value;
-            }
-            $position = min($position, $length);
-            $start = ($size/2 > $position ? 0 : $position - $size/2);
-            if ($start + $size > $length) {
-                $start = $length - $size;
-            }
-            $value = substr($value, $start, $size);
-            return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
-        }
+		/**
+		 *    Clips a string to a maximum length.
+		 *    @param string $value         String to truncate.
+		 *    @param integer $size         Minimum string size to show.
+		 *    @param integer $position     Centre of string section.
+		 *    @return string               Shortened version.
+		 *    @access public
+		 */
+		function clipString($value, $size, $position = 0) {
+			$length = strlen($value);
+			if ($length <= $size) {
+				return $value;
+			}
+			$position = min($position, $length);
+			$start = ($size/2 > $position ? 0 : $position - $size/2);
+			if ($start + $size > $length) {
+				$start = $length - $size;
+			}
+			$value = substr($value, $start, $size);
+			return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two variables. The minimal
-         *    version.
-         *    @param null $first          First value.
-         *    @param mixed $second        Value to compare with.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeGenericDifference($first, $second) {
-            return "as [" . $this->describeValue($first) .
-                    "] does not match [" .
-                    $this->describeValue($second) . "]";
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two variables. The minimal
+		 *    version.
+		 *    @param null $first          First value.
+		 *    @param mixed $second        Value to compare with.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeGenericDifference($first, $second) {
+			return "as [" . $this->describeValue($first) .
+					"] does not match [" .
+					$this->describeValue($second) . "]";
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a null and another variable.
-         *    @param null $first          First null.
-         *    @param mixed $second        Null to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeNullDifference($first, $second, $identical) {
-            return $this->_describeGenericDifference($first, $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a null and another variable.
+		 *    @param null $first          First null.
+		 *    @param mixed $second        Null to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeNullDifference($first, $second, $identical) {
+			return $this->_describeGenericDifference($first, $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a boolean and another variable.
-         *    @param boolean $first       First boolean.
-         *    @param mixed $second        Boolean to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeBooleanDifference($first, $second, $identical) {
-            return $this->_describeGenericDifference($first, $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a boolean and another variable.
+		 *    @param boolean $first       First boolean.
+		 *    @param mixed $second        Boolean to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeBooleanDifference($first, $second, $identical) {
+			return $this->_describeGenericDifference($first, $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a string and another variable.
-         *    @param string $first        First string.
-         *    @param mixed $second        String to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeStringDifference($first, $second, $identical) {
-            if (is_object($second) || is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            $position = $this->_stringDiffersAt($first, $second);
-            $message = "at character $position";
-            $message .= " with [" .
-                    $this->clipString($first, 200, $position) . "] and [" .
-                    $this->clipString($second, 200, $position) . "]";
-            return $message;
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a string and another variable.
+		 *    @param string $first        First string.
+		 *    @param mixed $second        String to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeStringDifference($first, $second, $identical) {
+			if (is_object($second) || is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			$position = $this->_stringDiffersAt($first, $second);
+			$message = "at character $position";
+			$message .= " with [" .
+					$this->clipString($first, 200, $position) . "] and [" .
+					$this->clipString($second, 200, $position) . "]";
+			return $message;
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between an integer and another variable.
-         *    @param integer $first       First number.
-         *    @param mixed $second        Number to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeIntegerDifference($first, $second, $identical) {
-            if (is_object($second) || is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            return "because [" . $this->describeValue($first) .
-                    "] differs from [" .
-                    $this->describeValue($second) . "] by " .
-                    abs($first - $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between an integer and another variable.
+		 *    @param integer $first       First number.
+		 *    @param mixed $second        Number to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeIntegerDifference($first, $second, $identical) {
+			if (is_object($second) || is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			return "because [" . $this->describeValue($first) .
+					"] differs from [" .
+					$this->describeValue($second) . "] by " .
+					abs($first - $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two floating point numbers.
-         *    @param float $first         First float.
-         *    @param mixed $second        Float to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeFloatDifference($first, $second, $identical) {
-            if (is_object($second) || is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            return "because [" . $this->describeValue($first) .
-                    "] differs from [" .
-                    $this->describeValue($second) . "] by " .
-                    abs($first - $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two floating point numbers.
+		 *    @param float $first         First float.
+		 *    @param mixed $second        Float to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeFloatDifference($first, $second, $identical) {
+			if (is_object($second) || is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			return "because [" . $this->describeValue($first) .
+					"] differs from [" .
+					$this->describeValue($second) . "] by " .
+					abs($first - $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two arrays.
-         *    @param array $first         First array.
-         *    @param mixed $second        Array to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeArrayDifference($first, $second, $identical) {
-            if (! is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            if (! $this->_isMatchingKeys($first, $second, $identical)) {
-                return "as key list [" .
-                        implode(", ", array_keys($first)) . "] does not match key list [" .
-                        implode(", ", array_keys($second)) . "]";
-            }
-            foreach (array_keys($first) as $key) {
-                if ($identical && ($first[$key] === $second[$key])) {
-                    continue;
-                }
-                if (! $identical && ($first[$key] == $second[$key])) {
-                    continue;
-                }
-                return "with member [$key] " . $this->describeDifference(
-                        $first[$key],
-                        $second[$key],
-                        $identical);
-            }
-            return "";
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two arrays.
+		 *    @param array $first         First array.
+		 *    @param mixed $second        Array to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeArrayDifference($first, $second, $identical) {
+			if (! is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			if (! $this->_isMatchingKeys($first, $second, $identical)) {
+				return "as key list [" .
+						implode(", ", array_keys($first)) . "] does not match key list [" .
+						implode(", ", array_keys($second)) . "]";
+			}
+			foreach (array_keys($first) as $key) {
+				if ($identical && ($first[$key] === $second[$key])) {
+					continue;
+				}
+				if (! $identical && ($first[$key] == $second[$key])) {
+					continue;
+				}
+				return "with member [$key] " . $this->describeDifference(
+						$first[$key],
+						$second[$key],
+						$identical);
+			}
+			return "";
+		}
 
-        /**
-         *    Compares two arrays to see if their key lists match.
-         *    For an identical match, the ordering and types of the keys
-         *    is significant.
-         *    @param array $first         First array.
-         *    @param array $second        Array to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return boolean             True if matching.
-         *    @access private
-         */
-        function _isMatchingKeys($first, $second, $identical) {
-            $first_keys = array_keys($first);
-            $second_keys = array_keys($second);
-            if ($identical) {
-                return ($first_keys === $second_keys);
-            }
-            sort($first_keys);
-            sort($second_keys);
-            return ($first_keys == $second_keys);
-        }
+		/**
+		 *    Compares two arrays to see if their key lists match.
+		 *    For an identical match, the ordering and types of the keys
+		 *    is significant.
+		 *    @param array $first         First array.
+		 *    @param array $second        Array to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return boolean             True if matching.
+		 *    @access private
+		 */
+		function _isMatchingKeys($first, $second, $identical) {
+			$first_keys = array_keys($first);
+			$second_keys = array_keys($second);
+			if ($identical) {
+				return ($first_keys === $second_keys);
+			}
+			sort($first_keys);
+			sort($second_keys);
+			return ($first_keys == $second_keys);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a resource and another variable.
-         *    @param resource $first       First resource.
-         *    @param mixed $second         Resource to compare with.
-         *    @param boolean $identical    If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeResourceDifference($first, $second, $identical) {
-            return $this->_describeGenericDifference($first, $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a resource and another variable.
+		 *    @param resource $first       First resource.
+		 *    @param mixed $second         Resource to compare with.
+		 *    @param boolean $identical    If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeResourceDifference($first, $second, $identical) {
+			return $this->_describeGenericDifference($first, $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two objects.
-         *    @param object $first        First object.
-         *    @param mixed $second        Object to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeObjectDifference($first, $second, $identical) {
-            if (! is_object($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            return $this->_describeArrayDifference(
-                    get_object_vars($first),
-                    get_object_vars($second),
-                    $identical);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two objects.
+		 *    @param object $first        First object.
+		 *    @param mixed $second        Object to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeObjectDifference($first, $second, $identical) {
+			if (! is_object($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			return $this->_describeArrayDifference(
+					get_object_vars($first),
+					get_object_vars($second),
+					$identical);
+		}
 
-        /**
-         *    Find the first character position that differs
-         *    in two strings by binary chop.
-         *    @param string $first        First string.
-         *    @param string $second       String to compare with.
-         *    @return integer             Position of first differing
-         *                                character.
-         *    @access private
-         */
-        function _stringDiffersAt($first, $second) {
-            if (! $first || ! $second) {
-                return 0;
-            }
-            if (strlen($first) < strlen($second)) {
-                list($first, $second) = array($second, $first);
-            }
-            $position = 0;
-            $step = strlen($first);
-            while ($step > 1) {
-                $step = (integer)(($step + 1) / 2);
-                if (strncmp($first, $second, $position + $step) == 0) {
-                    $position += $step;
-                }
-            }
-            return $position;
-        }
+		/**
+		 *    Find the first character position that differs
+		 *    in two strings by binary chop.
+		 *    @param string $first        First string.
+		 *    @param string $second       String to compare with.
+		 *    @return integer             Position of first differing
+		 *                                character.
+		 *    @access private
+		 */
+		function _stringDiffersAt($first, $second) {
+			if (! $first || ! $second) {
+				return 0;
+			}
+			if (strlen($first) < strlen($second)) {
+				list($first, $second) = array($second, $first);
+			}
+			$position = 0;
+			$step = strlen($first);
+			while ($step > 1) {
+				$step = (integer)(($step + 1) / 2);
+				if (strncmp($first, $second, $position + $step) == 0) {
+					$position += $step;
+				}
+			}
+			return $position;
+		}
 
-        /**
-         *    Sends a formatted dump of a variable to a string.
-         *    @param mixed $variable    Variable to display.
-         *    @return string            Output from print_r().
-         *    @access public
-         *    @static
-         */
-        static function dump($variable) {
-            ob_start();
-            print_r($variable);
-            $formatted = ob_get_contents();
-            ob_end_clean();
-            return $formatted;
-        }
+		/**
+		 *    Sends a formatted dump of a variable to a string.
+		 *    @param mixed $variable    Variable to display.
+		 *    @return string            Output from print_r().
+		 *    @access public
+		 *    @static
+		 */
+		static function dump($variable) {
+			ob_start();
+			print_r($variable);
+			$formatted = ob_get_contents();
+			ob_end_clean();
+			return $formatted;
+		}
 
-        /**
-         *    Extracts the last assertion that was not within
-         *    Simpletest itself. The name must start with "assert".
-         *    @param array $stack      List of stack frames.
-         *    @access public
-         *    @static
-         */
-        static function getFormattedAssertionLine($stack) {
-            foreach ($stack as $frame) {
-                if (isset($frame['file'])) {
-                    if (strpos($frame['file'], SIMPLE_TEST) !== false) {
-                        if (dirname($frame['file']) . '/' == SIMPLE_TEST) {
-                            continue;
-                        }
-                    }
-                }
-                if (SimpleDumper::_stackFrameIsAnAssertion($frame)) {
-                    return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
-                }
-            }
-            return '';
-        }
+		/**
+		 *    Extracts the last assertion that was not within
+		 *    Simpletest itself. The name must start with "assert".
+		 *    @param array $stack      List of stack frames.
+		 *    @access public
+		 *    @static
+		 */
+		static function getFormattedAssertionLine($stack) {
+			foreach ($stack as $frame) {
+				if (isset($frame['file'])) {
+					if (strpos($frame['file'], SIMPLE_TEST) !== false) {
+						if (dirname($frame['file']) . '/' == SIMPLE_TEST) {
+							continue;
+						}
+					}
+				}
+				if (SimpleDumper::_stackFrameIsAnAssertion($frame)) {
+					return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
+				}
+			}
+			return '';
+		}
 
-        /**
-         *    Tries to determine if the method call is an assertion.
-         *    @param array $frame     PHP stack frame.
-         *    @access private
-         *    @static
-         */
-        static function _stackFrameIsAnAssertion($frame) {
-            if (($frame['function'] == 'fail') || ($frame['function'] == 'pass')) {
-                return true;
-            }
-            if (strncmp($frame['function'], 'assert', 6) == 0) {
-                return true;
-            }
-            if (strncmp($frame['function'], 'expect', 6) == 0) {
-                return true;
-            }
-            return false;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Tries to determine if the method call is an assertion.
+		 *    @param array $frame     PHP stack frame.
+		 *    @access private
+		 *    @static
+		 */
+		static function _stackFrameIsAnAssertion($frame) {
+			if (($frame['function'] == 'fail') || ($frame['function'] == 'pass')) {
+				return true;
+			}
+			if (strncmp($frame['function'], 'assert', 6) == 0) {
+				return true;
+			}
+			if (strncmp($frame['function'], 'expect', 6) == 0) {
+				return true;
+			}
+			return false;
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/runner.php

Indentation +259 added lines, -259 removed lines

@@ -1,299 +1,299 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: runner.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: runner.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      * Includes SimpleTest files and defined the root constant
      * for dependent libraries.
      */
-    require_once(dirname(__FILE__) . '/errors.php');
-    require_once(dirname(__FILE__) . '/options.php');
-    require_once(dirname(__FILE__) . '/scorer.php');
-    require_once(dirname(__FILE__) . '/expectation.php');
-    require_once(dirname(__FILE__) . '/dumper.php');
-    if (! defined('SIMPLE_TEST')) {
-        define('SIMPLE_TEST', dirname(__FILE__) . '/');
-    }
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/errors.php');
+	require_once(dirname(__FILE__) . '/options.php');
+	require_once(dirname(__FILE__) . '/scorer.php');
+	require_once(dirname(__FILE__) . '/expectation.php');
+	require_once(dirname(__FILE__) . '/dumper.php');
+	if (! defined('SIMPLE_TEST')) {
+		define('SIMPLE_TEST', dirname(__FILE__) . '/');
+	}
+	/**#@-*/
 
-    /**
-     *    This is called by the class runner to run a
-     *    single test method. Will also run the setUp()
-     *    and tearDown() methods.
+	/**
+	 *    This is called by the class runner to run a
+	 *    single test method. Will also run the setUp()
+	 *    and tearDown() methods.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleInvoker {
-        protected $_test_case;
+	 */
+	class SimpleInvoker {
+		protected $_test_case;
 
-        /**
-         *    Stashes the test case for later.
-         *    @param SimpleTestCase $test_case  Test case to run.
-         */
-        function SimpleInvoker($test_case) {
-            $this->_test_case = $test_case;
-        }
+		/**
+		 *    Stashes the test case for later.
+		 *    @param SimpleTestCase $test_case  Test case to run.
+		 */
+		function SimpleInvoker($test_case) {
+			$this->_test_case = $test_case;
+		}
 
-        /**
-         *    Accessor for test case being run.
-         *    @return SimpleTestCase    Test case.
-         *    @access public
-         */
-        function getTestCase() {
-            return $this->_test_case;
-        }
+		/**
+		 *    Accessor for test case being run.
+		 *    @return SimpleTestCase    Test case.
+		 *    @access public
+		 */
+		function getTestCase() {
+			return $this->_test_case;
+		}
 
-        /**
-         *    Invokes a test method and buffered with setUp()
-         *    and tearDown() calls.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            $this->_test_case->setUp();
-            $this->_test_case->$method();
-            $this->_test_case->tearDown();
-        }
-    }
+		/**
+		 *    Invokes a test method and buffered with setUp()
+		 *    and tearDown() calls.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			$this->_test_case->setUp();
+			$this->_test_case->$method();
+			$this->_test_case->tearDown();
+		}
+	}
 
-    /**
-     *    Do nothing decorator. Just passes the invocation
-     *    straight through.
+	/**
+	 *    Do nothing decorator. Just passes the invocation
+	 *    straight through.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleInvokerDecorator {
-        protected $_invoker;
+	 */
+	class SimpleInvokerDecorator {
+		protected $_invoker;
 
-        /**
-         *    Stores the invoker to wrap.
-         *    @param SimpleInvoker $invoker  Test method runner.
-         */
-        function SimpleInvokerDecorator($invoker) {
-            $this->_invoker = $invoker;
-        }
+		/**
+		 *    Stores the invoker to wrap.
+		 *    @param SimpleInvoker $invoker  Test method runner.
+		 */
+		function SimpleInvokerDecorator($invoker) {
+			$this->_invoker = $invoker;
+		}
 
-        /**
-         *    Accessor for test case being run.
-         *    @return SimpleTestCase    Test case.
-         *    @access public
-         */
-        function getTestCase() {
-            return $this->_invoker->getTestCase();
-        }
+		/**
+		 *    Accessor for test case being run.
+		 *    @return SimpleTestCase    Test case.
+		 *    @access public
+		 */
+		function getTestCase() {
+			return $this->_invoker->getTestCase();
+		}
 
-        /**
-         *    Invokes a test method and buffered with setUp()
-         *    and tearDown() calls.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            $this->_invoker->invoke($method);
-        }
-    }
+		/**
+		 *    Invokes a test method and buffered with setUp()
+		 *    and tearDown() calls.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			$this->_invoker->invoke($method);
+		}
+	}
 
-    /**
-     *    Extension that traps errors into an error queue.
+	/**
+	 *    Extension that traps errors into an error queue.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
+	 */
+	class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
 
+		/**
         /**
-        /**
-         *    Stores the invoker to wrap.
-         *    @param SimpleInvoker $invoker  Test method runner.
-         */
-        function SimpleErrorTrappingInvoker($invoker) {
-            $this->SimpleInvokerDecorator($invoker);
-        }
+		 *    Stores the invoker to wrap.
+		 *    @param SimpleInvoker $invoker  Test method runner.
+		 */
+		function SimpleErrorTrappingInvoker($invoker) {
+			$this->SimpleInvokerDecorator($invoker);
+		}
 
-        /**
-         *    Invokes a test method and dispatches any
-         *    untrapped errors. Called back from
-         *    the visiting runner.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            set_error_handler('simpleTestErrorHandler');
-            parent::invoke($method);
-            $queue = SimpleErrorQueue::instance();
-            while (list($severity, $message, $file, $line, $globals) = $queue->extract()) {
-                $test_case = $this->getTestCase();
-                $test_case->error($severity, $message, $file, $line, $globals);
-            }
-            restore_error_handler();
-        }
-    }
+		/**
+		 *    Invokes a test method and dispatches any
+		 *    untrapped errors. Called back from
+		 *    the visiting runner.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			set_error_handler('simpleTestErrorHandler');
+			parent::invoke($method);
+			$queue = SimpleErrorQueue::instance();
+			while (list($severity, $message, $file, $line, $globals) = $queue->extract()) {
+				$test_case = $this->getTestCase();
+				$test_case->error($severity, $message, $file, $line, $globals);
+			}
+			restore_error_handler();
+		}
+	}
 
-    /**
-     *    The standard runner. Will run every method starting
-     *    with test Basically the
-     *    Mediator pattern.
+	/**
+	 *    The standard runner. Will run every method starting
+	 *    with test Basically the
+	 *    Mediator pattern.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleRunner {
-        protected $_test_case;
-        protected $_scorer;
+	 */
+	class SimpleRunner {
+		protected $_test_case;
+		protected $_scorer;
 
-        /**
-         *    Takes in the test case and reporter to mediate between.
-         *    @param SimpleTestCase $test_case  Test case to run.
-         *    @param SimpleScorer $scorer       Reporter to receive events.
-         */
-        function SimpleRunner($test_case, $scorer) {
-            $this->_test_case = $test_case;
-            $this->_scorer = $scorer;
-        }
+		/**
+		 *    Takes in the test case and reporter to mediate between.
+		 *    @param SimpleTestCase $test_case  Test case to run.
+		 *    @param SimpleScorer $scorer       Reporter to receive events.
+		 */
+		function SimpleRunner($test_case, $scorer) {
+			$this->_test_case = $test_case;
+			$this->_scorer = $scorer;
+		}
 
-        /**
-         *    Accessor for test case being run.
-         *    @return SimpleTestCase    Test case.
-         *    @access public
-         */
-        function getTestCase() {
-            return $this->_test_case;
-        }
+		/**
+		 *    Accessor for test case being run.
+		 *    @return SimpleTestCase    Test case.
+		 *    @access public
+		 */
+		function getTestCase() {
+			return $this->_test_case;
+		}
 
-        /**
-         *    Runs the test methods in the test case.
-         *    @param SimpleTest $test_case    Test case to run test on.
-         *    @param string $method           Name of test method.
-         *    @access public
-         */
-        function run() {
-            $methods = get_class_methods(get_class($this->_test_case));
-            $invoker = $this->_test_case->createInvoker();
-            foreach ($methods as $method) {
-                if (! $this->_isTest($method)) {
-                    continue;
-                }
-                if ($this->_isConstructor($method)) {
-                    continue;
-                }
-                $this->_scorer->paintMethodStart($method);
-                if ($this->_scorer->shouldInvoke($this->_test_case->getLabel(), $method)) {
-                    $invoker->invoke($method);
-                }
-                $this->_scorer->paintMethodEnd($method);
-            }
-        }
+		/**
+		 *    Runs the test methods in the test case.
+		 *    @param SimpleTest $test_case    Test case to run test on.
+		 *    @param string $method           Name of test method.
+		 *    @access public
+		 */
+		function run() {
+			$methods = get_class_methods(get_class($this->_test_case));
+			$invoker = $this->_test_case->createInvoker();
+			foreach ($methods as $method) {
+				if (! $this->_isTest($method)) {
+					continue;
+				}
+				if ($this->_isConstructor($method)) {
+					continue;
+				}
+				$this->_scorer->paintMethodStart($method);
+				if ($this->_scorer->shouldInvoke($this->_test_case->getLabel(), $method)) {
+					$invoker->invoke($method);
+				}
+				$this->_scorer->paintMethodEnd($method);
+			}
+		}
 
-        /**
-         *    Tests to see if the method is the constructor and
-         *    so should be ignored.
-         *    @param string $method        Method name to try.
-         *    @return boolean              True if constructor.
-         *    @access protected
-         */
-        function _isConstructor($method) {
-            return SimpleTestCompatibility::isA(
-                    $this->_test_case,
-                    strtolower($method));
-        }
+		/**
+		 *    Tests to see if the method is the constructor and
+		 *    so should be ignored.
+		 *    @param string $method        Method name to try.
+		 *    @return boolean              True if constructor.
+		 *    @access protected
+		 */
+		function _isConstructor($method) {
+			return SimpleTestCompatibility::isA(
+					$this->_test_case,
+					strtolower($method));
+		}
 
-        /**
-         *    Tests to see if the method is a test that should
-         *    be run. Currently any method that starts with 'test'
-         *    is a candidate.
-         *    @param string $method        Method name to try.
-         *    @return boolean              True if test method.
-         *    @access protected
-         */
-        function _isTest($method) {
-            return strtolower(substr($method, 0, 4)) == 'test';
-        }
+		/**
+		 *    Tests to see if the method is a test that should
+		 *    be run. Currently any method that starts with 'test'
+		 *    is a candidate.
+		 *    @param string $method        Method name to try.
+		 *    @return boolean              True if test method.
+		 *    @access protected
+		 */
+		function _isTest($method) {
+			return strtolower(substr($method, 0, 4)) == 'test';
+		}
 
-        /**
-         *    Paints the start of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodStart($test_name) {
-            $this->_scorer->paintMethodStart($test_name);
-        }
+		/**
+		 *    Paints the start of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodStart($test_name) {
+			$this->_scorer->paintMethodStart($test_name);
+		}
 
-        /**
-         *    Paints the end of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-            $this->_scorer->paintMethodEnd($test_name);
-        }
+		/**
+		 *    Paints the end of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+			$this->_scorer->paintMethodEnd($test_name);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintPass($message) {
-            $this->_scorer->paintPass($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintPass($message) {
+			$this->_scorer->paintPass($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintFail($message) {
-            $this->_scorer->paintFail($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			$this->_scorer->paintFail($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message    Text of error formatted by
-         *                              the test case.
-         *    @access public
-         */
-        function paintError($message) {
-            $this->_scorer->paintError($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message    Text of error formatted by
+		 *                              the test case.
+		 *    @access public
+		 */
+		function paintError($message) {
+			$this->_scorer->paintError($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param Exception $exception     Object thrown.
-         *    @access public
-         */
-        function paintException($exception) {
-            $this->_scorer->paintException($exception);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param Exception $exception     Object thrown.
+		 *    @access public
+		 */
+		function paintException($exception) {
+			$this->_scorer->paintException($exception);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintMessage($message) {
-            $this->_scorer->paintMessage($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintMessage($message) {
+			$this->_scorer->paintMessage($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            $this->_scorer->paintFormattedMessage($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			$this->_scorer->paintFormattedMessage($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $type        Event type as text.
-         *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
-         *                               type of signal should fail the
-         *                               test suite.
-         *    @access public
-         */
-        function paintSignal($type, $payload) {
-            $this->_scorer->paintSignal($type, $payload);
-        }
-    }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $type        Event type as text.
+		 *    @param mixed $payload      Message or object.
+		 *    @return boolean            Should return false if this
+		 *                               type of signal should fail the
+		 *                               test suite.
+		 *    @access public
+		 */
+		function paintSignal($type, $payload) {
+			$this->_scorer->paintSignal($type, $payload);
+		}
+	}

tests/test_tools/simpletest/http.php

Indentation +610 added lines, -610 removed lines

@@ -1,623 +1,623 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: http.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: http.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/socket.php');
-    require_once(dirname(__FILE__) . '/cookies.php');
-    require_once(dirname(__FILE__) . '/url.php');
-    /**#@-*/
-
-    /**
-     *    Creates HTTP headers for the end point of
-     *    a HTTP request.
+	require_once(dirname(__FILE__) . '/socket.php');
+	require_once(dirname(__FILE__) . '/cookies.php');
+	require_once(dirname(__FILE__) . '/url.php');
+	/**#@-*/
+
+	/**
+	 *    Creates HTTP headers for the end point of
+	 *    a HTTP request.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRoute {
-        protected $_url;
-
-        /**
-         *    Sets the target URL.
-         *    @param SimpleUrl $url   URL as object.
-         *    @access public
-         */
-        function SimpleRoute($url) {
-            $this->_url = $url;
-        }
-
-        /**
-         *    Resource name.
-         *    @return SimpleUrl        Current url.
-         *    @access protected
-         */
-        function getUrl() {
-            return $this->_url;
-        }
-
-        /**
-         *    Creates the first line which is the actual request.
-         *    @param string $method   HTTP request method, usually GET.
-         *    @return string          Request line content.
-         *    @access protected
-         */
-        function _getRequestLine($method) {
-            return $method . ' ' . $this->_url->getPath() .
-                    $this->_url->getEncodedRequest() . ' HTTP/1.0';
-        }
-
-        /**
-         *    Creates the host part of the request.
-         *    @return string          Host line content.
-         *    @access protected
-         */
-        function _getHostLine() {
-            $line = 'Host: ' . $this->_url->getHost();
-            if ($this->_url->getPort()) {
-                $line .= ':' . $this->_url->getPort();
-            }
-            return $line;
-        }
-
-        /**
-         *    Opens a socket to the route.
-         *    @param string $method      HTTP request method, usually GET.
-         *    @param integer $timeout    Connection timeout.
-         *    @return SimpleSocket       New socket.
-         *    @access public
-         */
-        function &createConnection($method, $timeout) {
-            $default_port = ('https' == $this->_url->getScheme()) ? 443 : 80;
-            $socket = $this->_createSocket(
-                    $this->_url->getScheme() ? $this->_url->getScheme() : 'http',
-                    $this->_url->getHost(),
-                    $this->_url->getPort() ? $this->_url->getPort() : $default_port,
-                    $timeout);
-            if (! $socket->isError()) {
-                $socket->write($this->_getRequestLine($method) . "\r\n");
-                $socket->write($this->_getHostLine() . "\r\n");
-                $socket->write("Connection: close\r\n");
-            }
-            return $socket;
-        }
-
-        /**
-         *    Factory for socket.
-         *    @param string $scheme                   Protocol to use.
-         *    @param string $host                     Hostname to connect to.
-         *    @param integer $port                    Remote port.
-         *    @param integer $timeout                 Connection timeout.
-         *    @return SimpleSocket/SimpleSecureSocket New socket.
-         *    @access protected
-         */
-        function &_createSocket($scheme, $host, $port, $timeout) {
-            if (in_array($scheme, array('https'))) {
-                $socket = new SimpleSecureSocket($host, $port, $timeout);
-            } else {
-                $socket = new SimpleSocket($host, $port, $timeout);
-            }
-            return $socket;
-        }
-    }
-
-    /**
-     *    Creates HTTP headers for the end point of
-     *    a HTTP request via a proxy server.
+	 */
+	class SimpleRoute {
+		protected $_url;
+
+		/**
+		 *    Sets the target URL.
+		 *    @param SimpleUrl $url   URL as object.
+		 *    @access public
+		 */
+		function SimpleRoute($url) {
+			$this->_url = $url;
+		}
+
+		/**
+		 *    Resource name.
+		 *    @return SimpleUrl        Current url.
+		 *    @access protected
+		 */
+		function getUrl() {
+			return $this->_url;
+		}
+
+		/**
+		 *    Creates the first line which is the actual request.
+		 *    @param string $method   HTTP request method, usually GET.
+		 *    @return string          Request line content.
+		 *    @access protected
+		 */
+		function _getRequestLine($method) {
+			return $method . ' ' . $this->_url->getPath() .
+					$this->_url->getEncodedRequest() . ' HTTP/1.0';
+		}
+
+		/**
+		 *    Creates the host part of the request.
+		 *    @return string          Host line content.
+		 *    @access protected
+		 */
+		function _getHostLine() {
+			$line = 'Host: ' . $this->_url->getHost();
+			if ($this->_url->getPort()) {
+				$line .= ':' . $this->_url->getPort();
+			}
+			return $line;
+		}
+
+		/**
+		 *    Opens a socket to the route.
+		 *    @param string $method      HTTP request method, usually GET.
+		 *    @param integer $timeout    Connection timeout.
+		 *    @return SimpleSocket       New socket.
+		 *    @access public
+		 */
+		function &createConnection($method, $timeout) {
+			$default_port = ('https' == $this->_url->getScheme()) ? 443 : 80;
+			$socket = $this->_createSocket(
+					$this->_url->getScheme() ? $this->_url->getScheme() : 'http',
+					$this->_url->getHost(),
+					$this->_url->getPort() ? $this->_url->getPort() : $default_port,
+					$timeout);
+			if (! $socket->isError()) {
+				$socket->write($this->_getRequestLine($method) . "\r\n");
+				$socket->write($this->_getHostLine() . "\r\n");
+				$socket->write("Connection: close\r\n");
+			}
+			return $socket;
+		}
+
+		/**
+		 *    Factory for socket.
+		 *    @param string $scheme                   Protocol to use.
+		 *    @param string $host                     Hostname to connect to.
+		 *    @param integer $port                    Remote port.
+		 *    @param integer $timeout                 Connection timeout.
+		 *    @return SimpleSocket/SimpleSecureSocket New socket.
+		 *    @access protected
+		 */
+		function &_createSocket($scheme, $host, $port, $timeout) {
+			if (in_array($scheme, array('https'))) {
+				$socket = new SimpleSecureSocket($host, $port, $timeout);
+			} else {
+				$socket = new SimpleSocket($host, $port, $timeout);
+			}
+			return $socket;
+		}
+	}
+
+	/**
+	 *    Creates HTTP headers for the end point of
+	 *    a HTTP request via a proxy server.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleProxyRoute extends SimpleRoute {
-        protected $_proxy;
-        protected $_username;
-        protected $_password;
-
-        /**
-         *    Stashes the proxy address.
-         *    @param SimpleUrl $url     URL as object.
-         *    @param string $proxy      Proxy URL.
-         *    @param string $username   Username for autentication.
-         *    @param string $password   Password for autentication.
-         *    @access public
-         */
-        function SimpleProxyRoute($url, $proxy, $username = false, $password = false) {
-            $this->SimpleRoute($url);
-            $this->_proxy = $proxy;
-            $this->_username = $username;
-            $this->_password = $password;
-        }
-
-        /**
-         *    Creates the first line which is the actual request.
-         *    @param string $method   HTTP request method, usually GET.
-         *    @param SimpleUrl $url   URL as object.
-         *    @return string          Request line content.
-         *    @access protected
-         */
-        function _getRequestLine($method) {
-            $url = $this->getUrl();
-            $scheme = $url->getScheme() ? $url->getScheme() : 'http';
-            $port = $url->getPort() ? ':' . $url->getPort() : '';
-            return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
-                    $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
-        }
-
-        /**
-         *    Creates the host part of the request.
-         *    @param SimpleUrl $url   URL as object.
-         *    @return string          Host line content.
-         *    @access protected
-         */
-        function _getHostLine() {
-            $host = 'Host: ' . $this->_proxy->getHost();
-            $port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
-            return "$host:$port";
-        }
-
-        /**
-         *    Opens a socket to the route.
-         *    @param string $method       HTTP request method, usually GET.
-         *    @param integer $timeout     Connection timeout.
-         *    @return SimpleSocket        New socket.
-         *    @access public
-         */
-        function &createConnection($method, $timeout) {
-            $socket = $this->_createSocket(
-                    $this->_proxy->getScheme() ? $this->_proxy->getScheme() : 'http',
-                    $this->_proxy->getHost(),
-                    $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080,
-                    $timeout);
-            if ($socket->isError()) {
-                return $socket;
-            }
-            $socket->write($this->_getRequestLine($method) . "\r\n");
-            $socket->write($this->_getHostLine() . "\r\n");
-            if ($this->_username && $this->_password) {
-                $socket->write('Proxy-Authorization: Basic ' .
-                        base64_encode($this->_username . ':' . $this->_password) .
-                        "\r\n");
-            }
-            $socket->write("Connection: close\r\n");
-            return $socket;
-        }
-    }
-
-    /**
-     *    HTTP request for a web page. Factory for
-     *    HttpResponse object.
+	 */
+	class SimpleProxyRoute extends SimpleRoute {
+		protected $_proxy;
+		protected $_username;
+		protected $_password;
+
+		/**
+		 *    Stashes the proxy address.
+		 *    @param SimpleUrl $url     URL as object.
+		 *    @param string $proxy      Proxy URL.
+		 *    @param string $username   Username for autentication.
+		 *    @param string $password   Password for autentication.
+		 *    @access public
+		 */
+		function SimpleProxyRoute($url, $proxy, $username = false, $password = false) {
+			$this->SimpleRoute($url);
+			$this->_proxy = $proxy;
+			$this->_username = $username;
+			$this->_password = $password;
+		}
+
+		/**
+		 *    Creates the first line which is the actual request.
+		 *    @param string $method   HTTP request method, usually GET.
+		 *    @param SimpleUrl $url   URL as object.
+		 *    @return string          Request line content.
+		 *    @access protected
+		 */
+		function _getRequestLine($method) {
+			$url = $this->getUrl();
+			$scheme = $url->getScheme() ? $url->getScheme() : 'http';
+			$port = $url->getPort() ? ':' . $url->getPort() : '';
+			return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
+					$url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
+		}
+
+		/**
+		 *    Creates the host part of the request.
+		 *    @param SimpleUrl $url   URL as object.
+		 *    @return string          Host line content.
+		 *    @access protected
+		 */
+		function _getHostLine() {
+			$host = 'Host: ' . $this->_proxy->getHost();
+			$port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
+			return "$host:$port";
+		}
+
+		/**
+		 *    Opens a socket to the route.
+		 *    @param string $method       HTTP request method, usually GET.
+		 *    @param integer $timeout     Connection timeout.
+		 *    @return SimpleSocket        New socket.
+		 *    @access public
+		 */
+		function &createConnection($method, $timeout) {
+			$socket = $this->_createSocket(
+					$this->_proxy->getScheme() ? $this->_proxy->getScheme() : 'http',
+					$this->_proxy->getHost(),
+					$this->_proxy->getPort() ? $this->_proxy->getPort() : 8080,
+					$timeout);
+			if ($socket->isError()) {
+				return $socket;
+			}
+			$socket->write($this->_getRequestLine($method) . "\r\n");
+			$socket->write($this->_getHostLine() . "\r\n");
+			if ($this->_username && $this->_password) {
+				$socket->write('Proxy-Authorization: Basic ' .
+						base64_encode($this->_username . ':' . $this->_password) .
+						"\r\n");
+			}
+			$socket->write("Connection: close\r\n");
+			return $socket;
+		}
+	}
+
+	/**
+	 *    HTTP request for a web page. Factory for
+	 *    HttpResponse object.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHttpRequest {
-        protected $_route;
-        protected $_encoding;
-        protected $_headers;
-        protected $_cookies;
-
-        /**
-         *    Builds the socket request from the different pieces.
-         *    These include proxy information, URL, cookies, headers,
-         *    request method and choice of encoding.
-         *    @param SimpleRoute $route              Request route.
-         *    @param SimpleFormEncoding $encoding    Content to send with
-         *                                           request.
-         *    @access public
-         */
-        function SimpleHttpRequest($route, $encoding) {
-            $this->_route = $route;
-            $this->_encoding = $encoding;
-            $this->_headers = array();
-            $this->_cookies = array();
-        }
-
-        /**
-         *    Dispatches the content to the route's socket.
-         *    @param integer $timeout      Connection timeout.
-         *    @return SimpleHttpResponse   A response which may only have
-         *                                 an error, but hopefully has a
-         *                                 complete web page.
-         *    @access public
-         */
-        function &fetch($timeout) {
-            $socket = $this->_route->createConnection($this->_encoding->getMethod(), $timeout);
-            if (! $socket->isError()) {
-                $this->_dispatchRequest($socket, $this->_encoding);
-            }
-            $response = $this->_createResponse($socket);
-            return $response;
-        }
-
-        /**
-         *    Sends the headers.
-         *    @param SimpleSocket $socket           Open socket.
-         *    @param string $method                 HTTP request method,
-         *                                          usually GET.
-         *    @param SimpleFormEncoding $encoding   Content to send with request.
-         *    @access private
-         */
-        function _dispatchRequest($socket, $encoding) {
-            foreach ($this->_headers as $header_line) {
-                $socket->write($header_line . "\r\n");
-            }
-            if (count($this->_cookies) > 0) {
-                $socket->write("Cookie: " . implode(";", $this->_cookies) . "\r\n");
-            }
-            $encoding->writeHeadersTo($socket);
-            $socket->write("\r\n");
-            $encoding->writeTo($socket);
-        }
-
-        /**
-         *    Adds a header line to the request.
-         *    @param string $header_line    Text of full header line.
-         *    @access public
-         */
-        function addHeaderLine($header_line) {
-            $this->_headers[] = $header_line;
-        }
-
-        /**
-         *    Reads all the relevant cookies from the
-         *    cookie jar.
-         *    @param SimpleCookieJar $jar     Jar to read
-         *    @param SimpleUrl $url           Url to use for scope.
-         *    @access public
-         */
-        function readCookiesFromJar($jar, $url) {
-            $this->_cookies = $jar->selectAsPairs($url);
-        }
-
-        /**
-         *    Wraps the socket in a response parser.
-         *    @param SimpleSocket $socket   Responding socket.
-         *    @return SimpleHttpResponse    Parsed response object.
-         *    @access protected
-         */
-        function &_createResponse($socket) {
-            $response = new SimpleHttpResponse(
-                    $socket,
-                    $this->_route->getUrl(),
-                    $this->_encoding);
-            return $response;
-        }
-    }
-
-    /**
-     *    Collection of header lines in the response.
+	 */
+	class SimpleHttpRequest {
+		protected $_route;
+		protected $_encoding;
+		protected $_headers;
+		protected $_cookies;
+
+		/**
+		 *    Builds the socket request from the different pieces.
+		 *    These include proxy information, URL, cookies, headers,
+		 *    request method and choice of encoding.
+		 *    @param SimpleRoute $route              Request route.
+		 *    @param SimpleFormEncoding $encoding    Content to send with
+		 *                                           request.
+		 *    @access public
+		 */
+		function SimpleHttpRequest($route, $encoding) {
+			$this->_route = $route;
+			$this->_encoding = $encoding;
+			$this->_headers = array();
+			$this->_cookies = array();
+		}
+
+		/**
+		 *    Dispatches the content to the route's socket.
+		 *    @param integer $timeout      Connection timeout.
+		 *    @return SimpleHttpResponse   A response which may only have
+		 *                                 an error, but hopefully has a
+		 *                                 complete web page.
+		 *    @access public
+		 */
+		function &fetch($timeout) {
+			$socket = $this->_route->createConnection($this->_encoding->getMethod(), $timeout);
+			if (! $socket->isError()) {
+				$this->_dispatchRequest($socket, $this->_encoding);
+			}
+			$response = $this->_createResponse($socket);
+			return $response;
+		}
+
+		/**
+		 *    Sends the headers.
+		 *    @param SimpleSocket $socket           Open socket.
+		 *    @param string $method                 HTTP request method,
+		 *                                          usually GET.
+		 *    @param SimpleFormEncoding $encoding   Content to send with request.
+		 *    @access private
+		 */
+		function _dispatchRequest($socket, $encoding) {
+			foreach ($this->_headers as $header_line) {
+				$socket->write($header_line . "\r\n");
+			}
+			if (count($this->_cookies) > 0) {
+				$socket->write("Cookie: " . implode(";", $this->_cookies) . "\r\n");
+			}
+			$encoding->writeHeadersTo($socket);
+			$socket->write("\r\n");
+			$encoding->writeTo($socket);
+		}
+
+		/**
+		 *    Adds a header line to the request.
+		 *    @param string $header_line    Text of full header line.
+		 *    @access public
+		 */
+		function addHeaderLine($header_line) {
+			$this->_headers[] = $header_line;
+		}
+
+		/**
+		 *    Reads all the relevant cookies from the
+		 *    cookie jar.
+		 *    @param SimpleCookieJar $jar     Jar to read
+		 *    @param SimpleUrl $url           Url to use for scope.
+		 *    @access public
+		 */
+		function readCookiesFromJar($jar, $url) {
+			$this->_cookies = $jar->selectAsPairs($url);
+		}
+
+		/**
+		 *    Wraps the socket in a response parser.
+		 *    @param SimpleSocket $socket   Responding socket.
+		 *    @return SimpleHttpResponse    Parsed response object.
+		 *    @access protected
+		 */
+		function &_createResponse($socket) {
+			$response = new SimpleHttpResponse(
+					$socket,
+					$this->_route->getUrl(),
+					$this->_encoding);
+			return $response;
+		}
+	}
+
+	/**
+	 *    Collection of header lines in the response.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHttpHeaders {
-        protected $_raw_headers;
-        protected $_response_code;
-        protected $_http_version;
-        protected $_mime_type;
-        protected $_location;
-        protected $_cookies;
-        protected $_authentication;
-        protected $_realm;
-
-        /**
-         *    Parses the incoming header block.
-         *    @param string $headers     Header block.
-         *    @access public
-         */
-        function SimpleHttpHeaders($headers) {
-            $this->_raw_headers = $headers;
-            $this->_response_code = false;
-            $this->_http_version = false;
-            $this->_mime_type = '';
-            $this->_location = false;
-            $this->_cookies = array();
-            $this->_authentication = false;
-            $this->_realm = false;
-            foreach (split("\r\n", $headers) as $header_line) {
-                $this->_parseHeaderLine($header_line);
-            }
-        }
-
-        /**
-         *    Accessor for parsed HTTP protocol version.
-         *    @return integer           HTTP error code.
-         *    @access public
-         */
-        function getHttpVersion() {
-            return $this->_http_version;
-        }
-
-        /**
-         *    Accessor for raw header block.
-         *    @return string        All headers as raw string.
-         *    @access public
-         */
-        function getRaw() {
-            return $this->_raw_headers;
-        }
-
-        /**
-         *    Accessor for parsed HTTP error code.
-         *    @return integer           HTTP error code.
-         *    @access public
-         */
-        function getResponseCode() {
-            return (integer)$this->_response_code;
-        }
-
-        /**
-         *    Returns the redirected URL or false if
-         *    no redirection.
-         *    @return string      URL or false for none.
-         *    @access public
-         */
-        function getLocation() {
-            return $this->_location;
-        }
-
-        /**
-         *    Test to see if the response is a valid redirect.
-         *    @return boolean       True if valid redirect.
-         *    @access public
-         */
-        function isRedirect() {
-            return in_array($this->_response_code, array(301, 302, 303, 307)) &&
-                    (boolean)$this->getLocation();
-        }
-
-        /**
-         *    Test to see if the response is an authentication
-         *    challenge.
-         *    @return boolean       True if challenge.
-         *    @access public
-         */
-        function isChallenge() {
-            return ($this->_response_code == 401) &&
-                    (boolean)$this->_authentication &&
-                    (boolean)$this->_realm;
-        }
-
-        /**
-         *    Accessor for MIME type header information.
-         *    @return string           MIME type.
-         *    @access public
-         */
-        function getMimeType() {
-            return $this->_mime_type;
-        }
-
-        /**
-         *    Accessor for authentication type.
-         *    @return string        Type.
-         *    @access public
-         */
-        function getAuthentication() {
-            return $this->_authentication;
-        }
-
-        /**
-         *    Accessor for security realm.
-         *    @return string        Realm.
-         *    @access public
-         */
-        function getRealm() {
-            return $this->_realm;
-        }
-
-        /**
-         *    Writes new cookies to the cookie jar.
-         *    @param SimpleCookieJar $jar   Jar to write to.
-         *    @param SimpleUrl $url         Host and path to write under.
-         *    @access public
-         */
-        function writeCookiesToJar($jar, $url) {
-            foreach ($this->_cookies as $cookie) {
-                $jar->setCookie(
-                        $cookie->getName(),
-                        $cookie->getValue(),
-                        $url->getHost(),
-                        $cookie->getPath(),
-                        $cookie->getExpiry());
-            }
-        }
-
-        /**
-         *    Called on each header line to accumulate the held
-         *    data within the class.
-         *    @param string $header_line        One line of header.
-         *    @access protected
-         */
-        function _parseHeaderLine($header_line) {
-            if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
-                $this->_http_version = $matches[1];
-                $this->_response_code = $matches[2];
-            }
-            if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
-                $this->_mime_type = trim($matches[1]);
-            }
-            if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
-                $this->_location = trim($matches[1]);
-            }
-            if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
-                $this->_cookies[] = $this->_parseCookie($matches[1]);
-            }
-            if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
-                $this->_authentication = $matches[1];
-                $this->_realm = trim($matches[2]);
-            }
-        }
-
-        /**
-         *    Parse the Set-cookie content.
-         *    @param string $cookie_line    Text after "Set-cookie:"
-         *    @return SimpleCookie          New cookie object.
-         *    @access private
-         */
-        function _parseCookie($cookie_line) {
-            $parts = split(";", $cookie_line);
-            $cookie = array();
-            preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
-            foreach ($parts as $part) {
-                if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
-                    $cookie[$matches[1]] = trim($matches[2]);
-                }
-            }
-            return new SimpleCookie(
-                    $cookie[1],
-                    trim($cookie[2]),
-                    isset($cookie["path"]) ? $cookie["path"] : "",
-                    isset($cookie["expires"]) ? $cookie["expires"] : false);
-        }
-    }
-
-    /**
-     *    Basic HTTP response.
+	 */
+	class SimpleHttpHeaders {
+		protected $_raw_headers;
+		protected $_response_code;
+		protected $_http_version;
+		protected $_mime_type;
+		protected $_location;
+		protected $_cookies;
+		protected $_authentication;
+		protected $_realm;
+
+		/**
+		 *    Parses the incoming header block.
+		 *    @param string $headers     Header block.
+		 *    @access public
+		 */
+		function SimpleHttpHeaders($headers) {
+			$this->_raw_headers = $headers;
+			$this->_response_code = false;
+			$this->_http_version = false;
+			$this->_mime_type = '';
+			$this->_location = false;
+			$this->_cookies = array();
+			$this->_authentication = false;
+			$this->_realm = false;
+			foreach (split("\r\n", $headers) as $header_line) {
+				$this->_parseHeaderLine($header_line);
+			}
+		}
+
+		/**
+		 *    Accessor for parsed HTTP protocol version.
+		 *    @return integer           HTTP error code.
+		 *    @access public
+		 */
+		function getHttpVersion() {
+			return $this->_http_version;
+		}
+
+		/**
+		 *    Accessor for raw header block.
+		 *    @return string        All headers as raw string.
+		 *    @access public
+		 */
+		function getRaw() {
+			return $this->_raw_headers;
+		}
+
+		/**
+		 *    Accessor for parsed HTTP error code.
+		 *    @return integer           HTTP error code.
+		 *    @access public
+		 */
+		function getResponseCode() {
+			return (integer)$this->_response_code;
+		}
+
+		/**
+		 *    Returns the redirected URL or false if
+		 *    no redirection.
+		 *    @return string      URL or false for none.
+		 *    @access public
+		 */
+		function getLocation() {
+			return $this->_location;
+		}
+
+		/**
+		 *    Test to see if the response is a valid redirect.
+		 *    @return boolean       True if valid redirect.
+		 *    @access public
+		 */
+		function isRedirect() {
+			return in_array($this->_response_code, array(301, 302, 303, 307)) &&
+					(boolean)$this->getLocation();
+		}
+
+		/**
+		 *    Test to see if the response is an authentication
+		 *    challenge.
+		 *    @return boolean       True if challenge.
+		 *    @access public
+		 */
+		function isChallenge() {
+			return ($this->_response_code == 401) &&
+					(boolean)$this->_authentication &&
+					(boolean)$this->_realm;
+		}
+
+		/**
+		 *    Accessor for MIME type header information.
+		 *    @return string           MIME type.
+		 *    @access public
+		 */
+		function getMimeType() {
+			return $this->_mime_type;
+		}
+
+		/**
+		 *    Accessor for authentication type.
+		 *    @return string        Type.
+		 *    @access public
+		 */
+		function getAuthentication() {
+			return $this->_authentication;
+		}
+
+		/**
+		 *    Accessor for security realm.
+		 *    @return string        Realm.
+		 *    @access public
+		 */
+		function getRealm() {
+			return $this->_realm;
+		}
+
+		/**
+		 *    Writes new cookies to the cookie jar.
+		 *    @param SimpleCookieJar $jar   Jar to write to.
+		 *    @param SimpleUrl $url         Host and path to write under.
+		 *    @access public
+		 */
+		function writeCookiesToJar($jar, $url) {
+			foreach ($this->_cookies as $cookie) {
+				$jar->setCookie(
+						$cookie->getName(),
+						$cookie->getValue(),
+						$url->getHost(),
+						$cookie->getPath(),
+						$cookie->getExpiry());
+			}
+		}
+
+		/**
+		 *    Called on each header line to accumulate the held
+		 *    data within the class.
+		 *    @param string $header_line        One line of header.
+		 *    @access protected
+		 */
+		function _parseHeaderLine($header_line) {
+			if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
+				$this->_http_version = $matches[1];
+				$this->_response_code = $matches[2];
+			}
+			if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
+				$this->_mime_type = trim($matches[1]);
+			}
+			if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
+				$this->_location = trim($matches[1]);
+			}
+			if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
+				$this->_cookies[] = $this->_parseCookie($matches[1]);
+			}
+			if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
+				$this->_authentication = $matches[1];
+				$this->_realm = trim($matches[2]);
+			}
+		}
+
+		/**
+		 *    Parse the Set-cookie content.
+		 *    @param string $cookie_line    Text after "Set-cookie:"
+		 *    @return SimpleCookie          New cookie object.
+		 *    @access private
+		 */
+		function _parseCookie($cookie_line) {
+			$parts = split(";", $cookie_line);
+			$cookie = array();
+			preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
+			foreach ($parts as $part) {
+				if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
+					$cookie[$matches[1]] = trim($matches[2]);
+				}
+			}
+			return new SimpleCookie(
+					$cookie[1],
+					trim($cookie[2]),
+					isset($cookie["path"]) ? $cookie["path"] : "",
+					isset($cookie["expires"]) ? $cookie["expires"] : false);
+		}
+	}
+
+	/**
+	 *    Basic HTTP response.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHttpResponse extends SimpleStickyError {
-        protected $_url;
-        protected $_encoding;
-        protected $_sent;
-        protected $_content;
-        protected $_headers;
-
-        /**
-         *    Constructor. Reads and parses the incoming
-         *    content and headers.
-         *    @param SimpleSocket $socket   Network connection to fetch
-         *                                  response text from.
-         *    @param SimpleUrl $url         Resource name.
-         *    @param mixed $encoding        Record of content sent.
-         *    @access public
-         */
-        function SimpleHttpResponse($socket, $url, $encoding) {
-            $this->SimpleStickyError();
-            $this->_url = $url;
-            $this->_encoding = $encoding;
-            $this->_sent = $socket->getSent();
-            $this->_content = false;
-            $raw = $this->_readAll($socket);
-            if ($socket->isError()) {
-                $this->_setError('Error reading socket [' . $socket->getError() . ']');
-                return;
-            }
-            $this->_parse($raw);
-        }
-
-        /**
-         *    Splits up the headers and the rest of the content.
-         *    @param string $raw    Content to parse.
-         *    @access private
-         */
-        function _parse($raw) {
-            if (! $raw) {
-                $this->_setError('Nothing fetched');
-                $this->_headers = new SimpleHttpHeaders('');
-            } elseif (! strstr($raw, "\r\n\r\n")) {
-                $this->_setError('Could not split headers from content');
-                $this->_headers = new SimpleHttpHeaders($raw);
-            } else {
-                list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
-                $this->_headers = new SimpleHttpHeaders($headers);
-            }
-        }
-
-        /**
-         *    Original request method.
-         *    @return string        GET, POST or HEAD.
-         *    @access public
-         */
-        function getMethod() {
-            return $this->_encoding->getMethod();
-        }
-
-        /**
-         *    Resource name.
-         *    @return SimpleUrl        Current url.
-         *    @access public
-         */
-        function getUrl() {
-            return $this->_url;
-        }
-
-        /**
-         *    Original request data.
-         *    @return mixed              Sent content.
-         *    @access public
-         */
-        function getRequestData() {
-            return $this->_encoding;
-        }
-
-        /**
-         *    Raw request that was sent down the wire.
-         *    @return string        Bytes actually sent.
-         *    @access public
-         */
-        function getSent() {
-            return $this->_sent;
-        }
-
-        /**
-         *    Accessor for the content after the last
-         *    header line.
-         *    @return string           All content.
-         *    @access public
-         */
-        function getContent() {
-            return $this->_content;
-        }
-
-        /**
-         *    Accessor for header block. The response is the
-         *    combination of this and the content.
-         *    @return SimpleHeaders        Wrapped header block.
-         *    @access public
-         */
-        function getHeaders() {
-            return $this->_headers;
-        }
-
-        /**
-         *    Accessor for any new cookies.
-         *    @return array       List of new cookies.
-         *    @access public
-         */
-        function getNewCookies() {
-            return $this->_headers->getNewCookies();
-        }
-
-        /**
-         *    Reads the whole of the socket output into a
-         *    single string.
-         *    @param SimpleSocket $socket  Unread socket.
-         *    @return string               Raw output if successful
-         *                                 else false.
-         *    @access private
-         */
-        function _readAll($socket) {
-            $all = '';
-            while (! $this->_isLastPacket($next = $socket->read())) {
-                $all .= $next;
-            }
-            return $all;
-        }
-
-        /**
-         *    Test to see if the packet from the socket is the
-         *    last one.
-         *    @param string $packet    Chunk to interpret.
-         *    @return boolean          True if empty or EOF.
-         *    @access private
-         */
-        function _isLastPacket($packet) {
-            if (is_string($packet)) {
-                return $packet === '';
-            }
-            return ! $packet;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleHttpResponse extends SimpleStickyError {
+		protected $_url;
+		protected $_encoding;
+		protected $_sent;
+		protected $_content;
+		protected $_headers;
+
+		/**
+		 *    Constructor. Reads and parses the incoming
+		 *    content and headers.
+		 *    @param SimpleSocket $socket   Network connection to fetch
+		 *                                  response text from.
+		 *    @param SimpleUrl $url         Resource name.
+		 *    @param mixed $encoding        Record of content sent.
+		 *    @access public
+		 */
+		function SimpleHttpResponse($socket, $url, $encoding) {
+			$this->SimpleStickyError();
+			$this->_url = $url;
+			$this->_encoding = $encoding;
+			$this->_sent = $socket->getSent();
+			$this->_content = false;
+			$raw = $this->_readAll($socket);
+			if ($socket->isError()) {
+				$this->_setError('Error reading socket [' . $socket->getError() . ']');
+				return;
+			}
+			$this->_parse($raw);
+		}
+
+		/**
+		 *    Splits up the headers and the rest of the content.
+		 *    @param string $raw    Content to parse.
+		 *    @access private
+		 */
+		function _parse($raw) {
+			if (! $raw) {
+				$this->_setError('Nothing fetched');
+				$this->_headers = new SimpleHttpHeaders('');
+			} elseif (! strstr($raw, "\r\n\r\n")) {
+				$this->_setError('Could not split headers from content');
+				$this->_headers = new SimpleHttpHeaders($raw);
+			} else {
+				list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
+				$this->_headers = new SimpleHttpHeaders($headers);
+			}
+		}
+
+		/**
+		 *    Original request method.
+		 *    @return string        GET, POST or HEAD.
+		 *    @access public
+		 */
+		function getMethod() {
+			return $this->_encoding->getMethod();
+		}
+
+		/**
+		 *    Resource name.
+		 *    @return SimpleUrl        Current url.
+		 *    @access public
+		 */
+		function getUrl() {
+			return $this->_url;
+		}
+
+		/**
+		 *    Original request data.
+		 *    @return mixed              Sent content.
+		 *    @access public
+		 */
+		function getRequestData() {
+			return $this->_encoding;
+		}
+
+		/**
+		 *    Raw request that was sent down the wire.
+		 *    @return string        Bytes actually sent.
+		 *    @access public
+		 */
+		function getSent() {
+			return $this->_sent;
+		}
+
+		/**
+		 *    Accessor for the content after the last
+		 *    header line.
+		 *    @return string           All content.
+		 *    @access public
+		 */
+		function getContent() {
+			return $this->_content;
+		}
+
+		/**
+		 *    Accessor for header block. The response is the
+		 *    combination of this and the content.
+		 *    @return SimpleHeaders        Wrapped header block.
+		 *    @access public
+		 */
+		function getHeaders() {
+			return $this->_headers;
+		}
+
+		/**
+		 *    Accessor for any new cookies.
+		 *    @return array       List of new cookies.
+		 *    @access public
+		 */
+		function getNewCookies() {
+			return $this->_headers->getNewCookies();
+		}
+
+		/**
+		 *    Reads the whole of the socket output into a
+		 *    single string.
+		 *    @param SimpleSocket $socket  Unread socket.
+		 *    @return string               Raw output if successful
+		 *                                 else false.
+		 *    @access private
+		 */
+		function _readAll($socket) {
+			$all = '';
+			while (! $this->_isLastPacket($next = $socket->read())) {
+				$all .= $next;
+			}
+			return $all;
+		}
+
+		/**
+		 *    Test to see if the packet from the socket is the
+		 *    last one.
+		 *    @param string $packet    Chunk to interpret.
+		 *    @return boolean          True if empty or EOF.
+		 *    @access private
+		 */
+		function _isLastPacket($packet) {
+			if (is_string($packet)) {
+				return $packet === '';
+			}
+			return ! $packet;
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/user_agent.php

Indentation +302 added lines, -302 removed lines

@@ -1,332 +1,332 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: user_agent.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: user_agent.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/cookies.php');
-    require_once(dirname(__FILE__) . '/http.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    require_once(dirname(__FILE__) . '/authentication.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/cookies.php');
+	require_once(dirname(__FILE__) . '/http.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	require_once(dirname(__FILE__) . '/authentication.php');
+	/**#@-*/
 
-    if (! defined('DEFAULT_MAX_REDIRECTS')) {
-        define('DEFAULT_MAX_REDIRECTS', 3);
-    }
+	if (! defined('DEFAULT_MAX_REDIRECTS')) {
+		define('DEFAULT_MAX_REDIRECTS', 3);
+	}
 
-    if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
-        define('DEFAULT_CONNECTION_TIMEOUT', 15);
-    }
+	if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
+		define('DEFAULT_CONNECTION_TIMEOUT', 15);
+	}
 
-    /**
-     *    Fetches web pages whilst keeping track of
-     *    cookies and authentication.
+	/**
+	 *    Fetches web pages whilst keeping track of
+	 *    cookies and authentication.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleUserAgent {
-        protected $_cookie_jar;
-        protected $_cookies_enabled = true;
-        protected $_authenticator;
-        protected $_max_redirects = DEFAULT_MAX_REDIRECTS;
-        protected $_proxy = false;
-        protected $_proxy_username = false;
-        protected $_proxy_password = false;
-        protected $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
-        protected $_additional_headers = array();
+	 */
+	class SimpleUserAgent {
+		protected $_cookie_jar;
+		protected $_cookies_enabled = true;
+		protected $_authenticator;
+		protected $_max_redirects = DEFAULT_MAX_REDIRECTS;
+		protected $_proxy = false;
+		protected $_proxy_username = false;
+		protected $_proxy_password = false;
+		protected $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
+		protected $_additional_headers = array();
 
-        /**
-         *    Starts with no cookies, realms or proxies.
-         *    @access public
-         */
-        function SimpleUserAgent() {
-            $this->_cookie_jar = new SimpleCookieJar();
-            $this->_authenticator = new SimpleAuthenticator();
-        }
+		/**
+		 *    Starts with no cookies, realms or proxies.
+		 *    @access public
+		 */
+		function SimpleUserAgent() {
+			$this->_cookie_jar = new SimpleCookieJar();
+			$this->_authenticator = new SimpleAuthenticator();
+		}
 
-        /**
-         *    Removes expired and temporary cookies as if
-         *    the browser was closed and re-opened. Authorisation
-         *    has to be obtained again as well.
-         *    @param string/integer $date   Time when session restarted.
-         *                                  If omitted then all persistent
-         *                                  cookies are kept.
-         *    @access public
-         */
-        function restart($date = false) {
-            $this->_cookie_jar->restartSession($date);
-            $this->_authenticator->restartSession();
-        }
+		/**
+		 *    Removes expired and temporary cookies as if
+		 *    the browser was closed and re-opened. Authorisation
+		 *    has to be obtained again as well.
+		 *    @param string/integer $date   Time when session restarted.
+		 *                                  If omitted then all persistent
+		 *                                  cookies are kept.
+		 *    @access public
+		 */
+		function restart($date = false) {
+			$this->_cookie_jar->restartSession($date);
+			$this->_authenticator->restartSession();
+		}
 
-        /**
-         *    Adds a header to every fetch.
-         *    @param string $header       Header line to add to every
-         *                                request until cleared.
-         *    @access public
-         */
-        function addHeader($header) {
-            $this->_additional_headers[] = $header;
-        }
+		/**
+		 *    Adds a header to every fetch.
+		 *    @param string $header       Header line to add to every
+		 *                                request until cleared.
+		 *    @access public
+		 */
+		function addHeader($header) {
+			$this->_additional_headers[] = $header;
+		}
 
-        /**
-         *    Ages the cookies by the specified time.
-         *    @param integer $interval    Amount in seconds.
-         *    @access public
-         */
-        function ageCookies($interval) {
-            $this->_cookie_jar->agePrematurely($interval);
-        }
+		/**
+		 *    Ages the cookies by the specified time.
+		 *    @param integer $interval    Amount in seconds.
+		 *    @access public
+		 */
+		function ageCookies($interval) {
+			$this->_cookie_jar->agePrematurely($interval);
+		}
 
-        /**
-         *    Sets an additional cookie. If a cookie has
-         *    the same name and path it is replaced.
-         *    @param string $name            Cookie key.
-         *    @param string $value           Value of cookie.
-         *    @param string $host            Host upon which the cookie is valid.
-         *    @param string $path            Cookie path if not host wide.
-         *    @param string $expiry          Expiry date.
-         *    @access public
-         */
-        function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-            $this->_cookie_jar->setCookie($name, $value, $host, $path, $expiry);
-        }
+		/**
+		 *    Sets an additional cookie. If a cookie has
+		 *    the same name and path it is replaced.
+		 *    @param string $name            Cookie key.
+		 *    @param string $value           Value of cookie.
+		 *    @param string $host            Host upon which the cookie is valid.
+		 *    @param string $path            Cookie path if not host wide.
+		 *    @param string $expiry          Expiry date.
+		 *    @access public
+		 */
+		function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+			$this->_cookie_jar->setCookie($name, $value, $host, $path, $expiry);
+		}
 
-        /**
-         *    Reads the most specific cookie value from the
-         *    browser cookies.
-         *    @param string $host        Host to search.
-         *    @param string $path        Applicable path.
-         *    @param string $name        Name of cookie to read.
-         *    @return string             False if not present, else the
-         *                               value as a string.
-         *    @access public
-         */
-        function getCookieValue($host, $path, $name) {
-            return $this->_cookie_jar->getCookieValue($host, $path, $name);
-        }
+		/**
+		 *    Reads the most specific cookie value from the
+		 *    browser cookies.
+		 *    @param string $host        Host to search.
+		 *    @param string $path        Applicable path.
+		 *    @param string $name        Name of cookie to read.
+		 *    @return string             False if not present, else the
+		 *                               value as a string.
+		 *    @access public
+		 */
+		function getCookieValue($host, $path, $name) {
+			return $this->_cookie_jar->getCookieValue($host, $path, $name);
+		}
 
-        /**
-         *    Reads the current cookies within the base URL.
-         *    @param string $name     Key of cookie to find.
-         *    @param SimpleUrl $base  Base URL to search from.
-         *    @return string/boolean  Null if there is no base URL, false
-         *                            if the cookie is not set.
-         *    @access public
-         */
-        function getBaseCookieValue($name, $base) {
-            if (! $base) {
-                return null;
-            }
-            return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
-        }
+		/**
+		 *    Reads the current cookies within the base URL.
+		 *    @param string $name     Key of cookie to find.
+		 *    @param SimpleUrl $base  Base URL to search from.
+		 *    @return string/boolean  Null if there is no base URL, false
+		 *                            if the cookie is not set.
+		 *    @access public
+		 */
+		function getBaseCookieValue($name, $base) {
+			if (! $base) {
+				return null;
+			}
+			return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
+		}
 
-        /**
-         *    Switches off cookie sending and recieving.
-         *    @access public
-         */
-        function ignoreCookies() {
-            $this->_cookies_enabled = false;
-        }
+		/**
+		 *    Switches off cookie sending and recieving.
+		 *    @access public
+		 */
+		function ignoreCookies() {
+			$this->_cookies_enabled = false;
+		}
 
-        /**
-         *    Switches back on the cookie sending and recieving.
-         *    @access public
-         */
-        function useCookies() {
-            $this->_cookies_enabled = true;
-        }
+		/**
+		 *    Switches back on the cookie sending and recieving.
+		 *    @access public
+		 */
+		function useCookies() {
+			$this->_cookies_enabled = true;
+		}
 
-        /**
-         *    Sets the socket timeout for opening a connection.
-         *    @param integer $timeout      Maximum time in seconds.
-         *    @access public
-         */
-        function setConnectionTimeout($timeout) {
-            $this->_connection_timeout = $timeout;
-        }
+		/**
+		 *    Sets the socket timeout for opening a connection.
+		 *    @param integer $timeout      Maximum time in seconds.
+		 *    @access public
+		 */
+		function setConnectionTimeout($timeout) {
+			$this->_connection_timeout = $timeout;
+		}
 
-        /**
-         *    Sets the maximum number of redirects before
-         *    a page will be loaded anyway.
-         *    @param integer $max        Most hops allowed.
-         *    @access public
-         */
-        function setMaximumRedirects($max) {
-            $this->_max_redirects = $max;
-        }
+		/**
+		 *    Sets the maximum number of redirects before
+		 *    a page will be loaded anyway.
+		 *    @param integer $max        Most hops allowed.
+		 *    @access public
+		 */
+		function setMaximumRedirects($max) {
+			$this->_max_redirects = $max;
+		}
 
-        /**
-         *    Sets proxy to use on all requests for when
-         *    testing from behind a firewall. Set URL
-         *    to false to disable.
-         *    @param string $proxy        Proxy URL.
-         *    @param string $username     Proxy username for authentication.
-         *    @param string $password     Proxy password for authentication.
-         *    @access public
-         */
-        function useProxy($proxy, $username, $password) {
-            if (! $proxy) {
-                $this->_proxy = false;
-                return;
-            }
-            if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
-                $proxy = 'http://'. $proxy;
-            }
-            $this->_proxy = new SimpleUrl($proxy);
-            $this->_proxy_username = $username;
-            $this->_proxy_password = $password;
-        }
+		/**
+		 *    Sets proxy to use on all requests for when
+		 *    testing from behind a firewall. Set URL
+		 *    to false to disable.
+		 *    @param string $proxy        Proxy URL.
+		 *    @param string $username     Proxy username for authentication.
+		 *    @param string $password     Proxy password for authentication.
+		 *    @access public
+		 */
+		function useProxy($proxy, $username, $password) {
+			if (! $proxy) {
+				$this->_proxy = false;
+				return;
+			}
+			if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
+				$proxy = 'http://'. $proxy;
+			}
+			$this->_proxy = new SimpleUrl($proxy);
+			$this->_proxy_username = $username;
+			$this->_proxy_password = $password;
+		}
 
-        /**
-         *    Test to see if the redirect limit is passed.
-         *    @param integer $redirects        Count so far.
-         *    @return boolean                  True if over.
-         *    @access private
-         */
-        function _isTooManyRedirects($redirects) {
-            return ($redirects > $this->_max_redirects);
-        }
+		/**
+		 *    Test to see if the redirect limit is passed.
+		 *    @param integer $redirects        Count so far.
+		 *    @return boolean                  True if over.
+		 *    @access private
+		 */
+		function _isTooManyRedirects($redirects) {
+			return ($redirects > $this->_max_redirects);
+		}
 
-        /**
-         *    Sets the identity for the current realm.
-         *    @param string $host        Host to which realm applies.
-         *    @param string $realm       Full name of realm.
-         *    @param string $username    Username for realm.
-         *    @param string $password    Password for realm.
-         *    @access public
-         */
-        function setIdentity($host, $realm, $username, $password) {
-            $this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
-        }
+		/**
+		 *    Sets the identity for the current realm.
+		 *    @param string $host        Host to which realm applies.
+		 *    @param string $realm       Full name of realm.
+		 *    @param string $username    Username for realm.
+		 *    @param string $password    Password for realm.
+		 *    @access public
+		 */
+		function setIdentity($host, $realm, $username, $password) {
+			$this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
+		}
 
-        /**
-         *    Fetches a URL as a response object. Will keep trying if redirected.
-         *    It will also collect authentication realm information.
-         *    @param string/SimpleUrl $url      Target to fetch.
-         *    @param SimpleEncoding $encoding   Additional parameters for request.
-         *    @return SimpleHttpResponse        Hopefully the target page.
-         *    @access public
-         */
-        function &fetchResponse($url, $encoding) {
-            if ($encoding->getMethod() != 'POST') {
-                $url->addRequestParameters($encoding);
-                $encoding->clear();
-            }
-            $response = $this->_fetchWhileRedirected($url, $encoding);
-            if ($headers = $response->getHeaders()) {
-                if ($headers->isChallenge()) {
-                    $this->_authenticator->addRealm(
-                            $url,
-                            $headers->getAuthentication(),
-                            $headers->getRealm());
-                }
-            }
-            return $response;
-        }
+		/**
+		 *    Fetches a URL as a response object. Will keep trying if redirected.
+		 *    It will also collect authentication realm information.
+		 *    @param string/SimpleUrl $url      Target to fetch.
+		 *    @param SimpleEncoding $encoding   Additional parameters for request.
+		 *    @return SimpleHttpResponse        Hopefully the target page.
+		 *    @access public
+		 */
+		function &fetchResponse($url, $encoding) {
+			if ($encoding->getMethod() != 'POST') {
+				$url->addRequestParameters($encoding);
+				$encoding->clear();
+			}
+			$response = $this->_fetchWhileRedirected($url, $encoding);
+			if ($headers = $response->getHeaders()) {
+				if ($headers->isChallenge()) {
+					$this->_authenticator->addRealm(
+							$url,
+							$headers->getAuthentication(),
+							$headers->getRealm());
+				}
+			}
+			return $response;
+		}
 
-        /**
-         *    Fetches the page until no longer redirected or
-         *    until the redirect limit runs out.
-         *    @param SimpleUrl $url                  Target to fetch.
-         *    @param SimpelFormEncoding $encoding    Additional parameters for request.
-         *    @return SimpleHttpResponse             Hopefully the target page.
-         *    @access private
-         */
-        function &_fetchWhileRedirected($url, $encoding) {
-            $redirects = 0;
-            do {
-                $response = $this->_fetch($url, $encoding);
-                if ($response->isError()) {
-                    return $response;
-                }
-                $headers = $response->getHeaders();
-                $location = new SimpleUrl($headers->getLocation());
-                $url = $location->makeAbsolute($url);
-                if ($this->_cookies_enabled) {
-                    $headers->writeCookiesToJar($this->_cookie_jar, $url);
-                }
-                if (! $headers->isRedirect()) {
-                    break;
-                }
-                $encoding = new SimpleGetEncoding();
-            } while (! $this->_isTooManyRedirects(++$redirects));
-            return $response;
-        }
+		/**
+		 *    Fetches the page until no longer redirected or
+		 *    until the redirect limit runs out.
+		 *    @param SimpleUrl $url                  Target to fetch.
+		 *    @param SimpelFormEncoding $encoding    Additional parameters for request.
+		 *    @return SimpleHttpResponse             Hopefully the target page.
+		 *    @access private
+		 */
+		function &_fetchWhileRedirected($url, $encoding) {
+			$redirects = 0;
+			do {
+				$response = $this->_fetch($url, $encoding);
+				if ($response->isError()) {
+					return $response;
+				}
+				$headers = $response->getHeaders();
+				$location = new SimpleUrl($headers->getLocation());
+				$url = $location->makeAbsolute($url);
+				if ($this->_cookies_enabled) {
+					$headers->writeCookiesToJar($this->_cookie_jar, $url);
+				}
+				if (! $headers->isRedirect()) {
+					break;
+				}
+				$encoding = new SimpleGetEncoding();
+			} while (! $this->_isTooManyRedirects(++$redirects));
+			return $response;
+		}
 
-        /**
-         *    Actually make the web request.
-         *    @param SimpleUrl $url                   Target to fetch.
-         *    @param SimpleFormEncoding $encoding     Additional parameters for request.
-         *    @return SimpleHttpResponse              Headers and hopefully content.
-         *    @access protected
-         */
-        function &_fetch($url, $encoding) {
-            $request = $this->_createRequest($url, $encoding);
-            $response = $request->fetch($this->_connection_timeout);
-            return $response;
-        }
+		/**
+		 *    Actually make the web request.
+		 *    @param SimpleUrl $url                   Target to fetch.
+		 *    @param SimpleFormEncoding $encoding     Additional parameters for request.
+		 *    @return SimpleHttpResponse              Headers and hopefully content.
+		 *    @access protected
+		 */
+		function &_fetch($url, $encoding) {
+			$request = $this->_createRequest($url, $encoding);
+			$response = $request->fetch($this->_connection_timeout);
+			return $response;
+		}
 
-        /**
-         *    Creates a full page request.
-         *    @param SimpleUrl $url                 Target to fetch as url object.
-         *    @param SimpleFormEncoding $encoding   POST/GET parameters.
-         *    @return SimpleHttpRequest             New request.
-         *    @access private
-         */
-        function &_createRequest($url, $encoding) {
-            $request = $this->_createHttpRequest($url, $encoding);
-            $this->_addAdditionalHeaders($request);
-            if ($this->_cookies_enabled) {
-                $request->readCookiesFromJar($this->_cookie_jar, $url);
-            }
-            $this->_authenticator->addHeaders($request, $url);
-            return $request;
-        }
+		/**
+		 *    Creates a full page request.
+		 *    @param SimpleUrl $url                 Target to fetch as url object.
+		 *    @param SimpleFormEncoding $encoding   POST/GET parameters.
+		 *    @return SimpleHttpRequest             New request.
+		 *    @access private
+		 */
+		function &_createRequest($url, $encoding) {
+			$request = $this->_createHttpRequest($url, $encoding);
+			$this->_addAdditionalHeaders($request);
+			if ($this->_cookies_enabled) {
+				$request->readCookiesFromJar($this->_cookie_jar, $url);
+			}
+			$this->_authenticator->addHeaders($request, $url);
+			return $request;
+		}
 
-        /**
-         *    Builds the appropriate HTTP request object.
-         *    @param SimpleUrl $url                  Target to fetch as url object.
-         *    @param SimpleFormEncoding $parameters  POST/GET parameters.
-         *    @return SimpleHttpRequest              New request object.
-         *    @access protected
-         */
-        function &_createHttpRequest($url, $encoding) {
-            $request = new SimpleHttpRequest($this->_createRoute($url), $encoding);
-            return $request;
-        }
+		/**
+		 *    Builds the appropriate HTTP request object.
+		 *    @param SimpleUrl $url                  Target to fetch as url object.
+		 *    @param SimpleFormEncoding $parameters  POST/GET parameters.
+		 *    @return SimpleHttpRequest              New request object.
+		 *    @access protected
+		 */
+		function &_createHttpRequest($url, $encoding) {
+			$request = new SimpleHttpRequest($this->_createRoute($url), $encoding);
+			return $request;
+		}
 
-        /**
-         *    Sets up either a direct route or via a proxy.
-         *    @param SimpleUrl $url   Target to fetch as url object.
-         *    @return SimpleRoute     Route to take to fetch URL.
-         *    @access protected
-         */
-        function &_createRoute($url) {
-            if ($this->_proxy) {
-                $route = new SimpleProxyRoute(
-                        $url,
-                        $this->_proxy,
-                        $this->_proxy_username,
-                        $this->_proxy_password);
-            } else {
-                $route = new SimpleRoute($url);
-            }
-            return $route;
-        }
+		/**
+		 *    Sets up either a direct route or via a proxy.
+		 *    @param SimpleUrl $url   Target to fetch as url object.
+		 *    @return SimpleRoute     Route to take to fetch URL.
+		 *    @access protected
+		 */
+		function &_createRoute($url) {
+			if ($this->_proxy) {
+				$route = new SimpleProxyRoute(
+						$url,
+						$this->_proxy,
+						$this->_proxy_username,
+						$this->_proxy_password);
+			} else {
+				$route = new SimpleRoute($url);
+			}
+			return $route;
+		}
 
-        /**
-         *    Adds additional manual headers.
-         *    @param SimpleHttpRequest $request    Outgoing request.
-         *    @access private
-         */
-        function _addAdditionalHeaders($request) {
-            foreach ($this->_additional_headers as $header) {
-                $request->addHeaderLine($header);
-            }
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Adds additional manual headers.
+		 *    @param SimpleHttpRequest $request    Outgoing request.
+		 *    @access private
+		 */
+		function _addAdditionalHeaders($request) {
+			foreach ($this->_additional_headers as $header) {
+				$request->addHeaderLine($header);
+			}
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/tag.php

Indentation +1345 added lines, -1345 removed lines

@@ -1,1391 +1,1391 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: tag.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: tag.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      * include SimpleTest files
      */
-    require_once(dirname(__FILE__) . '/parser.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/parser.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	/**#@-*/
 
-    /**
-     *    HTML or XML tag.
+	/**
+	 *    HTML or XML tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTag {
-        protected $_name;
-        protected $_attributes;
-        protected $_content;
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param string $name        Tag name.
-         *    @param hash $attributes    Attribute names and
-         *                               string values. Note that
-         *                               the keys must have been
-         *                               converted to lower case.
-         */
-        function SimpleTag($name, $attributes) {
-            $this->_name = strtolower(trim($name));
-            $this->_attributes = $attributes;
-            $this->_content = '';
-        }
-
-        /**
-         *    Check to see if the tag can have both start and
-         *    end tags with content in between.
-         *    @return boolean        True if content allowed.
-         *    @access public
-         */
-        function expectEndTag() {
-            return true;
-        }
-
-        /**
-         *    The current tag should not swallow all content for
-         *    itself as it's searchable page content. Private
-         *    content tags are usually widgets that contain default
-         *    values.
-         *    @return boolean        False as content is available
-         *                           to other tags by default.
-         *    @access public
-         */
-        function isPrivateContent() {
-            return false;
-        }
-
-        /**
-         *    Appends string content to the current content.
-         *    @param string $content        Additional text.
-         *    @access public
-         */
-        function addContent($content) {
-            $this->_content .= (string)$content;
-        }
-
-        /**
-         *    Adds an enclosed tag to the content.
-         *    @param SimpleTag $tag    New tag.
-         *    @access public
-         */
-        function addTag($tag) {
-        }
-
-        /**
-         *    Accessor for tag name.
-         *    @return string       Name of tag.
-         *    @access public
-         */
-        function getTagName() {
-            return $this->_name;
-        }
-
-        /**
-         *    List of legal child elements.
-         *    @return array        List of element names.
-         *    @access public
-         */
-        function getChildElements() {
-            return array();
-        }
-
-        /**
-         *    Accessor for an attribute.
-         *    @param string $label    Attribute name.
-         *    @return string          Attribute value.
-         *    @access public
-         */
-        function getAttribute($label) {
-            $label = strtolower($label);
-            if (! isset($this->_attributes[$label])) {
-                return false;
-            }
-            return (string)$this->_attributes[$label];
-        }
-
-        /**
-         *    Sets an attribute.
-         *    @param string $label    Attribute name.
-         *    @return string $value   New attribute value.
-         *    @access protected
-         */
-        function _setAttribute($label, $value) {
-            $this->_attributes[strtolower($label)] = $value;
-        }
-
-        /**
-         *    Accessor for the whole content so far.
-         *    @return string       Content as big raw string.
-         *    @access public
-         */
-        function getContent() {
-            return $this->_content;
-        }
-
-        /**
-         *    Accessor for content reduced to visible text. Acts
-         *    like a text mode browser, normalising space and
-         *    reducing images to their alt text.
-         *    @return string       Content as plain text.
-         *    @access public
-         */
-        function getText() {
-            return SimpleHtmlSaxParser::normalise($this->_content);
-        }
-
-        /**
-         *    Test to see if id attribute matches.
-         *    @param string $id        ID to test against.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isId($id) {
-            return ($this->getAttribute('id') == $id);
-        }
-    }
-
-    /**
-     *    Page title.
+	 */
+	class SimpleTag {
+		protected $_name;
+		protected $_attributes;
+		protected $_content;
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param string $name        Tag name.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values. Note that
+		 *                               the keys must have been
+		 *                               converted to lower case.
+		 */
+		function SimpleTag($name, $attributes) {
+			$this->_name = strtolower(trim($name));
+			$this->_attributes = $attributes;
+			$this->_content = '';
+		}
+
+		/**
+		 *    Check to see if the tag can have both start and
+		 *    end tags with content in between.
+		 *    @return boolean        True if content allowed.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return true;
+		}
+
+		/**
+		 *    The current tag should not swallow all content for
+		 *    itself as it's searchable page content. Private
+		 *    content tags are usually widgets that contain default
+		 *    values.
+		 *    @return boolean        False as content is available
+		 *                           to other tags by default.
+		 *    @access public
+		 */
+		function isPrivateContent() {
+			return false;
+		}
+
+		/**
+		 *    Appends string content to the current content.
+		 *    @param string $content        Additional text.
+		 *    @access public
+		 */
+		function addContent($content) {
+			$this->_content .= (string)$content;
+		}
+
+		/**
+		 *    Adds an enclosed tag to the content.
+		 *    @param SimpleTag $tag    New tag.
+		 *    @access public
+		 */
+		function addTag($tag) {
+		}
+
+		/**
+		 *    Accessor for tag name.
+		 *    @return string       Name of tag.
+		 *    @access public
+		 */
+		function getTagName() {
+			return $this->_name;
+		}
+
+		/**
+		 *    List of legal child elements.
+		 *    @return array        List of element names.
+		 *    @access public
+		 */
+		function getChildElements() {
+			return array();
+		}
+
+		/**
+		 *    Accessor for an attribute.
+		 *    @param string $label    Attribute name.
+		 *    @return string          Attribute value.
+		 *    @access public
+		 */
+		function getAttribute($label) {
+			$label = strtolower($label);
+			if (! isset($this->_attributes[$label])) {
+				return false;
+			}
+			return (string)$this->_attributes[$label];
+		}
+
+		/**
+		 *    Sets an attribute.
+		 *    @param string $label    Attribute name.
+		 *    @return string $value   New attribute value.
+		 *    @access protected
+		 */
+		function _setAttribute($label, $value) {
+			$this->_attributes[strtolower($label)] = $value;
+		}
+
+		/**
+		 *    Accessor for the whole content so far.
+		 *    @return string       Content as big raw string.
+		 *    @access public
+		 */
+		function getContent() {
+			return $this->_content;
+		}
+
+		/**
+		 *    Accessor for content reduced to visible text. Acts
+		 *    like a text mode browser, normalising space and
+		 *    reducing images to their alt text.
+		 *    @return string       Content as plain text.
+		 *    @access public
+		 */
+		function getText() {
+			return SimpleHtmlSaxParser::normalise($this->_content);
+		}
+
+		/**
+		 *    Test to see if id attribute matches.
+		 *    @param string $id        ID to test against.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isId($id) {
+			return ($this->getAttribute('id') == $id);
+		}
+	}
+
+	/**
+	 *    Page title.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTitleTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleTitleTag($attributes) {
-            $this->SimpleTag('title', $attributes);
-        }
-    }
-
-    /**
-     *    Link.
+	 */
+	class SimpleTitleTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleTitleTag($attributes) {
+			$this->SimpleTag('title', $attributes);
+		}
+	}
+
+	/**
+	 *    Link.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleAnchorTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleAnchorTag($attributes) {
-            $this->SimpleTag('a', $attributes);
-        }
-
-        /**
-         *    Accessor for URL as string.
-         *    @return string    Coerced as string.
-         *    @access public
-         */
-        function getHref() {
-            $url = $this->getAttribute('href');
-            if (is_bool($url)) {
-                $url = '';
-            }
-            return $url;
-        }
-    }
-
-    /**
-     *    Form element.
+	 */
+	class SimpleAnchorTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleAnchorTag($attributes) {
+			$this->SimpleTag('a', $attributes);
+		}
+
+		/**
+		 *    Accessor for URL as string.
+		 *    @return string    Coerced as string.
+		 *    @access public
+		 */
+		function getHref() {
+			$url = $this->getAttribute('href');
+			if (is_bool($url)) {
+				$url = '';
+			}
+			return $url;
+		}
+	}
+
+	/**
+	 *    Form element.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleWidget extends SimpleTag {
-        protected $_value;
-        protected $_label;
-        protected $_is_set;
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param string $name        Tag name.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleWidget($name, $attributes) {
-            $this->SimpleTag($name, $attributes);
-            $this->_value = false;
-            $this->_label = false;
-            $this->_is_set = false;
-        }
-
-        /**
-         *    Accessor for name submitted as the key in
-         *    GET/POST variables hash.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getName() {
-            return $this->getAttribute('name');
-        }
-
-        /**
-         *    Accessor for default value parsed with the tag.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            return $this->getAttribute('value');
-        }
-
-        /**
-         *    Accessor for currently set value or default if
-         *    none.
-         *    @return string      Value set by form or default
-         *                        if none.
-         *    @access public
-         */
-        function getValue() {
-            if (! $this->_is_set) {
-                return $this->getDefault();
-            }
-            return $this->_value;
-        }
-
-        /**
-         *    Sets the current form element value.
-         *    @param string $value       New value.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            $this->_value = $value;
-            $this->_is_set = true;
-            return true;
-        }
-
-        /**
-         *    Resets the form element value back to the
-         *    default.
-         *    @access public
-         */
-        function resetValue() {
-            $this->_is_set = false;
-        }
-
-        /**
-         *    Allows setting of a label externally, say by a
-         *    label tag.
-         *    @param string $label    Label to attach.
-         *    @access public
-         */
-        function setLabel($label) {
-            $this->_label = trim($label);
-        }
-
-        /**
-         *    Reads external or internal label.
-         *    @param string $label    Label to test.
-         *    @return boolean         True is match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return $this->_label == trim($label);
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @access public
-         */
-        function write($encoding) {
-            if ($this->getName()) {
-                $encoding->add($this->getName(), $this->getValue());
-            }
-        }
-    }
-
-    /**
-     *    Text, password and hidden field.
+	 */
+	class SimpleWidget extends SimpleTag {
+		protected $_value;
+		protected $_label;
+		protected $_is_set;
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param string $name        Tag name.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleWidget($name, $attributes) {
+			$this->SimpleTag($name, $attributes);
+			$this->_value = false;
+			$this->_label = false;
+			$this->_is_set = false;
+		}
+
+		/**
+		 *    Accessor for name submitted as the key in
+		 *    GET/POST variables hash.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getName() {
+			return $this->getAttribute('name');
+		}
+
+		/**
+		 *    Accessor for default value parsed with the tag.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			return $this->getAttribute('value');
+		}
+
+		/**
+		 *    Accessor for currently set value or default if
+		 *    none.
+		 *    @return string      Value set by form or default
+		 *                        if none.
+		 *    @access public
+		 */
+		function getValue() {
+			if (! $this->_is_set) {
+				return $this->getDefault();
+			}
+			return $this->_value;
+		}
+
+		/**
+		 *    Sets the current form element value.
+		 *    @param string $value       New value.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			$this->_value = $value;
+			$this->_is_set = true;
+			return true;
+		}
+
+		/**
+		 *    Resets the form element value back to the
+		 *    default.
+		 *    @access public
+		 */
+		function resetValue() {
+			$this->_is_set = false;
+		}
+
+		/**
+		 *    Allows setting of a label externally, say by a
+		 *    label tag.
+		 *    @param string $label    Label to attach.
+		 *    @access public
+		 */
+		function setLabel($label) {
+			$this->_label = trim($label);
+		}
+
+		/**
+		 *    Reads external or internal label.
+		 *    @param string $label    Label to test.
+		 *    @return boolean         True is match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return $this->_label == trim($label);
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @access public
+		 */
+		function write($encoding) {
+			if ($this->getName()) {
+				$encoding->add($this->getName(), $this->getValue());
+			}
+		}
+	}
+
+	/**
+	 *    Text, password and hidden field.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTextTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleTextTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', '');
-            }
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Sets the current form element value. Cannot
-         *    change the value of a hidden field.
-         *    @param string $value       New value.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if ($this->getAttribute('type') == 'hidden') {
-                return false;
-            }
-            return parent::setValue($value);
-        }
-    }
-
-    /**
-     *    Submit button as input tag.
+	 */
+	class SimpleTextTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleTextTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', '');
+			}
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Sets the current form element value. Cannot
+		 *    change the value of a hidden field.
+		 *    @param string $value       New value.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if ($this->getAttribute('type') == 'hidden') {
+				return false;
+			}
+			return parent::setValue($value);
+		}
+	}
+
+	/**
+	 *    Submit button as input tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleSubmitTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleSubmitTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', 'Submit');
-            }
-        }
-
-        /**
-         *    Tag contains no end element.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Disables the setting of the button value.
-         *    @param string $value       Ignored.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Value of browser visible text.
-         *    @return string        Visible label.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->getValue();
-        }
-
-        /**
-         *    Test for a label match when searching.
-         *    @param string $label     Label to test.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return trim($label) == trim($this->getLabel());
-        }
-    }
-
-    /**
-     *    Image button as input tag.
+	 */
+	class SimpleSubmitTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleSubmitTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', 'Submit');
+			}
+		}
+
+		/**
+		 *    Tag contains no end element.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Disables the setting of the button value.
+		 *    @param string $value       Ignored.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Value of browser visible text.
+		 *    @return string        Visible label.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->getValue();
+		}
+
+		/**
+		 *    Test for a label match when searching.
+		 *    @param string $label     Label to test.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return trim($label) == trim($this->getLabel());
+		}
+	}
+
+	/**
+	 *    Image button as input tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleImageSubmitTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleImageSubmitTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-        }
-
-        /**
-         *    Tag contains no end element.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Disables the setting of the button value.
-         *    @param string $value       Ignored.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Value of browser visible text.
-         *    @return string        Visible label.
-         *    @access public
-         */
-        function getLabel() {
-            if ($this->getAttribute('title')) {
-                return $this->getAttribute('title');
-            }
-            return $this->getAttribute('alt');
-        }
-
-        /**
-         *    Test for a label match when searching.
-         *    @param string $label     Label to test.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return trim($label) == trim($this->getLabel());
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @param integer $x                  X coordinate of click.
-         *    @param integer $y                  Y coordinate of click.
-         *    @access public
-         */
-        function write($encoding){//, $x, $y) {
-            if ($this->getName()) {
-                $encoding->add($this->getName() . '.x', $x);
-                $encoding->add($this->getName() . '.y', $y);
-            } else {
-                $encoding->add('x', $x);
-                $encoding->add('y', $y);
-            }
-        }
-    }
-
-    /**
-     *    Submit button as button tag.
+	 */
+	class SimpleImageSubmitTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleImageSubmitTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+		}
+
+		/**
+		 *    Tag contains no end element.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Disables the setting of the button value.
+		 *    @param string $value       Ignored.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Value of browser visible text.
+		 *    @return string        Visible label.
+		 *    @access public
+		 */
+		function getLabel() {
+			if ($this->getAttribute('title')) {
+				return $this->getAttribute('title');
+			}
+			return $this->getAttribute('alt');
+		}
+
+		/**
+		 *    Test for a label match when searching.
+		 *    @param string $label     Label to test.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return trim($label) == trim($this->getLabel());
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @param integer $x                  X coordinate of click.
+		 *    @param integer $y                  Y coordinate of click.
+		 *    @access public
+		 */
+		function write($encoding){//, $x, $y) {
+			if ($this->getName()) {
+				$encoding->add($this->getName() . '.x', $x);
+				$encoding->add($this->getName() . '.y', $y);
+			} else {
+				$encoding->add('x', $x);
+				$encoding->add('y', $y);
+			}
+		}
+	}
+
+	/**
+	 *    Submit button as button tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleButtonTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    Defaults are very browser dependent.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleButtonTag($attributes) {
-            $this->SimpleWidget('button', $attributes);
-        }
-
-        /**
-         *    Check to see if the tag can have both start and
-         *    end tags with content in between.
-         *    @return boolean        True if content allowed.
-         *    @access public
-         */
-        function expectEndTag() {
-            return true;
-        }
-
-        /**
-         *    Disables the setting of the button value.
-         *    @param string $value       Ignored.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Value of browser visible text.
-         *    @return string        Visible label.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->getContent();
-        }
-
-        /**
-         *    Test for a label match when searching.
-         *    @param string $label     Label to test.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return trim($label) == trim($this->getLabel());
-        }
-    }
-
-    /**
-     *    Content tag for text area.
+	 */
+	class SimpleButtonTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    Defaults are very browser dependent.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleButtonTag($attributes) {
+			$this->SimpleWidget('button', $attributes);
+		}
+
+		/**
+		 *    Check to see if the tag can have both start and
+		 *    end tags with content in between.
+		 *    @return boolean        True if content allowed.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return true;
+		}
+
+		/**
+		 *    Disables the setting of the button value.
+		 *    @param string $value       Ignored.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Value of browser visible text.
+		 *    @return string        Visible label.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->getContent();
+		}
+
+		/**
+		 *    Test for a label match when searching.
+		 *    @param string $label     Label to test.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return trim($label) == trim($this->getLabel());
+		}
+	}
+
+	/**
+	 *    Content tag for text area.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTextAreaTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleTextAreaTag($attributes) {
-            $this->SimpleWidget('textarea', $attributes);
-        }
-
-        /**
-         *    Accessor for starting value.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
-        }
-
-        /**
-         *    Applies word wrapping if needed.
-         *    @param string $value      New value.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return parent::setValue($this->_wrap($value));
-        }
-
-        /**
-         *    Test to see if text should be wrapped.
-         *    @return boolean        True if wrapping on.
-         *    @access private
-         */
-        function _wrapIsEnabled() {
-            if ($this->getAttribute('cols')) {
-                $wrap = $this->getAttribute('wrap');
-                if (($wrap == 'physical') || ($wrap == 'hard')) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Performs the formatting that is peculiar to
-         *    this tag. There is strange behaviour in this
-         *    one, including stripping a leading new line.
-         *    Go figure. I am using Firefox as a guide.
-         *    @param string $text    Text to wrap.
-         *    @return string         Text wrapped with carriage
-         *                           returns and line feeds
-         *    @access private
-         */
-        function _wrap($text) {
-            $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
-            $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
-            if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
-                $text = substr($text, strlen("\r\n"));
-            }
-            if ($this->_wrapIsEnabled()) {
-                return wordwrap(
-                        $text,
-                        (integer)$this->getAttribute('cols'),
-                        "\r\n");
-            }
-            return $text;
-        }
-
-        /**
-         *    The content of textarea is not part of the page.
-         *    @return boolean        True.
-         *    @access public
-         */
-        function isPrivateContent() {
-            return true;
-        }
-    }
-
-    /**
-     *    File upload widget.
+	 */
+	class SimpleTextAreaTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleTextAreaTag($attributes) {
+			$this->SimpleWidget('textarea', $attributes);
+		}
+
+		/**
+		 *    Accessor for starting value.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
+		}
+
+		/**
+		 *    Applies word wrapping if needed.
+		 *    @param string $value      New value.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return parent::setValue($this->_wrap($value));
+		}
+
+		/**
+		 *    Test to see if text should be wrapped.
+		 *    @return boolean        True if wrapping on.
+		 *    @access private
+		 */
+		function _wrapIsEnabled() {
+			if ($this->getAttribute('cols')) {
+				$wrap = $this->getAttribute('wrap');
+				if (($wrap == 'physical') || ($wrap == 'hard')) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Performs the formatting that is peculiar to
+		 *    this tag. There is strange behaviour in this
+		 *    one, including stripping a leading new line.
+		 *    Go figure. I am using Firefox as a guide.
+		 *    @param string $text    Text to wrap.
+		 *    @return string         Text wrapped with carriage
+		 *                           returns and line feeds
+		 *    @access private
+		 */
+		function _wrap($text) {
+			$text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
+			$text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
+			if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
+				$text = substr($text, strlen("\r\n"));
+			}
+			if ($this->_wrapIsEnabled()) {
+				return wordwrap(
+						$text,
+						(integer)$this->getAttribute('cols'),
+						"\r\n");
+			}
+			return $text;
+		}
+
+		/**
+		 *    The content of textarea is not part of the page.
+		 *    @return boolean        True.
+		 *    @access public
+		 */
+		function isPrivateContent() {
+			return true;
+		}
+	}
+
+	/**
+	 *    File upload widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleUploadTag extends SimpleWidget {
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleUploadTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @access public
-         */
-        function write($encoding) {
-            if (! file_exists($this->getValue())) {
-                return;
-            }
-            $encoding->attach(
-                    $this->getName(),
-                    implode('', file($this->getValue())),
-                    basename($this->getValue()));
-        }
-    }
-
-    /**
-     *    Drop down widget.
+	 */
+	class SimpleUploadTag extends SimpleWidget {
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleUploadTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @access public
+		 */
+		function write($encoding) {
+			if (! file_exists($this->getValue())) {
+				return;
+			}
+			$encoding->attach(
+					$this->getName(),
+					implode('', file($this->getValue())),
+					basename($this->getValue()));
+		}
+	}
+
+	/**
+	 *    Drop down widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleSelectionTag extends SimpleWidget {
-        protected $_options;
-        protected $_choice;
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleSelectionTag($attributes) {
-            $this->SimpleWidget('select', $attributes);
-            $this->_options = array();
-            $this->_choice = false;
-        }
-
-        /**
-         *    Adds an option tag to a selection field.
-         *    @param SimpleOptionTag $tag     New option.
-         *    @access public
-         */
-        function addTag($tag) {
-            if ($tag->getTagName() == 'option') {
-                $this->_options[] = $tag;
-            }
-        }
-
-        /**
-         *    Text within the selection element is ignored.
-         *    @param string $content        Ignored.
-         *    @access public
-         */
-        function addContent($content) {
-        }
-
-        /**
-         *    Scans options for defaults. If none, then
-         *    the first option is selected.
-         *    @return string        Selected field.
-         *    @access public
-         */
-        function getDefault() {
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->getAttribute('selected') !== false) {
-                    return $this->_options[$i]->getDefault();
-                }
-            }
-            if ($count > 0) {
-                return $this->_options[0]->getDefault();
-            }
-            return '';
-        }
-
-        /**
-         *    Can only set allowed values.
-         *    @param string $value       New choice.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->isValue($value)) {
-                    $this->_choice = $i;
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for current selection value.
-         *    @return string      Value attribute or
-         *                        content of opton.
-         *    @access public
-         */
-        function getValue() {
-            if ($this->_choice === false) {
-                return $this->getDefault();
-            }
-            return $this->_options[$this->_choice]->getValue();
-        }
-    }
-
-    /**
-     *    Drop down widget.
+	 */
+	class SimpleSelectionTag extends SimpleWidget {
+		protected $_options;
+		protected $_choice;
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleSelectionTag($attributes) {
+			$this->SimpleWidget('select', $attributes);
+			$this->_options = array();
+			$this->_choice = false;
+		}
+
+		/**
+		 *    Adds an option tag to a selection field.
+		 *    @param SimpleOptionTag $tag     New option.
+		 *    @access public
+		 */
+		function addTag($tag) {
+			if ($tag->getTagName() == 'option') {
+				$this->_options[] = $tag;
+			}
+		}
+
+		/**
+		 *    Text within the selection element is ignored.
+		 *    @param string $content        Ignored.
+		 *    @access public
+		 */
+		function addContent($content) {
+		}
+
+		/**
+		 *    Scans options for defaults. If none, then
+		 *    the first option is selected.
+		 *    @return string        Selected field.
+		 *    @access public
+		 */
+		function getDefault() {
+			for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+				if ($this->_options[$i]->getAttribute('selected') !== false) {
+					return $this->_options[$i]->getDefault();
+				}
+			}
+			if ($count > 0) {
+				return $this->_options[0]->getDefault();
+			}
+			return '';
+		}
+
+		/**
+		 *    Can only set allowed values.
+		 *    @param string $value       New choice.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+				if ($this->_options[$i]->isValue($value)) {
+					$this->_choice = $i;
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for current selection value.
+		 *    @return string      Value attribute or
+		 *                        content of opton.
+		 *    @access public
+		 */
+		function getValue() {
+			if ($this->_choice === false) {
+				return $this->getDefault();
+			}
+			return $this->_options[$this->_choice]->getValue();
+		}
+	}
+
+	/**
+	 *    Drop down widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class MultipleSelectionTag extends SimpleWidget {
-        protected $_options;
-        protected $_values;
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function MultipleSelectionTag($attributes) {
-            $this->SimpleWidget('select', $attributes);
-            $this->_options = array();
-            $this->_values = false;
-        }
-
-        /**
-         *    Adds an option tag to a selection field.
-         *    @param SimpleOptionTag $tag     New option.
-         *    @access public
-         */
-        function addTag($tag) {
-            if ($tag->getTagName() == 'option') {
-                $this->_options[] = $tag;
-            }
-        }
-
-        /**
-         *    Text within the selection element is ignored.
-         *    @param string $content        Ignored.
-         *    @access public
-         */
-        function addContent($content) {
-        }
-
-        /**
-         *    Scans options for defaults to populate the
-         *    value array().
-         *    @return array        Selected fields.
-         *    @access public
-         */
-        function getDefault() {
-            $default = array();
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->getAttribute('selected') !== false) {
-                    $default[] = $this->_options[$i]->getDefault();
-                }
-            }
-            return $default;
-        }
-
-        /**
-         *    Can only set allowed values. Any illegal value
-         *    will result in a failure, but all correct values
-         *    will be set.
-         *    @param array $desired      New choices.
-         *    @return boolean            True if all allowed.
-         *    @access public
-         */
-        function setValue($desired) {
-            $achieved = array();
-            foreach ($desired as $value) {
-                $success = false;
-                for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                    if ($this->_options[$i]->isValue($value)) {
-                        $achieved[] = $this->_options[$i]->getValue();
-                        $success = true;
-                        break;
-                    }
-                }
-                if (! $success) {
-                    return false;
-                }
-            }
-            $this->_values = $achieved;
-            return true;
-        }
-
-        /**
-         *    Accessor for current selection value.
-         *    @return array      List of currently set options.
-         *    @access public
-         */
-        function getValue() {
-            if ($this->_values === false) {
-                return $this->getDefault();
-            }
-            return $this->_values;
-        }
-    }
-
-    /**
-     *    Option for selection field.
+	 */
+	class MultipleSelectionTag extends SimpleWidget {
+		protected $_options;
+		protected $_values;
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function MultipleSelectionTag($attributes) {
+			$this->SimpleWidget('select', $attributes);
+			$this->_options = array();
+			$this->_values = false;
+		}
+
+		/**
+		 *    Adds an option tag to a selection field.
+		 *    @param SimpleOptionTag $tag     New option.
+		 *    @access public
+		 */
+		function addTag($tag) {
+			if ($tag->getTagName() == 'option') {
+				$this->_options[] = $tag;
+			}
+		}
+
+		/**
+		 *    Text within the selection element is ignored.
+		 *    @param string $content        Ignored.
+		 *    @access public
+		 */
+		function addContent($content) {
+		}
+
+		/**
+		 *    Scans options for defaults to populate the
+		 *    value array().
+		 *    @return array        Selected fields.
+		 *    @access public
+		 */
+		function getDefault() {
+			$default = array();
+			for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+				if ($this->_options[$i]->getAttribute('selected') !== false) {
+					$default[] = $this->_options[$i]->getDefault();
+				}
+			}
+			return $default;
+		}
+
+		/**
+		 *    Can only set allowed values. Any illegal value
+		 *    will result in a failure, but all correct values
+		 *    will be set.
+		 *    @param array $desired      New choices.
+		 *    @return boolean            True if all allowed.
+		 *    @access public
+		 */
+		function setValue($desired) {
+			$achieved = array();
+			foreach ($desired as $value) {
+				$success = false;
+				for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+					if ($this->_options[$i]->isValue($value)) {
+						$achieved[] = $this->_options[$i]->getValue();
+						$success = true;
+						break;
+					}
+				}
+				if (! $success) {
+					return false;
+				}
+			}
+			$this->_values = $achieved;
+			return true;
+		}
+
+		/**
+		 *    Accessor for current selection value.
+		 *    @return array      List of currently set options.
+		 *    @access public
+		 */
+		function getValue() {
+			if ($this->_values === false) {
+				return $this->getDefault();
+			}
+			return $this->_values;
+		}
+	}
+
+	/**
+	 *    Option for selection field.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleOptionTag extends SimpleWidget {
-
-        /**
-         *    Stashes the attributes.
-         */
-        function SimpleOptionTag($attributes) {
-            $this->SimpleWidget('option', $attributes);
-        }
-
-        /**
-         *    Does nothing.
-         *    @param string $value      Ignored.
-         *    @return boolean           Not allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Test to see if a value matches the option.
-         *    @param string $compare    Value to compare with.
-         *    @return boolean           True if possible match.
-         *    @access public
-         */
-        function isValue($compare) {
-            $compare = trim($compare);
-            if (trim($this->getValue()) == $compare) {
-                return true;
-            }
-            return trim($this->getContent()) == $compare;
-        }
-
-        /**
-         *    Accessor for starting value. Will be set to
-         *    the option label if no value exists.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            if ($this->getAttribute('value') === false) {
-                return $this->getContent();
-            }
-            return $this->getAttribute('value');
-        }
-
-        /**
-         *    The content of options is not part of the page.
-         *    @return boolean        True.
-         *    @access public
-         */
-        function isPrivateContent() {
-            return true;
-        }
-    }
-
-    /**
-     *    Radio button.
+	 */
+	class SimpleOptionTag extends SimpleWidget {
+
+		/**
+		 *    Stashes the attributes.
+		 */
+		function SimpleOptionTag($attributes) {
+			$this->SimpleWidget('option', $attributes);
+		}
+
+		/**
+		 *    Does nothing.
+		 *    @param string $value      Ignored.
+		 *    @return boolean           Not allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Test to see if a value matches the option.
+		 *    @param string $compare    Value to compare with.
+		 *    @return boolean           True if possible match.
+		 *    @access public
+		 */
+		function isValue($compare) {
+			$compare = trim($compare);
+			if (trim($this->getValue()) == $compare) {
+				return true;
+			}
+			return trim($this->getContent()) == $compare;
+		}
+
+		/**
+		 *    Accessor for starting value. Will be set to
+		 *    the option label if no value exists.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			if ($this->getAttribute('value') === false) {
+				return $this->getContent();
+			}
+			return $this->getAttribute('value');
+		}
+
+		/**
+		 *    The content of options is not part of the page.
+		 *    @return boolean        True.
+		 *    @access public
+		 */
+		function isPrivateContent() {
+			return true;
+		}
+	}
+
+	/**
+	 *    Radio button.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRadioButtonTag extends SimpleWidget {
-
-        /**
-         *    Stashes the attributes.
-         *    @param array $attributes        Hash of attributes.
-         */
-        function SimpleRadioButtonTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', 'on');
-            }
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    The only allowed value sn the one in the
-         *    "value" attribute.
-         *    @param string $value      New value.
-         *    @return boolean           True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if ($value === false) {
-                return parent::setValue($value);
-            }
-            if ($value !== $this->getAttribute('value')) {
-                return false;
-            }
-            return parent::setValue($value);
-        }
-
-        /**
-         *    Accessor for starting value.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            if ($this->getAttribute('checked') !== false) {
-                return $this->getAttribute('value');
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    Checkbox widget.
+	 */
+	class SimpleRadioButtonTag extends SimpleWidget {
+
+		/**
+		 *    Stashes the attributes.
+		 *    @param array $attributes        Hash of attributes.
+		 */
+		function SimpleRadioButtonTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', 'on');
+			}
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    The only allowed value sn the one in the
+		 *    "value" attribute.
+		 *    @param string $value      New value.
+		 *    @return boolean           True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if ($value === false) {
+				return parent::setValue($value);
+			}
+			if ($value !== $this->getAttribute('value')) {
+				return false;
+			}
+			return parent::setValue($value);
+		}
+
+		/**
+		 *    Accessor for starting value.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			if ($this->getAttribute('checked') !== false) {
+				return $this->getAttribute('value');
+			}
+			return false;
+		}
+	}
+
+	/**
+	 *    Checkbox widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleCheckboxTag extends SimpleWidget {
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleCheckboxTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', 'on');
-            }
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    The only allowed value in the one in the
-         *    "value" attribute. The default for this
-         *    attribute is "on". If this widget is set to
-         *    true, then the usual value will be taken.
-         *    @param string $value      New value.
-         *    @return boolean           True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if ($value === false) {
-                return parent::setValue($value);
-            }
-            if ($value === true) {
-                return parent::setValue($this->getAttribute('value'));
-            }
-            if ($value != $this->getAttribute('value')) {
-                return false;
-            }
-            return parent::setValue($value);
-        }
-
-        /**
-         *    Accessor for starting value. The default
-         *    value is "on".
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            if ($this->getAttribute('checked') !== false) {
-                return $this->getAttribute('value');
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    A group of multiple widgets with some shared behaviour.
+	 */
+	class SimpleCheckboxTag extends SimpleWidget {
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleCheckboxTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', 'on');
+			}
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    The only allowed value in the one in the
+		 *    "value" attribute. The default for this
+		 *    attribute is "on". If this widget is set to
+		 *    true, then the usual value will be taken.
+		 *    @param string $value      New value.
+		 *    @return boolean           True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if ($value === false) {
+				return parent::setValue($value);
+			}
+			if ($value === true) {
+				return parent::setValue($this->getAttribute('value'));
+			}
+			if ($value != $this->getAttribute('value')) {
+				return false;
+			}
+			return parent::setValue($value);
+		}
+
+		/**
+		 *    Accessor for starting value. The default
+		 *    value is "on".
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			if ($this->getAttribute('checked') !== false) {
+				return $this->getAttribute('value');
+			}
+			return false;
+		}
+	}
+
+	/**
+	 *    A group of multiple widgets with some shared behaviour.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTagGroup {
-        protected $_widgets = array();
-
-        /**
-         *    Adds a tag to the group.
-         *    @param SimpleWidget $widget
-         *    @access public
-         */
-        function addWidget($widget) {
-            $this->_widgets[] = $widget;
-        }
-
-        /**
-         *    Accessor to widget set.
-         *    @return array        All widgets.
-         *    @access protected
-         */
-        function &_getWidgets() {
-            return $this->_widgets;
-        }
-
-        /**
-         *    Accessor for an attribute.
-         *    @param string $label    Attribute name.
-         *    @return boolean         Always false.
-         *    @access public
-         */
-        function getAttribute($label) {
-            return false;
-        }
-
-        /**
-         *    Fetches the name for the widget from the first
-         *    member.
-         *    @return string        Name of widget.
-         *    @access public
-         */
-        function getName() {
-            if (count($this->_widgets) > 0) {
-                return $this->_widgets[0]->getName();
-            }
-        }
-
-        /**
-         *    Scans the widgets for one with the appropriate
-         *    ID field.
-         *    @param string $id        ID value to try.
-         *    @return boolean          True if matched.
-         *    @access public
-         */
-        function isId($id) {
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($this->_widgets[$i]->isId($id)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Scans the widgets for one with the appropriate
-         *    attached label.
-         *    @param string $label     Attached label to try.
-         *    @return boolean          True if matched.
-         *    @access public
-         */
-        function isLabel($label) {
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($this->_widgets[$i]->isLabel($label)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @access public
-         */
-        function write($encoding) {
-            $encoding->add($this->getName(), $this->getValue());
-        }
-    }
-
-    /**
-     *    A group of tags with the same name within a form.
+	 */
+	class SimpleTagGroup {
+		protected $_widgets = array();
+
+		/**
+		 *    Adds a tag to the group.
+		 *    @param SimpleWidget $widget
+		 *    @access public
+		 */
+		function addWidget($widget) {
+			$this->_widgets[] = $widget;
+		}
+
+		/**
+		 *    Accessor to widget set.
+		 *    @return array        All widgets.
+		 *    @access protected
+		 */
+		function &_getWidgets() {
+			return $this->_widgets;
+		}
+
+		/**
+		 *    Accessor for an attribute.
+		 *    @param string $label    Attribute name.
+		 *    @return boolean         Always false.
+		 *    @access public
+		 */
+		function getAttribute($label) {
+			return false;
+		}
+
+		/**
+		 *    Fetches the name for the widget from the first
+		 *    member.
+		 *    @return string        Name of widget.
+		 *    @access public
+		 */
+		function getName() {
+			if (count($this->_widgets) > 0) {
+				return $this->_widgets[0]->getName();
+			}
+		}
+
+		/**
+		 *    Scans the widgets for one with the appropriate
+		 *    ID field.
+		 *    @param string $id        ID value to try.
+		 *    @return boolean          True if matched.
+		 *    @access public
+		 */
+		function isId($id) {
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($this->_widgets[$i]->isId($id)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Scans the widgets for one with the appropriate
+		 *    attached label.
+		 *    @param string $label     Attached label to try.
+		 *    @return boolean          True if matched.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($this->_widgets[$i]->isLabel($label)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @access public
+		 */
+		function write($encoding) {
+			$encoding->add($this->getName(), $this->getValue());
+		}
+	}
+
+	/**
+	 *    A group of tags with the same name within a form.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleCheckboxGroup extends SimpleTagGroup {
-
-        /**
-         *    Accessor for current selected widget or false
-         *    if none.
-         *    @return string/array     Widget values or false if none.
-         *    @access public
-         */
-        function getValue() {
-            $values = array();
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getValue() !== false) {
-                    $values[] = $widgets[$i]->getValue();
-                }
-            }
-            return $this->_coerceValues($values);
-        }
-
-        /**
-         *    Accessor for starting value that is active.
-         *    @return string/array      Widget values or false if none.
-         *    @access public
-         */
-        function getDefault() {
-            $values = array();
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getDefault() !== false) {
-                    $values[] = $widgets[$i]->getDefault();
-                }
-            }
-            return $this->_coerceValues($values);
-        }
-
-        /**
-         *    Accessor for current set values.
-         *    @param string/array/boolean $values   Either a single string, a
-         *                                          hash or false for nothing set.
-         *    @return boolean                       True if all values can be set.
-         *    @access public
-         */
-        function setValue($values) {
-            $values = $this->_makeArray($values);
-            if (! $this->_valuesArePossible($values)) {
-                return false;
-            }
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                $possible = $widgets[$i]->getAttribute('value');
-                if (in_array($widgets[$i]->getAttribute('value'), $values)) {
-                    $widgets[$i]->setValue($possible);
-                } else {
-                    $widgets[$i]->setValue(false);
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Tests to see if a possible value set is legal.
-         *    @param string/array/boolean $values   Either a single string, a
-         *                                          hash or false for nothing set.
-         *    @return boolean                       False if trying to set a
-         *                                          missing value.
-         *    @access private
-         */
-        function _valuesArePossible($values) {
-            $matches = array();
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                $possible = $widgets[$i]->getAttribute('value');
-                if (in_array($possible, $values)) {
-                    $matches[] = $possible;
-                }
-            }
-            return ($values == $matches);
-        }
-
-        /**
-         *    Converts the output to an appropriate format. This means
-         *    that no values is false, a single value is just that
-         *    value and only two or more are contained in an array.
-         *    @param array $values           List of values of widgets.
-         *    @return string/array/boolean   Expected format for a tag.
-         *    @access private
-         */
-        function _coerceValues($values) {
-            if (count($values) == 0) {
-                return false;
-            } elseif (count($values) == 1) {
-                return $values[0];
-            } else {
-                return $values;
-            }
-        }
-
-        /**
-         *    Converts false or string into array. The opposite of
-         *    the coercian method.
-         *    @param string/array/boolean $value  A single item is converted
-         *                                        to a one item list. False
-         *                                        gives an empty list.
-         *    @return array                       List of values, possibly empty.
-         *    @access private
-         */
-        function _makeArray($value) {
-            if ($value === false) {
-                return array();
-            }
-            if (is_string($value)) {
-                return array($value);
-            }
-            return $value;
-        }
-    }
-
-    /**
-     *    A group of tags with the same name within a form.
-     *    Used for radio buttons.
+	 */
+	class SimpleCheckboxGroup extends SimpleTagGroup {
+
+		/**
+		 *    Accessor for current selected widget or false
+		 *    if none.
+		 *    @return string/array     Widget values or false if none.
+		 *    @access public
+		 */
+		function getValue() {
+			$values = array();
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getValue() !== false) {
+					$values[] = $widgets[$i]->getValue();
+				}
+			}
+			return $this->_coerceValues($values);
+		}
+
+		/**
+		 *    Accessor for starting value that is active.
+		 *    @return string/array      Widget values or false if none.
+		 *    @access public
+		 */
+		function getDefault() {
+			$values = array();
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getDefault() !== false) {
+					$values[] = $widgets[$i]->getDefault();
+				}
+			}
+			return $this->_coerceValues($values);
+		}
+
+		/**
+		 *    Accessor for current set values.
+		 *    @param string/array/boolean $values   Either a single string, a
+		 *                                          hash or false for nothing set.
+		 *    @return boolean                       True if all values can be set.
+		 *    @access public
+		 */
+		function setValue($values) {
+			$values = $this->_makeArray($values);
+			if (! $this->_valuesArePossible($values)) {
+				return false;
+			}
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				$possible = $widgets[$i]->getAttribute('value');
+				if (in_array($widgets[$i]->getAttribute('value'), $values)) {
+					$widgets[$i]->setValue($possible);
+				} else {
+					$widgets[$i]->setValue(false);
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Tests to see if a possible value set is legal.
+		 *    @param string/array/boolean $values   Either a single string, a
+		 *                                          hash or false for nothing set.
+		 *    @return boolean                       False if trying to set a
+		 *                                          missing value.
+		 *    @access private
+		 */
+		function _valuesArePossible($values) {
+			$matches = array();
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				$possible = $widgets[$i]->getAttribute('value');
+				if (in_array($possible, $values)) {
+					$matches[] = $possible;
+				}
+			}
+			return ($values == $matches);
+		}
+
+		/**
+		 *    Converts the output to an appropriate format. This means
+		 *    that no values is false, a single value is just that
+		 *    value and only two or more are contained in an array.
+		 *    @param array $values           List of values of widgets.
+		 *    @return string/array/boolean   Expected format for a tag.
+		 *    @access private
+		 */
+		function _coerceValues($values) {
+			if (count($values) == 0) {
+				return false;
+			} elseif (count($values) == 1) {
+				return $values[0];
+			} else {
+				return $values;
+			}
+		}
+
+		/**
+		 *    Converts false or string into array. The opposite of
+		 *    the coercian method.
+		 *    @param string/array/boolean $value  A single item is converted
+		 *                                        to a one item list. False
+		 *                                        gives an empty list.
+		 *    @return array                       List of values, possibly empty.
+		 *    @access private
+		 */
+		function _makeArray($value) {
+			if ($value === false) {
+				return array();
+			}
+			if (is_string($value)) {
+				return array($value);
+			}
+			return $value;
+		}
+	}
+
+	/**
+	 *    A group of tags with the same name within a form.
+	 *    Used for radio buttons.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRadioGroup extends SimpleTagGroup {
-
-        /**
-         *    Each tag is tried in turn until one is
-         *    successfully set. The others will be
-         *    unchecked if successful.
-         *    @param string $value      New value.
-         *    @return boolean           True if any allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if (! $this->_valueIsPossible($value)) {
-                return false;
-            }
-            $index = false;
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if (! $widgets[$i]->setValue($value)) {
-                    $widgets[$i]->setValue(false);
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Tests to see if a value is allowed.
-         *    @param string    Attempted value.
-         *    @return boolean  True if a valid value.
-         *    @access private
-         */
-        function _valueIsPossible($value) {
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getAttribute('value') == $value) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for current selected widget or false
-         *    if none.
-         *    @return string/boolean   Value attribute or
-         *                             content of opton.
-         *    @access public
-         */
-        function getValue() {
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getValue() !== false) {
-                    return $widgets[$i]->getValue();
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for starting value that is active.
-         *    @return string/boolean      Value of first checked
-         *                                widget or false if none.
-         *    @access public
-         */
-        function getDefault() {
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getDefault() !== false) {
-                    return $widgets[$i]->getDefault();
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    Tag to keep track of labels.
+	 */
+	class SimpleRadioGroup extends SimpleTagGroup {
+
+		/**
+		 *    Each tag is tried in turn until one is
+		 *    successfully set. The others will be
+		 *    unchecked if successful.
+		 *    @param string $value      New value.
+		 *    @return boolean           True if any allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if (! $this->_valueIsPossible($value)) {
+				return false;
+			}
+			$index = false;
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if (! $widgets[$i]->setValue($value)) {
+					$widgets[$i]->setValue(false);
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Tests to see if a value is allowed.
+		 *    @param string    Attempted value.
+		 *    @return boolean  True if a valid value.
+		 *    @access private
+		 */
+		function _valueIsPossible($value) {
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getAttribute('value') == $value) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for current selected widget or false
+		 *    if none.
+		 *    @return string/boolean   Value attribute or
+		 *                             content of opton.
+		 *    @access public
+		 */
+		function getValue() {
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getValue() !== false) {
+					return $widgets[$i]->getValue();
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for starting value that is active.
+		 *    @return string/boolean      Value of first checked
+		 *                                widget or false if none.
+		 *    @access public
+		 */
+		function getDefault() {
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getDefault() !== false) {
+					return $widgets[$i]->getDefault();
+				}
+			}
+			return false;
+		}
+	}
+
+	/**
+	 *    Tag to keep track of labels.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleLabelTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleLabelTag($attributes) {
-            $this->SimpleTag('label', $attributes);
-        }
-
-        /**
-         *    Access for the ID to attach the label to.
-         *    @return string        For attribute.
-         *    @access public
-         */
-        function getFor() {
-            return $this->getAttribute('for');
-        }
-    }
-
-    /**
-     *    Tag to aid parsing the form.
+	 */
+	class SimpleLabelTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleLabelTag($attributes) {
+			$this->SimpleTag('label', $attributes);
+		}
+
+		/**
+		 *    Access for the ID to attach the label to.
+		 *    @return string        For attribute.
+		 *    @access public
+		 */
+		function getFor() {
+			return $this->getAttribute('for');
+		}
+	}
+
+	/**
+	 *    Tag to aid parsing the form.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleFormTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleFormTag($attributes) {
-            $this->SimpleTag('form', $attributes);
-        }
-    }
-
-    /**
-     *    Tag to aid parsing the frames in a page.
+	 */
+	class SimpleFormTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleFormTag($attributes) {
+			$this->SimpleTag('form', $attributes);
+		}
+	}
+
+	/**
+	 *    Tag to aid parsing the frames in a page.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleFrameTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleFrameTag($attributes) {
-            $this->SimpleTag('frame', $attributes);
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleFrameTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleFrameTag($attributes) {
+			$this->SimpleTag('frame', $attributes);
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+	}
\ No newline at end of file