tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13790

Modified Files:
	base.pinc 
Log Message:
fix according to Support Request #1728202


Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- base.pinc	28 Dec 2006 20:23:43 -0000	1.95
+++ base.pinc	29 Jun 2007 10:39:18 -0000	1.96
@@ -704,8 +704,7 @@
     global $current_user,$tutos,$g_hash;
     $msg = '';
 
-    @reset($tutos[activemodules]);
-    while( list ($i,$f) = @each ($tutos[activemodules])) {
+    foreach ($tutos[activemodules] as $f) {
       $x = new $tutos[modules][$f][name]($this->dbconn);
       $msg .= $x->obj_save($current_user,$this);
     }

Dear Tutos user,

We are Salvador Bueno and Dolores Gallego, Assistant Professors in Business 
Administration Department in Pablo de Olavide University at Seville, Spain.  
Our research involves an analysis about Open Source Software-Enterprise 
Resource Planning (OSS-ERP) and its impact at organization. We send you this 
mail to invite your participation in our study.

Specifically, our analysis consists on development a Technological 
Acceptance Model of an OSS-ERP.  We consider you are an OSS-ERP user and we 
appreciate the time necessary for answer our questionnaire. The name of the 
participants in this study will remain anonymous.

I would be most grateful if you participate in this survey. You only have to 
answer the questionnaire in the following URL and answer online. You will 
consider for answer the distribution of OSS-ERP you use.

http://aramis.upo.es/general/centros_depart/departamentos/invest/oss/

Please do not hesitate to contact us if you have any queries regarding this 
study.

Best regards,

Salvador Bueno, Ph D.

_________________________________________________________________
Un amor, una aventura, compañía para un viaje. Regístrate gratis en MSN Amor 
& Amistad. http://match.msn.es/match/mt.cfm?pg=channel&tcid=162349

Update of /cvsroot/tutos/tutos/php/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22877/php/admin

Modified Files:
	customize_ins.php customize_show.php 
Log Message:
added admin check

Index: customize_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/customize_show.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- customize_show.php	1 Jun 2007 16:31:41 -0000	1.1
+++ customize_show.php	13 Jun 2007 11:07:14 -0000	1.2
@@ -187,6 +187,15 @@
 
      $this->name = $lang['AdminShow'];
 
+     if ( ! $this->user->isAdmin() ) {
+       echo $this->error("Only admins are allowed to see this");
+       if ( $tutos[demo] == 1 ) {
+         echo $this->error("exceptionally enabled for this demo");
+       } else {
+         return;
+       }
+     }
+
      $this->lg1 = "en";
      $this->mod = "php/localization";
      if (isset($_GET['lg1'])) {
@@ -204,4 +213,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: customize_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/customize_ins.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- customize_ins.php	1 Jun 2007 16:31:41 -0000	1.2
+++ customize_ins.php	13 Jun 2007 11:07:14 -0000	1.3
@@ -18,6 +18,7 @@
  include 'webelements.p3';
  include 'permission.p3';
 
+ $msg = '';
  /* Check if user is allowed to use it */
  check_user();
  loadmodules('admin','customize');
@@ -31,73 +32,78 @@
  $gotourl= addUrlParameter($gotourl,"lg1=". $_POST['lg1'],true);
  $gotourl= addUrlParameter($gotourl,"mod=". $_POST['mod'],true);
 
- $use2 = false;
- $use3 = false;
+ if ( ! $this->user->isAdmin() ) {
+   $msg .= "Only admins are allowed to use this";
+ }
 
- $fn2 = '../../'. $mod.'/'.$lg1. '_custom.p3';
- $tf2 = tempnam($tutos[sessionpath],'lg2');
- $f2 = fopen($tf2,"wb");
- fwrite($f2,"<?php\r\n");
- fwrite($f2,"#\r\n");
- fwrite($f2,"# Language Specific Custom File for ". $mod ." ". $lg1 ."\r\n");
- fwrite($f2,"# ".$fn2."\r\n");
- fwrite($f2,"#\r\n");
- fwrite($f2,"# generated by \t TUTOS admin - customize\r\n");
- fwrite($f2,"# DateTime: ". Date("d.M.Y H:i:s T") ."\r\n");
- fwrite($f2,"#\r\n");
- fwrite($f2,"#\r\n");
+ if ($msg == "") {
+   $use2 = false;
+   $use3 = false;
 
- $fn3 = '../../'.$mod .'/lang_custom.p3';
- $tf3 = tempnam($tutos[sessionpath],'lg3');
- $f3 = fopen($tf3,"wb");
- fwrite($f3,"<?php\r\n");
- fwrite($f3,"#\r\n");
- fwrite($f3,"# Global Custom File for ". $mod ." ". $lg1 ."\r\n");
- fwrite($f3,"# ".$fn3."\r\n");
- fwrite($f3,"#\r\n");
- fwrite($f3,"# generated by \t TUTOS admin - customize\r\n");
- fwrite($f3,"# DateTime: ". Date("d.M.Y H:i:s T") ."\r\n");
- fwrite($f3,"#\r\n");
- fwrite($f3,"#\r\n");
+   $fn2 = '../../'. $mod.'/'.$lg1. '_custom.p3';
+   $tf2 = tempnam($tutos[sessionpath],'lg2');
+   $f2 = fopen($tf2,"wb");
+   fwrite($f2,"<?php\r\n");
+   fwrite($f2,"#\r\n");
+   fwrite($f2,"# Language Specific Custom File for ". $mod ." ". $lg1 ."\r\n");
+   fwrite($f2,"# ".$fn2."\r\n");
+   fwrite($f2,"#\r\n");
+   fwrite($f2,"# generated by \t TUTOS admin - customize\r\n");
+   fwrite($f2,"# DateTime: ". Date("d.M.Y H:i:s T") ."\r\n");
+   fwrite($f2,"#\r\n");
+   fwrite($f2,"#\r\n");
 
- foreach ($_POST as $i => $f) {
-   if ( (strpos($i,'lg2') === 0) && ($f != '') ) {
-	 $i1 = substr($i,4);
-	 $p1 = strpos($i1,'__');
-	 if ($p1 > 0) {
-	   $i2 = substr($i1,$p1+2);
-	   $i1 = substr($i1,0,$p1);
-	   if (! is_numeric($i2)) $i2 = "'".$i2."'";
-       fwrite($f2,'$lang[\''. $i1 ."'][".$i2."] \t = \"". $f."\";\r\n");
-	 } else {
-       fwrite($f2,'$lang[\''. $i1 ."'] \t = \"". $f."\";\r\n");
-	 }
-     $use2 = true;
-   }
-   if ( (strpos($i,'lg3') === 0) && ($f != '') ) {
-	 $i1 = substr($i,4);
-	 $p1 = strpos($i1,'__');
-	 if ($p1 > 0) {
-	   $i2 = substr($i1,$p1+2);
-	   $i1 = substr($i1,0,$p1);
-	   if (! is_numeric($i2)) $i2 = "'".$i2."'";
-       fwrite($f3,'$lang[\''. $i1 ."'][".$i2."] \t = \"". $f."\";\r\n");
-	 } else {
-       fwrite($f3,'$lang[\''. $i1 ."'] \t = \"". $f."\";\r\n");
-	 }
-     $use3 = true;
+   $fn3 = '../../'.$mod .'/lang_custom.p3';
+   $tf3 = tempnam($tutos[sessionpath],'lg3');
+   $f3 = fopen($tf3,"wb");
+   fwrite($f3,"<?php\r\n");
+   fwrite($f3,"#\r\n");
+   fwrite($f3,"# Global Custom File for ". $mod ." ". $lg1 ."\r\n");
+   fwrite($f3,"# ".$fn3."\r\n");
+   fwrite($f3,"#\r\n");
+   fwrite($f3,"# generated by \t TUTOS admin - customize\r\n");
+   fwrite($f3,"# DateTime: ". Date("d.M.Y H:i:s T") ."\r\n");
+   fwrite($f3,"#\r\n");
+   fwrite($f3,"#\r\n");
+
+   foreach ($_POST as $i => $f) {
+     if ( (strpos($i,'lg2') === 0) && ($f != '') ) {
+       $i1 = substr($i,4);
+       $p1 = strpos($i1,'__');
+	   if ($p1 > 0) {
+	     $i2 = substr($i1,$p1+2);
+	     $i1 = substr($i1,0,$p1);
+	     if (! is_numeric($i2)) $i2 = "'".$i2."'";
+         fwrite($f2,'$lang[\''. $i1 ."'][".$i2."] \t = \"". $f."\";\r\n");
+	   } else {
+         fwrite($f2,'$lang[\''. $i1 ."'] \t = \"". $f."\";\r\n");
+	   }
+       $use2 = true;
+     }
+     if ( (strpos($i,'lg3') === 0) && ($f != '') ) {
+	   $i1 = substr($i,4);
+	   $p1 = strpos($i1,'__');
+	   if ($p1 > 0) {
+         $i2 = substr($i1,$p1+2);
+	     $i1 = substr($i1,0,$p1);
+         if (! is_numeric($i2)) $i2 = "'".$i2."'";
+         fwrite($f3,'$lang[\''. $i1 ."'][".$i2."] \t = \"". $f."\";\r\n");
+       } else {
+         fwrite($f3,'$lang[\''. $i1 ."'] \t = \"". $f."\";\r\n");
+	   }
+       $use3 = true;
+     }
    }
- }
 
- fwrite($f2,"#\r\n");
- fwrite($f2,"#\r\n");
- fwrite($f2,"?>\r\n");
- fclose($f2);
+   fwrite($f2,"#\r\n");
+   fwrite($f2,"#\r\n");
+   fwrite($f2,"?>\r\n");
+   fclose($f2);
 
- fwrite($f3,"#\r\n");
- fwrite($f3,"#\r\n");
- fwrite($f3,"?>\r\n");
- fclose($f3);
+   fwrite($f3,"#\r\n");
+   fwrite($f3,"#\r\n");
+   fwrite($f3,"?>\r\n");
+   fclose($f3);
 
 # $f2 = fopen($tf2,"r");
 # fpassthru ($f2);
@@ -107,39 +113,40 @@
 # fpassthru ($f3);
 # fclose($f3);
  
- if ($use2) {
-   if (file_exists($fn2)) {
-     if (! is_writeable($fn2)) {
-       $msg .= $fn2 ." is not writeable !<br />";
-	 } else {
-       if (! copy ($tf2,$fn2)) $msg .= "copy ". $fn2 ." failed !<br />";
-	 }
-   } else {
-     if (! is_writeable(dirname($fn2))) {
-       $msg .= dirname($fn2) ." is not writeable !<br />";
-	 } else {
-       if (! copy ($tf2,$fn2)) $msg .= "copy ". $fn2 ." failed !<br />";
+   if ($use2) {
+     if (file_exists($fn2)) {
+       if (! is_writeable($fn2)) {
+         $msg .= $fn2 ." is not writeable !<br />";
+       } else {
+         if (! copy ($tf2,$fn2)) $msg .= "copy ". $fn2 ." failed !<br />";
+       }
+     } else {
+       if (! is_writeable(dirname($fn2))) {
+         $msg .= dirname($fn2) ." is not writeable !<br />";
+       } else {
+         if (! copy ($tf2,$fn2)) $msg .= "copy ". $fn2 ." failed !<br />";
+       }
      }
    }
- }
- unlink($tf2);
+   unlink($tf2);
 
- if ($use3) {
-   if (file_exists($fn3)) {
-     if (! is_writeable($fn3)) {
-       $msg .= $fn3 ." is not writeable !<br />";
-	 } else {
-       if (! copy ($tf3,$fn3)) $msg .= "copy ". $fn3 ." failed !<br />";
-	 }
-   } else {
-     if (! is_writeable(dirname($fn3))) {
-       $msg .= dirname($fn3) ." is not writeable !<br />";
-	 } else {
-       if (! copy ($tf3,$fn3)) $msg .= "copy ". $fn3 ." failed !<br />";
+   if ($use3) {
+     if (file_exists($fn3)) {
+       if (! is_writeable($fn3)) {
+         $msg .= $fn3 ." is not writeable !<br />";
+       } else {
+         if (! copy ($tf3,$fn3)) $msg .= "copy ". $fn3 ." failed !<br />";
+       }
+     } else {
+       if (! is_writeable(dirname($fn3))) {
+         $msg .= dirname($fn3) ." is not writeable !<br />";
+       } else {
+         if (! copy ($tf3,$fn3)) $msg .= "copy ". $fn3 ." failed !<br />";
+       }
      }
    }
+   unlink($tf3);
  }
- unlink($tf3);
 
  $gotourl = addMessage($gotourl,$msg,true);
  $gotourl = addSessionKey($gotourl,true);
@@ -151,4 +158,4 @@
   *  CVS Info:  $Id$
   *  $Author$
   */
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/resource
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11346/resource

Modified Files:
	resource_overview.php 
Log Message:
fix

Index: resource_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_overview.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- resource_overview.php	2 Jan 2007 19:59:59 -0000	1.22
+++ resource_overview.php	13 Jun 2007 10:44:01 -0000	1.23
@@ -106,6 +106,41 @@
      echo $this->actionformEnd("resource_overview.php");
    }
    /**
+    * action
+    */
+   Function action() {
+     global $msg,$lang;
+
+     if ( $_GET['action'] == -2 ) {
+       $this->dbconn->Begin("WORK");
+       foreach ($_GET['mark'] as $key => $val) {
+         $p = new resource($this->dbconn);
+         $p = $p->read($val,$p);
+         if ( $p->id != $val ) {
+           continue;
+         }
+         if ( $p->del_ok() ) {
+           $msg .= sprintf($lang['ResDelI'], $p->getFullName()) ."<br />";
+           $msg .= $p->delete();
+         } else {
+           $msg .= $p->getLink() .": ". sprintf($lang['Err0023'],$lang[$p->getType()]);
+         }
+         unset($p);
+       }
+       $this->dbconn->Commit("WORK");
+       return;
+     }
+     if ( $_GET['action'] == -4 ) {
+       $this->redirect = acl_action();
+       return;
+     } 
+
+     if (class_exists('watchlist')) {
+       watchlist::parse_action($this->user);
+     }
+
+   }
+   /**
     * navigate
     */
    Function navigate() {

Update of /cvsroot/tutos/tutos/include/simpletest/extensions
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest/extensions

Added Files:
      Tag: BRANCH-2-0
	phpunit_test_case.php pear_test_case.php 
Log Message:
TRY including TDD

--- NEW FILE: phpunit_test_case.php ---
<?php
    /**
     *	adapter for SimpleTest to use PHPUnit test cases
     *	@package	SimpleTest
     *	@subpackage Extensions
     *	@version	$Id: phpunit_test_case.php,v 1.1.2.1 2007/06/05 13:08:52 edeweerdt Exp $
     */
    
    /**#@+
     * include SimpleTest files
     */
    require_once(dirname(__FILE__) . '/../unit_tester.php');
    require_once(dirname(__FILE__) . '/../expectation.php');
    /**#@-*/
    
    /**
     *    Adapter for sourceforge PHPUnit test case to allow
     *    legacy test cases to be used with SimpleTest.
     *    @package		SimpleTest
     *    @subpackage	Extensions
     */
    class TestCase extends SimpleTestCase {
        
        /**
         *    Constructor. Sets the test name.
         *    @param $label        Test name to display.
         *    @public
         */
        function TestCase($label) {
            $this->SimpleTestCase($label);
        }
        
        /**
         *    Sends pass if the test condition resolves true,
         *    a fail otherwise.
         *    @param $condition      Condition to test true.
         *    @param $message        Message to display.
         *    @public
         */
        function assert($condition, $message = false) {
            parent::assert(new TrueExpectation(), $condition, $message);
        }
        
        /**
         *    Will test straight equality if set to loose
         *    typing, or identity if not.
         *    @param $first          First value.
         *    @param $second         Comparison value.
         *    @param $message        Message to display.
         *    @public
         */
        function assertEquals($first, $second, $message = false) {
            parent::assert(new EqualExpectation($first), $second, $message);
        }
        
        /**
         *    Simple string equality.
         *    @param $first          First value.
         *    @param $second         Comparison value.
         *    @param $message        Message to display.
         *    @public
         */
        function assertEqualsMultilineStrings($first, $second, $message = false) {
            parent::assert(new EqualExpectation($first), $second, $message);
        }                             
        
        /**
         *    Tests a regex match.
         *    @param $pattern        Regex to match.
         *    @param $subject        String to search in.
         *    @param $message        Message to display.
         *    @public
         */
        function assertRegexp($pattern, $subject, $message = false) {
            parent::assert(new PatternExpectation($pattern), $subject, $message);
        }
        
        /**
         *    Sends an error which we interpret as a fail
         *    with a different message for compatibility.
         *    @param $message        Message to display.
         *    @public
         */
        function error($message) {
            parent::fail("Error triggered [$message]");
        }
         
        /**
         *    Accessor for name.
         *    @public
         */
       function name() {
            return $this->getLabel();
        }
    }
?>

--- NEW FILE: pear_test_case.php ---
<?php
    /**
     *	adapter for SimpleTest to use PEAR PHPUnit test cases
     *	@package	SimpleTest
     *	@subpackage Extensions
     *	@version	$Id: pear_test_case.php,v 1.1.2.1 2007/06/05 13:08:52 edeweerdt Exp $
     */
    
    /**#@+
     * include SimpleTest files
     */
    require_once(dirname(__FILE__) . '/../dumper.php');
    require_once(dirname(__FILE__) . '/../compatibility.php');
    require_once(dirname(__FILE__) . '/../test_case.php');
    require_once(dirname(__FILE__) . '/../expectation.php');
	/**#@-*/
   
    /**
     *    Adapter for PEAR PHPUnit test case to allow
     *    legacy PEAR test cases to be used with SimpleTest.
     *    @package      SimpleTest
     *    @subpackage   Extensions
     */
    class PHPUnit_TestCase extends SimpleTestCase {
        var $_loosely_typed;
        
        /**
         *    Constructor. Sets the test name.
         *    @param $label        Test name to display.
         *    @public
         */
        function PHPUnit_TestCase($label = false) {
            $this->SimpleTestCase($label);
            $this->_loosely_typed = false;
        }
        
        /**
         *    Will test straight equality if set to loose
         *    typing, or identity if not.
         *    @param $first          First value.
         *    @param $second         Comparison value.
         *    @param $message        Message to display.
         *    @public
         */
        function assertEquals($first, $second, $message = "%s", $delta = 0) {
            if ($this->_loosely_typed) {
                $expectation = &new EqualExpectation($first);
            } else {
                $expectation = &new IdenticalExpectation($first);
            }
            $this->assert($expectation, $second, $message);
        }
        
        /**
         *    Passes if the value tested is not null.
         *    @param $value          Value to test against.
         *    @param $message        Message to display.
         *    @public
         */
        function assertNotNull($value, $message = "%s") {
            parent::assert(new TrueExpectation(), isset($value), $message);
        }
        
        /**
         *    Passes if the value tested is null.
         *    @param $value          Value to test against.
         *    @param $message        Message to display.
         *    @public
         */
        function assertNull($value, $message = "%s") {
            parent::assert(new TrueExpectation(), !isset($value), $message);
        }
        
        /**
         *    In PHP5 the identity test tests for the same
         *    object. This is a reference test in PHP4.
         *    @param $first          First object handle.
         *    @param $second         Hopefully the same handle.
         *    @param $message        Message to display.
         *    @public
         */
        function assertSame(&$first, &$second, $message = "%s") {
            $dumper = &new SimpleDumper();
            $message = sprintf(
                    $message,
                    "[" . $dumper->describeValue($first) .
                            "] and [" . $dumper->describeValue($second) .
                            "] should reference the same object");
            return $this->assert(
					new TrueExpectation(),
                    SimpleTestCompatibility::isReference($first, $second),
                    $message);
        }
        
        /**
         *    In PHP5 the identity test tests for the same
         *    object. This is a reference test in PHP4.
         *    @param $first          First object handle.
         *    @param $second         Hopefully a different handle.
         *    @param $message        Message to display.
         *    @public
         */
        function assertNotSame(&$first, &$second, $message = "%s") {
            $dumper = &new SimpleDumper();
            $message = sprintf(
                    $message,
                    "[" . $dumper->describeValue($first) .
                            "] and [" . $dumper->describeValue($second) .
                            "] should not be the same object");
            return $this->assert(
					new falseExpectation(),
                    SimpleTestCompatibility::isReference($first, $second),
                    $message);
        }
        
        /**
         *    Sends pass if the test condition resolves true,
         *    a fail otherwise.
         *    @param $condition      Condition to test true.
         *    @param $message        Message to display.
         *    @public
         */
        function assertTrue($condition, $message = "%s") {
            parent::assert(new TrueExpectation(), $condition, $message);
        }
        
        /**
         *    Sends pass if the test condition resolves false,
         *    a fail otherwise.
         *    @param $condition      Condition to test false.
         *    @param $message        Message to display.
         *    @public
         */
        function assertFalse($condition, $message = "%s") {
            parent::assert(new FalseExpectation(), $condition, $message);
        }
        
        /**
         *    Tests a regex match. Needs refactoring.
         *    @param $pattern        Regex to match.
         *    @param $subject        String to search in.
         *    @param $message        Message to display.
         *    @public
         */
        function assertRegExp($pattern, $subject, $message = "%s") {
            $this->assert(new PatternExpectation($pattern), $subject, $message);
        }
        
        /**
         *    Tests the type of a value.
         *    @param $value          Value to take type of.
         *    @param $type           Hoped for type.
         *    @param $message        Message to display.
         *    @public
         */
        function assertType($value, $type, $message = "%s") {
            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
        }
        
        /**
         *    Sets equality operation to act as a simple equal
         *    comparison only, allowing a broader range of
         *    matches.
         *    @param $loosely_typed     True for broader comparison.
         *    @public
         */
        function setLooselyTyped($loosely_typed) {
            $this->_loosely_typed = $loosely_typed;
        }

        /**
         *    For progress indication during
         *    a test amongst other things.
         *    @return            Usually one.
         *    @public
         */
        function countTestCases() {
            return $this->getSize();
        }
        
        /**
         *    Accessor for name, normally just the class
         *    name.
         *    @public
         */
        function getName() {
            return $this->getLabel();
        }
        
        /**
         *    Does nothing. For compatibility only.
         *    @param $name        Dummy
         *    @public
         */
        function setName($name) {
        }
    }
?>

Update of /cvsroot/tutos/tutos/php/projectreport
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/php/projectreport

Added Files:
      Tag: BRANCH-2-0
	projectreport_test.php 
Log Message:
TRY including TDD

--- NEW FILE: projectreport_test.php ---
<?php
//ini_set("include_path","..:/usr2/web/tutos2/include:../bugtracking");
$tutos['base'] = "../..";
ini_set("include_path","..");
include_once 'webelements.p3';
include_once 'permission.p3';
require_once('projectreport/projectreport.pinc');

require_once('../../include/simpletest/unit_tester.php');
require_once('../../include/simpletest/reporter.php');

class TestOfProjectReport extends UnitTestCase {

  function testGetLast2PeriodBefore() {
      $today = new TutosDateTime(-1);
      $periods = projectreport::getLast2periodBefore($today);
	  $this->dump($today,"Today");
      $this->dump($periods,"Periods");
      $this->assertTrue(1);
  }
}

$test = &new TestOfProjectReport();
$test->run(new HtmlReporter());
?>

Update of /cvsroot/tutos/tutos/include/simpletest/test/support/collector
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest/test/support/collector

Added Files:
      Tag: BRANCH-2-0
	collectable.1 collectable.2 
Log Message:
TRY including TDD

--- NEW FILE: collectable.1 ---

--- NEW FILE: collectable.2 ---

Update of /cvsroot/tutos/tutos/include/simpletest/test/support
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest/test/support

Added Files:
      Tag: BRANCH-2-0
	latin1_sample upload_sample.txt 
	supplementary_upload_sample.txt spl_examples.php 
Log Message:
TRY including TDD

--- NEW FILE: latin1_sample ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: upload_sample.txt ---
Sample for testing file upload
--- NEW FILE: supplementary_upload_sample.txt ---
Some more text content
--- NEW FILE: spl_examples.php ---
<?php
    // $Id: spl_examples.php,v 1.1.2.1 2007/06/05 13:08:52 edeweerdt Exp $

    class IteratorImplementation implements Iterator {
        function current() { }
        function next() { }
        function key() { }
        function valid() { }
        function rewind() { }
    }

    class IteratorAggregateImplementation implements IteratorAggregate {
        function getIterator() { }
    }
?>

Update of /cvsroot/tutos/tutos/include/simpletest/test
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest/test

Added Files:
      Tag: BRANCH-2-0
	tag_test.php detached_test.php page_test.php 
	shell_tester_test.php remote_test.php live_test.php 
	expectation_test.php reflection_php4_test.php 
	interfaces_test.php form_test.php user_agent_test.php 
	acceptance_test.php adapter_test.php dumper_test.php 
	compatibility_test.php mock_objects_test.php 
	collector_test.php exceptions_test.php parse_error_test.php 
	visual_test.php test_groups.php socket_test.php 
	parser_test.php reflection_php5_test.php 
	test_with_parse_error.php errors_test.php unit_tester_test.php 
	shell_test.php xml_test.php cookies_test.php frames_test.php 
	simpletest_test.php browser_test.php http_test.php 
	unit_tests.php encoding_test.php url_test.php 
	web_tester_test.php all_tests.php authentication_test.php 
Log Message:
TRY including TDD

--- NEW FILE: exceptions_test.php ---
<?php
    require_once(dirname(__FILE__) . '/../exceptions.php');
    require_once(dirname(__FILE__) . '/../expectation.php');
    require_once(dirname(__FILE__) . '/../test_case.php');
    Mock::generate('SimpleTestCase');
    Mock::generate('SimpleExpectation');

    class MyTestException extends Exception {}
    class HigherTestException extends MyTestException {}
    class OtherTestException extends Exception {}

    class TestOfExceptionExpectation extends UnitTestCase {

        function testExceptionClassAsStringWillMatchExceptionsRootedOnThatClass() {
            $expectation = new ExceptionExpectation('MyTestException');
            $this->assertTrue($expectation->test(new MyTestException()));
            $this->assertTrue($expectation->test(new HigherTestException()));
            $this->assertFalse($expectation->test(new OtherTestException()));
        }

        function testMatchesClassAndMessageWhenExceptionExpected() {
            $expectation = new ExceptionExpectation(new MyTestException('Hello'));
            $this->assertTrue($expectation->test(new MyTestException('Hello')));
            $this->assertFalse($expectation->test(new HigherTestException('Hello')));
            $this->assertFalse($expectation->test(new OtherTestException('Hello')));
            $this->assertFalse($expectation->test(new MyTestException('Goodbye')));
            $this->assertFalse($expectation->test(new MyTestException()));
        }

        function testMessagelessExceptionMatchesOnlyOnClass() {
            $expectation = new ExceptionExpectation(new MyTestException());
            $this->assertTrue($expectation->test(new MyTestException()));
            $this->assertFalse($expectation->test(new HigherTestException()));
        }
    }

    class TestOfExceptionTrap extends UnitTestCase {

        function testNoExceptionsInQueueMeansNoTestMessages() {
            $test = new MockSimpleTestCase();
            $test->expectNever('assert');
            $queue = new SimpleExceptionTrap();
            $this->assertFalse($queue->isExpected($test, new Exception()));
        }

        function testMatchingExceptionGivesTrue() {
            $expectation = new MockSimpleExpectation();
            $expectation->setReturnValue('test', true);
            $test = new MockSimpleTestCase();
            $test->setReturnValue('assert', true);
            $queue = new SimpleExceptionTrap();
            $queue->expectException($expectation, 'message');
            $this->assertTrue($queue->isExpected($test, new Exception()));
        }

        function testMatchingExceptionTriggersAssertion() {
            $test = new MockSimpleTestCase();
            $test->expectOnce('assert', array(
                    '*',
                    new ExceptionExpectation(new Exception()),
                    'message'));
            $queue = new SimpleExceptionTrap();
            $queue->expectException(new ExceptionExpectation(new Exception()), 'message');
            $queue->isExpected($test, new Exception());
        }
    }

    class TestOfCatchingExceptions extends UnitTestCase {

        function testCanCatchAnyExpectedException() {
            $this->expectException();
            throw new Exception();
        }

        function testCanMatchExceptionByClass() {
            $this->expectException('MyTestException');
            throw new HigherTestException();
        }

        function testCanMatchExceptionExactly() {
            $this->expectException(new Exception('Ouch'));
            throw new Exception('Ouch');
        }

        function testLastListedExceptionIsTheOneThatCounts() {
            $this->expectException('OtherTestException');
            $this->expectException('MyTestException');
            throw new HigherTestException();
        }
    }
?>
--- NEW FILE: browser_test.php ---
<?php
    // $Id: browser_test.php,v 1.1.2.1 2007/06/05 13:08:50 edeweerdt Exp $

    require_once(dirname(__FILE__) . '/../browser.php');
    require_once(dirname(__FILE__) . '/../user_agent.php');
    require_once(dirname(__FILE__) . '/../http.php');
    require_once(dirname(__FILE__) . '/../page.php');
    require_once(dirname(__FILE__) . '/../encoding.php');

    Mock::generate('SimpleHttpResponse');
    Mock::generate('SimplePage');
    Mock::generate('SimpleForm');
    Mock::generate('SimpleUserAgent');
    Mock::generatePartial(
            'SimpleBrowser',
            'MockParseSimpleBrowser',
            array('_createUserAgent', '_parse'));
    Mock::generatePartial(
            'SimpleBrowser',
            'MockUserAgentSimpleBrowser',
            array('_createUserAgent'));

    class TestOfHistory extends UnitTestCase {

        function testEmptyHistoryHasFalseContents() {
            $history = &new SimpleBrowserHistory();
            $this->assertIdentical($history->getUrl(), false);
            $this->assertIdentical($history->getParameters(), false);
        }

        function testCannotMoveInEmptyHistory() {
            $history = &new SimpleBrowserHistory();
            $this->assertFalse($history->back());
            $this->assertFalse($history->forward());
        }

        function testCurrentTargetAccessors() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.here.com/'),
                    new SimpleGetEncoding());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.here.com/'));
            $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
        }

        function testSecondEntryAccessors() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $history->recordEntry(
                    new SimpleUrl('http://www.second.com/'),
                    new SimplePostEncoding(array('a' => 1)));
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
            $this->assertIdentical(
                    $history->getParameters(),
                    new SimplePostEncoding(array('a' => 1)));
        }

        function testGoingBackwards() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $history->recordEntry(
                    new SimpleUrl('http://www.second.com/'),
                    new SimplePostEncoding(array('a' => 1)));
            $this->assertTrue($history->back());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
            $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
        }

        function testGoingBackwardsOffBeginning() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $this->assertFalse($history->back());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
            $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
        }

        function testGoingForwardsOffEnd() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $this->assertFalse($history->forward());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
            $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
        }

        function testGoingBackwardsAndForwards() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $history->recordEntry(
                    new SimpleUrl('http://www.second.com/'),
                    new SimplePostEncoding(array('a' => 1)));
            $this->assertTrue($history->back());
            $this->assertTrue($history->forward());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
            $this->assertIdentical(
                    $history->getParameters(),
                    new SimplePostEncoding(array('a' => 1)));
        }

        function testNewEntryReplacesNextOne() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $history->recordEntry(
                    new SimpleUrl('http://www.second.com/'),
                    new SimplePostEncoding(array('a' => 1)));
            $history->back();
            $history->recordEntry(
                    new SimpleUrl('http://www.third.com/'),
                    new SimpleGetEncoding());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.third.com/'));
            $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
        }

        function testNewEntryDropsFutureEntries() {
            $history = &new SimpleBrowserHistory();
            $history->recordEntry(
                    new SimpleUrl('http://www.first.com/'),
                    new SimpleGetEncoding());
            $history->recordEntry(
                    new SimpleUrl('http://www.second.com/'),
                    new SimpleGetEncoding());
            $history->recordEntry(
                    new SimpleUrl('http://www.third.com/'),
                    new SimpleGetEncoding());
            $history->back();
            $history->back();
            $history->recordEntry(
                    new SimpleUrl('http://www.fourth.com/'),
                    new SimpleGetEncoding());
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.fourth.com/'));
            $this->assertFalse($history->forward());
            $history->back();
            $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
            $this->assertFalse($history->back());
        }
    }

    class TestOfParsedPageAccess extends UnitTestCase {

        function &loadPage(&$page) {
            $response = &new MockSimpleHttpResponse($this);

            $agent = &new MockSimpleUserAgent($this);
            $agent->setReturnReference('fetchResponse', $response);

            $browser = &new MockParseSimpleBrowser($this);
            $browser->setReturnReference('_createUserAgent', $agent);
            $browser->setReturnReference('_parse', $page);
            $browser->SimpleBrowser();

            $browser->get('http://this.com/page.html');
            return $browser;
        }

        function testAccessorsWhenNoPage() {
            $agent = &new MockSimpleUserAgent($this);

            $browser = &new MockParseSimpleBrowser($this);
            $browser->setReturnReference('_createUserAgent', $agent);
            $browser->SimpleBrowser();

            $this->assertEqual($browser->getContent(), '');
        }

        function testParse() {
            $page = &new MockSimplePage();
            $page->setReturnValue('getRequest', "GET here.html\r\n\r\n");
            $page->setReturnValue('getRaw', 'Raw HTML');
            $page->setReturnValue('getTitle', 'Here');
            $page->setReturnValue('getFrameFocus', 'Frame');
            $page->setReturnValue('getMimeType', 'text/html');
            $page->setReturnValue('getResponseCode', 200);
            $page->setReturnValue('getAuthentication', 'Basic');
            $page->setReturnValue('getRealm', 'Somewhere');
            $page->setReturnValue('getTransportError', 'Ouch!');

            $browser = &$this->loadPage($page);

            $this->assertEqual($browser->getRequest(), "GET here.html\r\n\r\n");
            $this->assertEqual($browser->getContent(), 'Raw HTML');
            $this->assertEqual($browser->getTitle(), 'Here');
            $this->assertEqual($browser->getFrameFocus(), 'Frame');
            $this->assertIdentical($browser->getResponseCode(), 200);
            $this->assertEqual($browser->getMimeType(), 'text/html');
            $this->assertEqual($browser->getAuthentication(), 'Basic');
            $this->assertEqual($browser->getRealm(), 'Somewhere');
            $this->assertEqual($browser->getTransportError(), 'Ouch!');
        }

        function testLinkAffirmationWhenPresent() {
            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlsByLabel', array('http://www.nowhere.com'));
            $page->expectOnce('getUrlsByLabel', array('a link label'));
            $browser = &$this->loadPage($page);
            $this->assertIdentical($browser->getLink('a link label'), 'http://www.nowhere.com');
        }

        function testLinkAffirmationByIdWhenPresent() {
            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlById', 'a_page.com', array(99));
            $page->setReturnValue('getUrlById', false, array('*'));
            $browser = &$this->loadPage($page);
            $this->assertIdentical($browser->getLinkById(99), 'a_page.com');
            $this->assertFalse($browser->getLinkById(98));
        }

        function testSettingFieldIsPassedToPage() {
            $page = &new MockSimplePage();
            $page->expectOnce('setField', array(new SimpleByLabelOrName('key'), 'Value'));
            $page->setReturnValue('getField', 'Value');
            $browser = &$this->loadPage($page);
            $this->assertEqual($browser->getField('key'), 'Value');
            $browser->setField('key', 'Value');
        }
    }

    class TestOfBrowserNavigation extends UnitTestCase {

        function &createBrowser(&$agent, &$page) {
            $browser = &new MockParseSimpleBrowser();
            $browser->setReturnReference('_createUserAgent', $agent);
            $browser->setReturnReference('_parse', $page);
            $browser->SimpleBrowser();
            return $browser;
        }

        function testClickLinkRequestsPage() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(
                    0,
                    'fetchResponse',
                    array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
            $agent->expectArgumentsAt(
                    1,
                    'fetchResponse',
                    array(new SimpleUrl('http://this.com/new.html'), new SimpleGetEncoding()));
            $agent->expectCallCount('fetchResponse', 2);

            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlsByLabel', array(new SimpleUrl('http://this.com/new.html')));
            $page->expectOnce('getUrlsByLabel', array('New'));
            $page->setReturnValue('getRaw', 'A page');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickLink('New'));
        }

        function testClickLinkWithUnknownFrameStillRequestsWholePage() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(
                    0,
                    'fetchResponse',
                    array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
            $target = new SimpleUrl('http://this.com/new.html');
            $target->setTarget('missing');
            $agent->expectArgumentsAt(
                    1,
                    'fetchResponse',
                    array($target, new SimpleGetEncoding()));
            $agent->expectCallCount('fetchResponse', 2);

            $parsed_url = new SimpleUrl('http://this.com/new.html');
            $parsed_url->setTarget('missing');

            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlsByLabel', array($parsed_url));
            $page->setReturnValue('hasFrames', false);
            $page->expectOnce('getUrlsByLabel', array('New'));
            $page->setReturnValue('getRaw', 'A page');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickLink('New'));
        }

        function testClickingMissingLinkFails() {
            $agent = &new MockSimpleUserAgent($this);
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlsByLabel', array());
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $this->assertTrue($browser->get('http://this.com/page.html'));
            $this->assertFalse($browser->clickLink('New'));
        }

        function testClickIndexedLink() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(
                    1,
                    'fetchResponse',
                    array(new SimpleUrl('1.html'), new SimpleGetEncoding()));
            $agent->expectCallCount('fetchResponse', 2);

            $page = &new MockSimplePage();
            $page->setReturnValue(
                    'getUrlsByLabel',
                    array(new SimpleUrl('0.html'), new SimpleUrl('1.html')));
            $page->setReturnValue('getRaw', 'A page');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickLink('New', 1));
        }

        function testClinkLinkById() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(1, 'fetchResponse', array(
                    new SimpleUrl('http://this.com/link.html'),
                    new SimpleGetEncoding()));
            $agent->expectCallCount('fetchResponse', 2);

            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlById', new SimpleUrl('http://this.com/link.html'));
            $page->expectOnce('getUrlById', array(2));
            $page->setReturnValue('getRaw', 'A page');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickLinkById(2));
        }

        function testClickingMissingLinkIdFails() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $page = &new MockSimplePage();
            $page->setReturnValue('getUrlById', false);

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertFalse($browser->clickLink(0));
        }

        function testSubmitFormByLabel() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(1, 'fetchResponse', array(
                    new SimpleUrl('http://this.com/handler.html'),
                    new SimplePostEncoding(array('a' => 'A'))));
            $agent->expectCallCount('fetchResponse', 2);

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
            $form->expectOnce('submitButton', array(new SimpleByLabel('Go'), false));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormBySubmit', $form);
            $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Go')));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickSubmit('Go'));
        }

        function testDefaultSubmitFormByLabel() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(1,  'fetchResponse', array(
                    new SimpleUrl('http://this.com/page.html'),
                    new SimpleGetEncoding(array('a' => 'A'))));
            $agent->expectCallCount('fetchResponse', 2);

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/page.html'));
            $form->setReturnValue('getMethod', 'get');
            $form->setReturnValue('submitButton', new SimpleGetEncoding(array('a' => 'A')));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormBySubmit', $form);
            $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Submit')));
            $page->setReturnValue('getRaw', 'stuff');
            $page->setReturnValue('getUrl', new SimpleUrl('http://this.com/page.html'));

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickSubmit());
        }

        function testSubmitFormByName() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormBySubmit', $form);
            $page->expectOnce('getFormBySubmit', array(new SimpleByName('me')));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickSubmitByName('me'));
        }

        function testSubmitFormById() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
            $form->expectOnce('submitButton', array(new SimpleById(99), false));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormBySubmit', $form);
            $page->expectOnce('getFormBySubmit', array(new SimpleById(99)));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickSubmitById(99));
        }

        function testSubmitFormByImageLabel() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
            $form->expectOnce('submitImage', array(new SimpleByLabel('Go!'), 10, 11, false));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormByImage', $form);
            $page->expectOnce('getFormByImage', array(new SimpleByLabel('Go!')));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickImage('Go!', 10, 11));
        }

        function testSubmitFormByImageName() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
            $form->expectOnce('submitImage', array(new SimpleByName('a'), 10, 11, false));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormByImage', $form);
            $page->expectOnce('getFormByImage', array(new SimpleByName('a')));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickImageByName('a', 10, 11));
        }

        function testSubmitFormByImageId() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
            $form->expectOnce('submitImage', array(new SimpleById(99), 10, 11, false));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormByImage', $form);
            $page->expectOnce('getFormByImage', array(new SimpleById(99)));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->clickImageById(99, 10, 11));
        }

        function testSubmitFormByFormId() {
            $agent = &new MockSimpleUserAgent();
            $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
            $agent->expectArgumentsAt(1, 'fetchResponse', array(
                    new SimpleUrl('http://this.com/handler.html'),
                    new SimplePostEncoding(array('a' => 'A'))));
            $agent->expectCallCount('fetchResponse', 2);

            $form = &new MockSimpleForm();
            $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
            $form->setReturnValue('getMethod', 'post');
            $form->setReturnValue('submit', new SimplePostEncoding(array('a' => 'A')));

            $page = &new MockSimplePage();
            $page->setReturnReference('getFormById', $form);
            $page->expectOnce('getFormById', array(33));
            $page->setReturnValue('getRaw', 'stuff');

            $browser = &$this->createBrowser($agent, $page);
            $browser->get('http://this.com/page.html');
            $this->assertTrue($browser->submitFormById(33));
        }
    }

    class TestOfBrowserFrames extends UnitTestCase {

        function &createBrowser(&$agent) {
            $browser = &new MockUserAgentSimpleBrowser();
            $browser->setReturnReference('_createUserAgent', $agent);
            $browser->SimpleBrowser();
            return $browser;
        }

        function &createUserAgent($pages) {
            $agent = &new MockSimpleUserAgent();
            foreach ($pages as $url => $raw) {
                $url = new SimpleUrl($url);
                $response = &new MockSimpleHttpResponse();
                $response->setReturnValue('getUrl', $url);
                $response->setReturnValue('getContent', $raw);
                $agent->setReturnReference('fetchResponse', $response, array($url, '*'));
            }
            return $agent;
        }

        function testSimplePageHasNoFrames() {
            $browser = &$this->createBrowser($this->createUserAgent(
                    array('http://site.with.no.frames/' => 'A non-framed page')));
            $this->assertEqual(
                    $browser->get('http://site.with.no.frames/'),
                    'A non-framed page');
            $this->assertIdentical($browser->getFrames(), 'http://site.with.no.frames/');
        }

        function testFramesetWithNoFrames() {
            $browser = &$this->createBrowser($this->createUserAgent(
                    array('http://site.with.no.frames/' => '<frameset></frameset>')));
            $this->assertEqual(
                    $browser->get('http://site.with.no.frames/'),
                    '');
            $this->assertIdentical($browser->getFrames(), array());
        }

        function testFramesetWithSingleFrame() {
            $frameset = '<frameset><frame name="a" src="frame.html"></frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.one.frame/' => $frameset,
                    'http://site.with.one.frame/frame.html' => 'A frame')));

            $this->assertEqual(
                    $browser->get('http://site.with.one.frame/'),
                    'A frame');
            $this->assertIdentical(
                    $browser->getFrames(),
                    array('a' => 'http://site.with.one.frame/frame.html'));
        }

        function testTitleTakenFromFramesetPage() {
            $frameset = '<title>Frameset title</title>' .
                    '<frameset><frame name="a" src="frame.html"></frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.one.frame/' => $frameset,
                    'http://site.with.one.frame/frame.html' => '<title>Page title</title>')));

            $browser->get('http://site.with.one.frame/');
            $this->assertEqual($browser->getTitle(), 'Frameset title');
        }

        function testFramesetWithSingleUnnamedFrame() {
            $frameset = '<frameset><frame src="frame.html"></frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.one.frame/' => $frameset,
                    'http://site.with.one.frame/frame.html' => 'One frame')));

            $this->assertEqual(
                    $browser->get('http://site.with.one.frame/'),
                    'One frame');
            $this->assertIdentical(
                    $browser->getFrames(),
                    array(1 => 'http://site.with.one.frame/frame.html'));
        }

        function testFramesetWithMultipleFrames() {
            $frameset = '<frameset>' .
                    '<frame name="a" src="frame_a.html">' .
                    '<frame name="b" src="frame_b.html">' .
                    '<frame name="c" src="frame_c.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.frames/' => $frameset,
                    'http://site.with.frames/frame_a.html' => 'A frame',
                    'http://site.with.frames/frame_b.html' => 'B frame',
                    'http://site.with.frames/frame_c.html' => 'C frame')));

            $this->assertEqual(
                    $browser->get('http://site.with.frames/'),
                    'A frameB frameC frame');
            $this->assertIdentical($browser->getFrames(), array(
                    'a' => 'http://site.with.frames/frame_a.html',
                    'b' => 'http://site.with.frames/frame_b.html',
                    'c' => 'http://site.with.frames/frame_c.html'));
        }

        function testFrameFocusByName() {
            $frameset = '<frameset>' .
                    '<frame name="a" src="frame_a.html">' .
                    '<frame name="b" src="frame_b.html">' .
                    '<frame name="c" src="frame_c.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.frames/' => $frameset,
                    'http://site.with.frames/frame_a.html' => 'A frame',
                    'http://site.with.frames/frame_b.html' => 'B frame',
                    'http://site.with.frames/frame_c.html' => 'C frame')));

            $browser->get('http://site.with.frames/');
            $browser->setFrameFocus('a');
            $this->assertEqual($browser->getContent(), 'A frame');
            $browser->setFrameFocus('b');
            $this->assertEqual($browser->getContent(), 'B frame');
            $browser->setFrameFocus('c');
            $this->assertEqual($browser->getContent(), 'C frame');
        }

        function testFramesetWithSomeNamedFrames() {
            $frameset = '<frameset>' .
                    '<frame name="a" src="frame_a.html">' .
                    '<frame src="frame_b.html">' .
                    '<frame name="c" src="frame_c.html">' .
                    '<frame src="frame_d.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.frames/' => $frameset,
                    'http://site.with.frames/frame_a.html' => 'A frame',
                    'http://site.with.frames/frame_b.html' => 'B frame',
                    'http://site.with.frames/frame_c.html' => 'C frame',
                    'http://site.with.frames/frame_d.html' => 'D frame')));

            $this->assertEqual(
                    $browser->get('http://site.with.frames/'),
                    'A frameB frameC frameD frame');
            $this->assertIdentical($browser->getFrames(), array(
                    'a' => 'http://site.with.frames/frame_a.html',
                    2 => 'http://site.with.frames/frame_b.html',
                    'c' => 'http://site.with.frames/frame_c.html',
                    4 => 'http://site.with.frames/frame_d.html'));
        }

        function testFrameFocusWithMixedNamesAndIndexes() {
            $frameset = '<frameset>' .
                    '<frame name="a" src="frame_a.html">' .
                    '<frame src="frame_b.html">' .
                    '<frame name="c" src="frame_c.html">' .
                    '<frame src="frame_d.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.frames/' => $frameset,
                    'http://site.with.frames/frame_a.html' => 'A frame',
                    'http://site.with.frames/frame_b.html' => 'B frame',
                    'http://site.with.frames/frame_c.html' => 'C frame',
                    'http://site.with.frames/frame_d.html' => 'D frame')));

            $browser->get('http://site.with.frames/');
            $browser->setFrameFocus('a');
            $this->assertEqual($browser->getContent(), 'A frame');
            $browser->setFrameFocus(2);
            $this->assertEqual($browser->getContent(), 'B frame');
            $browser->setFrameFocus('c');
            $this->assertEqual($browser->getContent(), 'C frame');
            $browser->setFrameFocus(4);
            $this->assertEqual($browser->getContent(), 'D frame');
            $browser->clearFrameFocus();
            $this->assertEqual($browser->getContent(), 'A frameB frameC frameD frame');
        }

        function testNestedFrameset() {
            $inner = '<frameset>' .
                    '<frame name="page" src="page.html">' .
                    '</frameset>';
            $outer = '<frameset>' .
                    '<frame name="inner" src="inner.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.nested.frame/' => $outer,
                    'http://site.with.nested.frame/inner.html' => $inner,
                    'http://site.with.nested.frame/page.html' => 'The page')));

            $this->assertEqual(
                    $browser->get('http://site.with.nested.frame/'),
                    'The page');
            $this->assertIdentical($browser->getFrames(), array(
                    'inner' => array(
                            'page' => 'http://site.with.nested.frame/page.html')));
        }

        function testCanNavigateToNestedFrame() {
            $inner = '<frameset>' .
                    '<frame name="one" src="one.html">' .
                    '<frame name="two" src="two.html">' .
                    '</frameset>';
            $outer = '<frameset>' .
                    '<frame name="inner" src="inner.html">' .
                    '<frame name="three" src="three.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.nested.frames/' => $outer,
                    'http://site.with.nested.frames/inner.html' => $inner,
                    'http://site.with.nested.frames/one.html' => 'Page one',
                    'http://site.with.nested.frames/two.html' => 'Page two',
                    'http://site.with.nested.frames/three.html' => 'Page three')));

            $browser->get('http://site.with.nested.frames/');
            $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');

            $this->assertTrue($browser->setFrameFocus('inner'));
            $this->assertEqual($browser->getFrameFocus(), array('inner'));
            $this->assertTrue($browser->setFrameFocus('one'));
            $this->assertEqual($browser->getFrameFocus(), array('inner', 'one'));
            $this->assertEqual($browser->getContent(), 'Page one');

            $this->assertTrue($browser->setFrameFocus('two'));
            $this->assertEqual($browser->getFrameFocus(), array('inner', 'two'));
            $this->assertEqual($browser->getContent(), 'Page two');

            $browser->clearFrameFocus();
            $this->assertTrue($browser->setFrameFocus('three'));
            $this->assertEqual($browser->getFrameFocus(), array('three'));
            $this->assertEqual($browser->getContent(), 'Page three');

            $this->assertTrue($browser->setFrameFocus('inner'));
            $this->assertEqual($browser->getContent(), 'Page onePage two');
        }

        function testCanNavigateToNestedFrameByIndex() {
            $inner = '<frameset>' .
                    '<frame src="one.html">' .
                    '<frame src="two.html">' .
                    '</frameset>';
            $outer = '<frameset>' .
                    '<frame src="inner.html">' .
                    '<frame src="three.html">' .
                    '</frameset>';
            $browser = &$this->createBrowser($this->createUserAgent(array(
                    'http://site.with.nested.frames/' => $outer,
                    'http://site.with.nested.frames/inner.html' => $inner,
                    'http://site.with.nested.frames/one.html' => 'Page one',
                    'http://site.with.nested.frames/two.html' => 'Page two',
                    'http://site.with.nested.frames/three.html' => 'Page three')));

            $browser->get('http://site.with.nested.frames/');
            $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');

            $this->assertTrue($browser->setFrameFocusByIndex(1));
            $this->assertEqual($browser->getFrameFocus(), array(1));
            $this->assertTrue($browser->setFrameFocusByIndex(1));
            $this->assertEqual($browser->getFrameFocus(), array(1, 1));
            $this->assertEqual($browser->getContent(), 'Page one');

            $this->assertTrue($browser->setFrameFocusByIndex(2));
            $this->assertEqual($browser->getFrameFocus(), array(1, 2));
            $this->assertEqual($browser->getContent(), 'Page two');

            $browser->clearFrameFocus();
            $this->assertTrue($browser->setFrameFocusByIndex(2));
            $this->assertEqual($browser->getFrameFocus(), array(2));
            $this->assertEqual($browser->getContent(), 'Page three');

            $this->assertTrue($browser->setFrameFocusByIndex(1));
            $this->assertEqual($browser->getContent(), 'Page onePage two');
        }
    }
?>
--- NEW FILE: detached_test.php ---
<?php
    // $Id: detached_test.php,v 1.1.2.1 2007/06/05 13:08:45 edeweerdt Exp $
    require_once('../detached.php');
    require_once('../reporter.php');

    // The following URL will depend on your own installation.
    $command = 'php ' . dirname(__FILE__) . '/visual_test.php xml';

    $test = &new TestSuite('Remote tests');
    $test->addTestCase(new DetachedTestCase($command));
    if (SimpleReporter::inCli()) {
        exit ($test->run(new TextReporter()) ? 0 : 1);
    }
    $test->run(new HtmlReporter());
?>
--- NEW FILE: expectation_test.php ---
<?php
    // $Id: expectation_test.php,v 1.1.2.1 2007/06/05 13:08:45 edeweerdt Exp $
    require_once(dirname(__FILE__) . '/../expectation.php');

    class TestOfEquality extends UnitTestCase {
        
        function testBoolean() {
            $is_true = &new EqualExpectation(true);
            $this->assertTrue($is_true->test(true));
            $this->assertFalse($is_true->test(false));
        }
        
        function testStringMatch() {
            $hello = &new EqualExpectation("Hello");
            $this->assertTrue($hello->test("Hello"));
            $this->assertFalse($hello->test("Goodbye"));
        }
        
        function testInteger() {
            $fifteen = &new EqualExpectation(15);
            $this->assertTrue($fifteen->test(15));
            $this->assertFalse($fifteen->test(14));
        }
        
        function testFloat() {
            $pi = &new EqualExpectation(3.14);
            $this->assertTrue($pi->test(3.14));
            $this->assertFalse($pi->test(3.15));
        }
        
        function testArray() {
            $colours = &new EqualExpectation(array("r", "g", "b"));
            $this->assertTrue($colours->test(array("r", "g", "b")));
            $this->assertFalse($colours->test(array("g", "b", "r")));
        }
        
        function testHash() {
            $is_blue = &new EqualExpectation(array("r" => 0, "g" => 0, "b" => 255));
            $this->assertTrue($is_blue->test(array("r" => 0, "g" => 0, "b" => 255)));
            $this->assertFalse($is_blue->test(array("r" => 0, "g" => 255, "b" => 0)));
        }
        
        function testHashWithOutOfOrderKeysShouldStillMatch() {
            $any_order = &new EqualExpectation(array('a' => 1, 'b' => 2));
            $this->assertTrue($any_order->test(array('b' => 2, 'a' => 1)));
        }
    }
    
    class TestOfWithin extends UnitTestCase {
        
        function testWithinFloatingPointMargin() {
            $within = new WithinMarginExpectation(1.0, 0.2);
            $this->assertFalse($within->test(0.7));
            $this->assertTrue($within->test(0.8));
            $this->assertTrue($within->test(0.9));
            $this->assertTrue($within->test(1.1));
            $this->assertTrue($within->test(1.2));
            $this->assertFalse($within->test(1.3));
        }
        
        function testOutsideFloatingPointMargin() {
            $within = new OutsideMarginExpectation(1.0, 0.2);
            $this->assertTrue($within->test(0.7));
            $this->assertFalse($within->test(0.8));
            $this->assertFalse($within->test(1.2));
            $this->assertTrue($within->test(1.3));
        }
    }
    
    class TestOfInequality extends UnitTestCase {
        
        function testStringMismatch() {
            $not_hello = &new NotEqualExpectation("Hello");
            $this->assertTrue($not_hello->test("Goodbye"));
            $this->assertFalse($not_hello->test("Hello"));
        }
    }
    
    class RecursiveNasty {
        var $_me;
        
        function RecursiveNasty() {
            $this->_me = $this;
        }
    }
    
    class TestOfIdentity extends UnitTestCase {
        
        function testType() {
            $string = &new IdenticalExpectation("37");
            $this->assertTrue($string->test("37"));
            $this->assertFalse($string->test(37));
            $this->assertFalse($string->test("38"));
        }
        
        function _testNastyPhp5Bug() {
            $this->assertFalse(new RecursiveNasty() != new RecursiveNasty());
        }
        
        function _testReallyHorribleRecursiveStructure() {
            $hopeful = &new IdenticalExpectation(new RecursiveNasty());
            $this->assertTrue($hopeful->test(new RecursiveNasty()));
        }
    }
    
    class TestOfNonIdentity extends UnitTestCase {
        
        function testType() {
            $string = &new NotIdenticalExpectation("37");
            $this->assertTrue($string->test("38"));
            $this->assertTrue($string->test(37));
            $this->assertFalse($string->test("37"));
        }
    }
    
    class TestOfPatterns extends UnitTestCase {
        
        function testWanted() {
            $pattern = &new PatternExpectation('/hello/i');
            $this->assertTrue($pattern->test("Hello world"));
            $this->assertFalse($pattern->test("Goodbye world"));
        }
        
        function testUnwanted() {
            $pattern = &new NoPatternExpectation('/hello/i');
            $this->assertFalse($pattern->test("Hello world"));
            $this->assertTrue($pattern->test("Goodbye world"));
        }
    }
    
    class ExpectedMethodTarget {
        function hasThisMethod() {}
    }

    class TestOfMethodExistence extends UnitTestCase {
        
        function testHasMethod() {
            $instance = &new ExpectedMethodTarget();
            $expectation = &new MethodExistsExpectation('hasThisMethod');
            $this->assertTrue($expectation->test($instance));
            $expectation = &new MethodExistsExpectation('doesNotHaveThisMethod');
            $this->assertFalse($expectation->test($instance));
        }
    }
    
    class TestOfIsA extends UnitTestCase {
        
        function testString() {
            $expectation = &new IsAExpectation('string');
            $this->assertTrue($expectation->test('Hello'));
            $this->assertFalse($expectation->test(5));
        }
        
        function testBoolean() {
            $expectation = &new IsAExpectation('boolean');
            $this->assertTrue($expectation->test(true));
            $this->assertFalse($expectation->test(1));
        }
        
        function testBool() {
            $expectation = &new IsAExpectation('bool');
            $this->assertTrue($expectation->test(true));
            $this->assertFalse($expectation->test(1));
        }
        
        function testDouble() {
            $expectation = &new IsAExpectation('double');
            $this->assertTrue($expectation->test(5.0));
            $this->assertFalse($expectation->test(5));
        }
        
        function testFloat() {
            $expectation = &new IsAExpectation('float');
            $this->assertTrue($expectation->test(5.0));
            $this->assertFalse($expectation->test(5));
        }
        
        function testReal() {
            $expectation = &new IsAExpectation('real');
            $this->assertTrue($expectation->test(5.0));
            $this->assertFalse($expectation->test(5));
        }
        
        function testInteger() {
            $expectation = &new IsAExpectation('integer');
            $this->assertTrue($expectation->test(5));
            $this->assertFalse($expectation->test(5.0));
        }
        
        function testInt() {
            $expectation = &new IsAExpectation('int');
            $this->assertTrue($expectation->test(5));
            $this->assertFalse($expectation->test(5.0));
        }
    }
    
    class TestOfNotA extends UnitTestCase {
        
        function testString() {
            $expectation = &new NotAExpectation('string');
            $this->assertFalse($expectation->test('Hello'));
            $this->assertTrue($expectation->test(5));
        }
    }
?>
--- NEW FILE: remote_test.php ---
<?php
    // $Id: remote_test.php,v 1.1.2.1 2007/06/05 13:08:45 edeweerdt Exp $
    require_once('../remote.php');
    require_once('../reporter.php');

    // The following URL will depend on your own installation.
    if (isset($_SERVER['SCRIPT_URI'])) {
        $base_uri = $_SERVER['SCRIPT_URI'];
    } elseif (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['PHP_SELF'])) {
        $base_uri = 'http://'. $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
    };
    $test_url = str_replace('remote_test.php', 'visual_test.php', $base_uri);

    $test = &new TestSuite('Remote tests');
    $test->addTestCase(new RemoteTestCase($test_url . '?xml=yes', $test_url . '?xml=yes&dry=yes'));
    if (SimpleReporter::inCli()) {
        exit ($test->run(new TextReporter()) ? 0 : 1);
    }
    $test->run(new HtmlReporter());
?>
--- NEW FILE: parser_test.php ---
<?php
    // $Id: parser_test.php,v 1.1.2.1 2007/06/05 13:08:48 edeweerdt Exp $
    
    require_once(dirname(__FILE__) . '/../parser.php');
    Mock::generate('SimpleHtmlSaxParser');
    Mock::generate('SimpleSaxListener');

    class TestOfParallelRegex extends UnitTestCase {
        
        function testNoPatterns() {
            $regex = &new ParallelRegex(false);
            $this->assertFalse($regex->match("Hello", $match));
            $this->assertEqual($match, "");
        }
        
        function testNoSubject() {
            $regex = &new ParallelRegex(false);
            $regex->addPattern(".*");
            $this->assertTrue($regex->match("", $match));
            $this->assertEqual($match, "");
        }
        
        function testMatchAll() {
            $regex = &new ParallelRegex(false);
            $regex->addPattern(".*");
            $this->assertTrue($regex->match("Hello", $match));
            $this->assertEqual($match, "Hello");
        }
        
        function testCaseSensitive() {
            $regex = &new ParallelRegex(true);
            $regex->addPattern("abc");
            $this->assertTrue($regex->match("abcdef", $match));
            $this->assertEqual($match, "abc");
            $this->assertTrue($regex->match("AAABCabcdef", $match));
            $this->assertEqual($match, "abc");
        }
        
        function testCaseInsensitive() {
            $regex = &new ParallelRegex(false);
            $regex->addPattern("abc");
            $this->assertTrue($regex->match("abcdef", $match));
            $this->assertEqual($match, "abc");
            $this->assertTrue($regex->match("AAABCabcdef", $match));
            $this->assertEqual($match, "ABC");
        }
        
        function testMatchMultiple() {
            $regex = &new ParallelRegex(true);
            $regex->addPattern("abc");
            $regex->addPattern("ABC");
            $this->assertTrue($regex->match("abcdef", $match));
            $this->assertEqual($match, "abc");
            $this->assertTrue($regex->match("AAABCabcdef", $match));
            $this->assertEqual($match, "ABC");
            $this->assertFalse($regex->match("Hello", $match));
        }
        
        function testPatternLabels() {
            $regex = &new ParallelRegex(false);
            $regex->addPattern("abc", "letter");
            $regex->addPattern("123", "number");
            $this->assertIdentical($regex->match("abcdef", $match), "letter");
            $this->assertEqual($match, "abc");
            $this->assertIdentical($regex->match("0123456789", $match), "number");
            $this->assertEqual($match, "123");
        }
    }
    
    class TestOfStateStack extends UnitTestCase {
        
        function testStartState() {
            $stack = &new SimpleStateStack("one");
            $this->assertEqual($stack->getCurrent(), "one");
        }
        
        function testExhaustion() {
            $stack = &new SimpleStateStack("one");
            $this->assertFalse($stack->leave());
        }
        
        function testStateMoves() {
            $stack = &new SimpleStateStack("one");
            $stack->enter("two");
            $this->assertEqual($stack->getCurrent(), "two");
            $stack->enter("three");
            $this->assertEqual($stack->getCurrent(), "three");
            $this->assertTrue($stack->leave());
            $this->assertEqual($stack->getCurrent(), "two");
            $stack->enter("third");
            $this->assertEqual($stack->getCurrent(), "third");
            $this->assertTrue($stack->leave());
            $this->assertTrue($stack->leave());
            $this->assertEqual($stack->getCurrent(), "one");
        }
    }
    
    class TestParser {
        
        function accept() {
        }
        
        function a() {
        }
        
        function b() {
        }
    }
    Mock::generate('TestParser');

    class TestOfLexer extends UnitTestCase {
        
        function testEmptyPage() {
            $handler = &new MockTestParser();
            $handler->expectNever("accept");
            $handler->setReturnValue("accept", true);
            $handler->expectNever("accept");
            $handler->setReturnValue("accept", true);
            $lexer = &new SimpleLexer($handler);
            $lexer->addPattern("a+");
            $this->assertTrue($lexer->parse(""));
        }
        
        function testSinglePattern() {
            $handler = &new MockTestParser();
            $handler->expectArgumentsAt(0, "accept", array("aaa", LEXER_MATCHED));
            $handler->expectArgumentsAt(1, "accept", array("x", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(2, "accept", array("a", LEXER_MATCHED));
            $handler->expectArgumentsAt(3, "accept", array("yyy", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(4, "accept", array("a", LEXER_MATCHED));
            $handler->expectArgumentsAt(5, "accept", array("x", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(6, "accept", array("aaa", LEXER_MATCHED));
            $handler->expectArgumentsAt(7, "accept", array("z", LEXER_UNMATCHED));
            $handler->expectCallCount("accept", 8);
            $handler->setReturnValue("accept", true);
            $lexer = &new SimpleLexer($handler);
            $lexer->addPattern("a+");
            $this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
        }
        
        function testMultiplePattern() {
            $handler = &new MockTestParser();
            $target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
            for ($i = 0; $i < count($target); $i++) {
                $handler->expectArgumentsAt($i, "accept", array($target[$i], '*'));
            }
            $handler->expectCallCount("accept", count($target));
            $handler->setReturnValue("accept", true);
            $lexer = &new SimpleLexer($handler);
            $lexer->addPattern("a+");
            $lexer->addPattern("b+");
            $this->assertTrue($lexer->parse("ababbxbaxxxxxxax"));
        }
    }

    class TestOfLexerModes extends UnitTestCase {
        
        function testIsolatedPattern() {
            $handler = &new MockTestParser();
            $handler->expectArgumentsAt(0, "a", array("a", LEXER_MATCHED));
            $handler->expectArgumentsAt(1, "a", array("b", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(2, "a", array("aa", LEXER_MATCHED));
            $handler->expectArgumentsAt(3, "a", array("bxb", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(4, "a", array("aaa", LEXER_MATCHED));
            $handler->expectArgumentsAt(5, "a", array("x", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(6, "a", array("aaaa", LEXER_MATCHED));
            $handler->expectArgumentsAt(7, "a", array("x", LEXER_UNMATCHED));
            $handler->expectCallCount("a", 8);
            $handler->setReturnValue("a", true);
            $lexer = &new SimpleLexer($handler, "a");
            $lexer->addPattern("a+", "a");
            $lexer->addPattern("b+", "b");
            $this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
        }
        
        function testModeChange() {
            $handler = &new MockTestParser();
            $handler->expectArgumentsAt(0, "a", array("a", LEXER_MATCHED));
            $handler->expectArgumentsAt(1, "a", array("b", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(2, "a", array("aa", LEXER_MATCHED));
            $handler->expectArgumentsAt(3, "a", array("b", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(4, "a", array("aaa", LEXER_MATCHED));
            $handler->expectArgumentsAt(0, "b", array(":", LEXER_ENTER));
            $handler->expectArgumentsAt(1, "b", array("a", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(2, "b", array("b", LEXER_MATCHED));
            $handler->expectArgumentsAt(3, "b", array("a", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(4, "b", array("bb", LEXER_MATCHED));
            $handler->expectArgumentsAt(5, "b", array("a", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(6, "b", array("bbb", LEXER_MATCHED));
            $handler->expectArgumentsAt(7, "b", array("a", LEXER_UNMATCHED));
            $handler->expectCallCount("a", 5);
            $handler->expectCallCount("b", 8);
            $handler->setReturnValue("a", true);
            $handler->setReturnValue("b", true);
            $lexer = &new SimpleLexer($handler, "a");
            $lexer->addPattern("a+", "a");
            $lexer->addEntryPattern(":", "a", "b");
            $lexer->addPattern("b+", "b");
            $this->assertTrue($lexer->parse("abaabaaa:ababbabbba"));
        }
        
        function testNesting() {
            $handler = &new MockTestParser();
            $handler->setReturnValue("a", true);
            $handler->setReturnValue("b", true);
            $handler->expectArgumentsAt(0, "a", array("aa", LEXER_MATCHED));
            $handler->expectArgumentsAt(1, "a", array("b", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(2, "a", array("aa", LEXER_MATCHED));
            $handler->expectArgumentsAt(3, "a", array("b", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(0, "b", array("(", LEXER_ENTER));
            $handler->expectArgumentsAt(1, "b", array("bb", LEXER_MATCHED));
            $handler->expectArgumentsAt(2, "b", array("a", LEXER_UNMATCHED));
            $handler->expectArgumentsAt(3, "b", array("bb", LEXER_MATCHED));
            $handler->expectArgumentsAt(4, "b", array(")", LEXER_EXIT));
            $handler->expectArgumentsAt(4, "a", array("aa", LEXER_MATCHED));
            $handler->expectArgumentsAt(5, "a", array("b", LEXER_UNMATCHED));
            $handler...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/include/simpletest/docs/fr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest/docs/fr

Added Files:
      Tag: BRANCH-2-0
	authentication_documentation.html overview.html 
	browser_documentation.html expectation_documentation.html 
	partial_mocks_documentation.html unit_test_documentation.html 
	mock_objects_documentation.html index.html docs.css 
	group_test_documentation.html web_tester_documentation.html 
	form_testing_documentation.html reporter_documentation.html 
	server_stubs_documentation.html 
Log Message:
TRY including TDD

--- NEW FILE: expectation_documentation.html ---
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Documentation SimpleTest : &eacute;tendre le testeur unitaire avec des classes d'attentes suppl&eacute;mentaires</title>
<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
</head>
<body>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<h1>Documentation sur les attentes</h1>
        This page...
        <ul>
<li>
            Utiliser les attentes <a href="#fantaisie">pour des tests plus pr&eacute;cis avec des objets fantaisie</a>
        </li>
<li>
            <a href="#comportement">Changer le comportement d'un objet fantaisie</a> avec des attentes
        </li>
<li>
            <a href="#etendre">Cr&eacute;er des attentes</a>
        </li>
<li>
            Par dessous SimpleTest <a href="#unitaire">utilise des classes d'attente</a>
        </li>
</ul>
<div class="content">
        <p>
<a class="target" name="fantaisie">
<h2>Plus de contr&ocirc;le sur les objets fantaisie</h2>
</a>
</p>
            <p>
                Le comportement par d&eacute;faut des <a href="mock_objects_documentation.html">objets fantaisie</a> dans <a href="SimpleTest" rel="nofollow">http://sourceforge.net/projects/simpletest/">SimpleTest</a> est soit une correspondance identique sur l'argument, soit l'acceptation de n'importe quel argument. Pour la plupart des tests, c'est suffisant. Cependant il est parfois n&eacute;cessaire de ramollir un sc&eacute;nario de test.
            </p>
            <p>
                Un des endroits o&ugrave; un test peut &ecirc;tre trop serr&eacute; est la reconnaissance textuelle. Prenons l'exemple d'un composant qui produirait un message d'erreur utile lorsque quelque chose plante. Il serait utile de tester que l'erreur correcte est renvoy&eacute;e, mais le texte proprement dit risque d'&ecirc;tre plut&ocirc;t long. Si vous testez le texte dans son ensemble alors &agrave; chaque modification de ce m&ecirc;me message -- m&ecirc;me un point ou une virgule -- vous aurez &agrave; revenir sur la suite de test pour la modifier.
            </p>
            <p>
                Voici un cas concret, nous avons un service d'actualit&eacute;s qui a &eacute;chou&eacute; dans sa tentative de connexion &agrave; sa source distante.
<pre>
<strong>class NewsService {
    ...
    function publish(&amp;$writer) {
        if (! $this-&gt;isConnected()) {
            $writer-&gt;write('Cannot connect to news service "' .
                    $this-&gt;_name . '" at this time. ' .
                    'Please try again later.');
        }
        ...
    }
}</strong>
</pre>
                L&agrave; il envoie son contenu vers un classe <span class="new_code">Writer</span>. Nous pourrions tester ce comportement avec un <span class="new_code">MockWriter</span>...
<pre>
class TestOfNewsService extends UnitTestCase {
    ...
    function testConnectionFailure() {<strong>
        $writer = &amp;new MockWriter($this);
        $writer-&gt;expectOnce('write', array(
                'Cannot connect to news service ' .
                '"BBC News" at this time. ' .
                'Please try again later.'));
        
        $service = &amp;new NewsService('BBC News');
        $service-&gt;publish($writer);
        
        $writer-&gt;tally();</strong>
    }
}
</pre>
                C'est un bon exemple d'un test fragile. Si nous d&eacute;cidons d'ajouter des instructions compl&eacute;mentaires, par exemple proposer une source d'actualit&eacute;s alternative, nous casserons nos tests par la m&ecirc;me occasion sans pourtant avoir modifi&eacute; une seule fonctionnalit&eacute;.
            </p>
            <p>
                Pour contourner ce probl&egrave;me, nous voudrions utiliser un test avec une expression rationnelle plut&ocirc;t qu'une correspondance exacte. Nous pouvons y parvenir avec...
<pre>
class TestOfNewsService extends UnitTestCase {
    ...
    function testConnectionFailure() {
        $writer = &amp;new MockWriter($this);<strong>
        $writer-&gt;expectOnce(
                'write',
                array(new WantedPatternExpectation('/cannot connect/i')));</strong>
        
        $service = &amp;new NewsService('BBC News');
        $service-&gt;publish($writer);
        
        $writer-&gt;tally();
    }
}
</pre>
                Plut&ocirc;t que de transmettre le param&egrave;tre attendu au <span class="new_code">MockWriter</span>, nous envoyons une classe d'attente appel&eacute;e <span class="new_code">WantedPatternExpectation</span>. L'objet fantaisie est suffisamment &eacute;l&eacute;gant pour reconna&icirc;tre qu'il s'agit d'un truc sp&eacute;cial et pour le traiter diff&eacute;remment. Plut&ocirc;t que de comparer l'argument entrant &agrave; cet objet, il utilise l'objet attente lui-m&ecirc;me pour ex&eacute;cuter le test.
            </p>
            <p>
                <span class="new_code">WantedPatternExpectation</span> utilise l'expression rationnelle pour la comparaison avec son constructeur. A chaque fois qu'une comparaison est fait &agrave; travers <span class="new_code">MockWriter</span> par rapport &agrave; cette classe attente, elle fera un <span class="new_code">preg_match()</span> avec ce motif. Dans notre sc&eacute;nario de test ci-dessus, aussi longtemps que la cha&icirc;ne "cannot connect" appara&icirc;t dans le texte, la fantaisie transmettra un succ&egrave;s au testeur unitaire. Peu importe le reste du texte.
            </p>
            <p>
                Les classes attente possibles sont...
                <table>
<tbody>
                    <tr>
<td><span class="new_code">EqualExpectation</span></td><td>Une &eacute;galit&eacute;, plut&ocirc;t que la plus forte comparaison &agrave; l'identique</td>
</tr>
                    <tr>
<td><span class="new_code">NotEqualExpectation</span></td><td>Une comparaison sur la non-&eacute;galit&eacute;</td>
</tr>
                    <tr>
<td><span class="new_code">IndenticalExpectation</span></td><td>La v&eacute;rification par d&eacute;faut de l'objet fantaisie qui doit correspondre exactement</td>
</tr>
                    <tr>
<td><span class="new_code">NotIndenticalExpectation</span></td><td>Inverse la logique de l'objet fantaisie</td>
</tr>
                    <tr>
<td><span class="new_code">WantedPatternExpectation</span></td><td>Utilise une expression rationnelle Perl pour comparer une cha&icirc;ne</td>
</tr>
                    <tr>
<td><span class="new_code">NoUnwantedPatternExpectation</span></td><td>Passe seulement si l'expression rationnelle Perl &eacute;choue</td>
</tr>
                    <tr>
<td><span class="new_code">IsAExpectation</span></td><td>V&eacute;rifie le type ou le nom de la classe uniquement</td>
</tr>
                    <tr>
<td><span class="new_code">NotAExpectation</span></td><td>L'oppos&eacute; de <span class="new_code">IsAExpectation</span></td>
</tr>
                    <tr>
<td><span class="new_code">MethodExistsExpectation</span></td><td>V&eacute;rifie si la m&eacute;thode est disponible sur un objet</td>
</tr>
                </tbody>
</table>
                La plupart utilisent la valeur attendue dans le constructeur. Les exceptions sont les v&eacute;rifications sur motif, qui utilisent une expression rationnelle, ainsi que <span class="new_code">IsAExpectation</span> et <span class="new_code">NotAExpectation</span>, qui prennent un type ou un nom de classe comme cha&icirc;ne.
            </p>
        
        <p>
<a class="target" name="comportement">
<h2>Utiliser les attentes pour contr&ocirc;ler les bouchons serveur</h2>
</a>
</p>
            <p>
                Les classes attente peuvent servir &agrave; autre chose que l'envoi d'assertions depuis les objets fantaisie, afin de choisir le comportement d'un <a href="mock_objects_documentation.html">objet fantaisie</a> ou celui d'un <a href="server_stubs_documentation.html">bouchon serveur</a>. A chaque fois qu'une liste d'arguments est donn&eacute;e, une liste d'objets d'attente peut &ecirc;tre ins&eacute;r&eacute;e &agrave; la place.
            </p>
            <p>
                Mettons que nous voulons qu'un bouchon serveur d'autorisation simule une connexion r&eacute;ussie seulement si il re&ccedil;oit un objet de session valide. Nous pouvons y arriver avec ce qui suit...
<pre>
Stub::generate('Authorisation');
<strong>
$authorisation = new StubAuthorisation();
$authorisation-&gt;setReturnValue(
        'isAllowed',
        true,
        array(new IsAExpectation('Session', 'Must be a session')));
$authorisation-&gt;setReturnValue('isAllowed', false);</strong>
</pre>
                Le comportement par d&eacute;faut du bouchon serveur est d&eacute;fini pour renvoyer <span class="new_code">false</span> quand <span class="new_code">isAllowed</span> est appel&eacute;. Lorsque nous appelons cette m&eacute;thode avec un unique param&egrave;tre qui est un objet <span class="new_code">Session</span>, il renverra <span class="new_code">true</span>. Nous avons aussi ajout&eacute; un deuxi&egrave;me param&egrave;tre comme message. Il sera affich&eacute; dans le message d'erreur de l'objet fantaisie si l'attente est la cause de l'&eacute;chec.
            </p>
            <p>
                Ce niveau de sophistication est rarement utile : il n'est inclut que pour &ecirc;tre complet.
            </p>
        
        <p>
<a class="target" name="etendre">
<h2>Cr&eacute;er vos propres attentes</h2>
</a>
</p>
            <p>
                Les classes d'attentes ont une structure tr&egrave;s simple. Tellement simple qu'il devient tr&egrave;s simple de cr&eacute;er vos propres version de logique pour des tests utilis&eacute;s couramment.
            </p>
            <p>
                Par exemple voici la cr&eacute;ation d'une classe pour tester la validit&eacute; d'adresses IP. Pour fonctionner correctement avec les bouchons serveurs et les objets fantaisie, cette nouvelle classe d'attente devrait &eacute;tendre <span class="new_code">SimpleExpectation</span>...
<pre>
<strong>class ValidIp extends SimpleExpectation {
    
    function test($ip) {
        return (ip2long($ip) != -1);
    }
    
    function testMessage($ip) {
        return "Address [$ip] should be a valid IP address";
    }
}</strong>
</pre> 
               Il n'y a v&eacute;ritablement que deux m&eacute;thodes &agrave; mettre en place. La m&eacute;thode <span class="new_code">test()</span> devrait renvoyer un <span class="new_code">true</span> si l'attente doit passer, et une erreur <span class="new_code">false</span> dans le cas contraire. La m&eacute;thode <span class="new_code">testMessage()</span> ne devrait renvoyer que du texte utile &agrave; la compr&eacute;hension du test en lui-m&ecirc;me.
            </p>
            <p>
                Cette classe peut d&eacute;sormais &ecirc;tre employ&eacute;e &agrave; la place des classes d'attente pr&eacute;c&eacute;dentes.
            </p>
        
        <p>
<a class="target" name="unitaire">
<h2>Sous le capot du testeur unitaire</h2>
</a>
</p>
            <p>
                Le <a href="framework" rel="nofollow">http://sourceforge.net/projects/simpletest/">framework de test unitaire SimpleTest</a> utilise aussi dans son coeur des classes d'attente pour la <a href="unit_test_documentation.html">classe UnitTestCase</a>. Nous pouvons aussi tirer parti de ces m&eacute;canismes pour r&eacute;utiliser nos propres classes attente &agrave; l'int&eacute;rieur m&ecirc;me des suites de test.
            </p>
            <p>
                La m&eacute;thode la plus directe est d'utiliser la m&eacute;thode <span class="new_code">SimpleTest::assertExpectation()</span> pour effectuer le test...
<pre>
<strong>class TestOfNetworking extends UnitTestCase {
    ...
    function testGetValidIp() {
        $server = &amp;new Server();
        $this-&gt;assertExpectation(
                new ValidIp(),
                $server-&gt;getIp(),
                'Server IP address-&gt;%s');
    }
}</strong>
</pre>
                C'est plut&ocirc;t sale par rapport &agrave; notre syntaxe habituelle du type <span class="new_code">assert...()</span>.
            </p>
            <p>
                Pour un cas aussi simple, nous cr&eacute;ons d'ordinaire une m&eacute;thode d'assertion distincte en utilisant la classe d'attente. Supposons un instant que notre attente soit un peu plus compliqu&eacute;e et que par cons&eacute;quent nous souhaitions la r&eacute;utiliser, nous obtenons...
<pre>
class TestOfNetworking extends UnitTestCase {
    ...<strong>
    function assertValidIp($ip, $message = '%s') {
        $this-&gt;assertExpectation(new ValidIp(), $ip, $message);
    }</strong>
    
    function testGetValidIp() {
        $server = &amp;new Server();<strong>
        $this-&gt;assertValidIp(
                $server-&gt;getIp(),
                'Server IP address-&gt;%s');</strong>
    }
}
</pre>
                Il est peu probable que nous ayons besoin de ce niveau de contr&ocirc;le sur la machinerie de test. Il est assez rare que le besoin d'une attente d&eacute;passe le stade de la reconnaissance d'un motif. De plus, les classes d'attente complexes peuvent rendre les tests difficiles &agrave; lire et &agrave; d&eacute;boguer. Ces m&eacute;canismes sont v&eacute;ritablement l&agrave; pour les auteurs de syst&egrave;me qui &eacute;tendront le framework de test pour leurs propres outils de test.
            </p>
        
    </div>
        References and related information...
        <ul>
<li>
            La page du projet SimpleTest sur <a href="SourceForge." rel="nofollow">http://sourceforge.net/projects/simpletest/">SourceForge</a>.
        </li>
<li>
            La page de t&eacute;l&eacute;chargement de SimpleTest sur <a href="LastCraft." rel="nofollow">http://www.lastcraft.com/simple_test.php">LastCraft</a>.
        </li>
<li>
            Les attentes imitent les contraintes dans <a href="JMock." rel="nofollow">http://www.jmock.org/">JMock</a>.
        </li>
<li>
            <a href="L'API" rel="nofollow">http://simpletest.sourceforge.net/">L'API compl&egrave;te pour SimpleTest</a> r&eacute;alis&eacute; avec PHPDoc.
        </li>
</ul>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<div class="copyright">
            Copyright<br>Marcus Baker 2006
        </div>
</body>
</html>

--- NEW FILE: index.html ---
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>
        Prise en main rapide de SimpleTest pour PHP - Tests unitaire et objets fantaisie pour PHP
    </title>
<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
</head>
<body>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<h1>Prise en main rapide de SimpleTest</h1>
        This page...
        <ul>
<li>
            <a href="#unit">Utiliser le testeur rapidement</a>
            avec un exemple.
        </li>
<li>
            <a href="#group">Groupes de tests</a>
            pour tester en un seul clic.
        </li>
<li>
            <a href="#mock">Utiliser les objets fantaisie</a>
            pour faciliter les tests et gagner en contr&ocirc;le.
        </li>
<li>
            <a href="#web">Tester des pages web</a>
            au niveau de l'HTML.
        </li>
</ul>
<div class="content">
        
            <p>
                Le pr&eacute;sent article pr&eacute;suppose que vous soyez familier avec le concept de tests unitaires ainsi que celui de d&eacute;veloppement web avec le langage PHP. Il s'agit d'un guide pour le nouvel et impatient utilisateur de <a href="SimpleTest." rel="nofollow">https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>. Pour une documentation plus compl&egrave;te, particuli&egrave;rement si vous d&eacute;couvrez les tests unitaires, consultez la <a href="documentation" rel="nofollow">http://www.lastcraft.com/unit_test_documentation.php">documentation en cours</a>, et pour des exemples de sc&eacute;narios de test, consultez le <a href="tutorial" rel="nofollow">http://www.lastcraft.com/first_test_tutorial.php">tutorial sur les tests unitaires</a>.
            </p>
        
        <p>
<a class="target" name="unit">
<h2>Utiliser le testeur rapidement</h2>
</a>
</p>
            <p>
                Parmi les outils de test pour logiciel, le testeur unitaire est le plus proche du d&eacute;veloppeur. Dans un contexte de d&eacute;veloppement agile, le code de test se place juste &agrave; c&ocirc;t&eacute; du code source &eacute;tant donn&eacute; que tous les deux sont &eacute;crits simultan&eacute;ment. Dans ce contexte, SimpleTest aspire &agrave; &ecirc;tre une solution compl&egrave;te de test pour un d&eacute;veloppeur PHP et s'appelle "Simple" parce qu'elle devrait &ecirc;tre simple &agrave; utiliser et &agrave; &eacute;tendre. Ce nom n'&eacute;tait pas vraiment un bon choix. Non seulement cette solution inclut toutes les fonctions classiques qu'on est en droit d'attendre de la part des portages de <a href="JUnit" rel="nofollow">http://www.junit.org/">JUnit</a> et des <a href="PHPUnit," rel="nofollow">http://sourceforge.net/projects/phpunit/">PHPUnit</a>, mais elle inclut aussi les <a href="objets" rel="nofollow">http://www.mockobjects.com/">objets fantaisie ou "mock objects"</a>. Sans compter quelques fonctionnalit&eacute;s de <a href="JWebUnit" rel="nofollow">http://sourceforge.net/projects/jwebunit/">JWebUnit</a> : parmi celles-ci la navigation sur des pages web, les tests sur les cookies et l'envoi de formulaire.
            </p>
            <p>
                La d&eacute;monstration la plus rapide : l'exemple
            </p>
            <p>
                Supposons que nous sommes en train de tester une simple classe de log dans un fichier : elle s'appelle <span class="new_code">Log</span> dans <em>classes/Log.php</em>. Commen&ccedil;ons par cr&eacute;er un script de test, appel&eacute; <em>tests/log_test.php</em>. Son contenu est le suivant...
<pre>
<strong>&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');
?&gt;</strong>
</pre>
                Ici le r&eacute;pertoire <em>simpletest</em> est soit dans le dossier courant, soit dans les dossiers pour fichiers inclus. Vous auriez &agrave; &eacute;diter ces arborescences suivant l'endroit o&ugrave; vous avez install&eacute; SimpleTest. Ensuite cr&eacute;ons un sc&eacute;nario de test...
<pre>
&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');
<strong>
class TestOfLogging extends UnitTestCase {
}</strong>
?&gt;
</pre>
                A pr&eacute;sent il y a 5 lignes de code d'&eacute;chafaudage et toujours pas de test. Cependant &agrave; partir de cet instant le retour sur investissement arrive tr&egrave;s rapidement. Supposons que la classe <span class="new_code">Log</span> prenne le nom du fichier &agrave; &eacute;crire dans le constructeur et que nous ayons un r&eacute;pertoire temporaire dans lequel placer ce fichier...
<pre>
&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');

class TestOfLogging extends UnitTestCase {
    <strong>
    function testCreatingNewFile() {
        @unlink('/temp/test.log');
        $log = new Log('/temp/test.log');
        $this-&gt;assertFalse(file_exists('/temp/test.log'));
        $log-&gt;message('Should write this to a file');
        $this-&gt;assertTrue(file_exists('/temp/test.log'));
    }</strong>
}
?&gt;
</pre>
                Au lancement du sc&eacute;nario de test, toutes les m&eacute;thodes qui commencent avec la cha&icirc;ne <span class="new_code">test</span> sont identifi&eacute;es puis ex&eacute;cut&eacute;es. D'ordinaire nous avons bien plusieurs m&eacute;thodes de tests. Les assertions dans les m&eacute;thodes de test envoient des messages vers le framework de test qui affiche imm&eacute;diatement le r&eacute;sultat. Cette r&eacute;ponse imm&eacute;diate est importante, non seulement lors d'un crash caus&eacute; par le code, mais aussi de mani&egrave;re &agrave; rapprocher l'affichage de l'erreur au plus pr&egrave;s du sc&eacute;nario de test concern&eacute;.
            </p>
            <p>
                Pour voir ces r&eacute;sultats lan&ccedil;ons effectivement les tests. S'il s'agit de l'unique sc&eacute;nario de test &agrave; lancer, on peut y arriver avec...
<pre>
&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');

class TestOfLogging extends UnitTestCase {
    
    function testCreatingNewFile() {
        @unlink('/temp/test.log');
        $log = new Log('/temp/test.log');
        $this-&gt;assertFalse(file_exists('/temp/test.log'));
        $log-&gt;message('Should write this to a file');
        $this-&gt;assertTrue(file_exists('/temp/test.log'));
    }
}
<strong>
$test = &amp;new TestOfLogging();
$test-&gt;run(new HtmlReporter());</strong>
?&gt;
</pre>
            </p>
            <p>
                En cas &eacute;chec, l'affichage ressemble &agrave;...
                <div class="demo">
                    <h1>testoflogging</h1>
                    <span class="fail">Fail</span>: testcreatingnewfile-&gt;True assertion failed.<br>
                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
                </div>
                ...et si &ccedil;a passe, on obtient...
                <div class="demo">
                    <h1>testoflogging</h1>
                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
                </div>
				Et si vous obtenez &ccedil;a...
                <div class="demo">
                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
                </div>
				c'est qu'il vous manque le fichier <em>classes/Log.php</em> qui pourrait ressembler &agrave; : 
<pre>
&lt;?php
class Log {
    
        function Log($file_path) {
        }
}
?&gt;;
</pre>
            </p>
        
        <p>
<a class="target" name="group">
<h2>Construire des groupes de tests</h2>
</a>
</p>
            <p>
                Il est peu probable que dans une v&eacute;ritable application on ait uniquement besoin de passer un seul sc&eacute;nario de test. Cela veut dire que nous avons besoin de grouper les sc&eacute;narios dans un script de test qui peut, si n&eacute;cessaire, lancer tous les tests de l'application.
            </p>
            <p>
                Notre premi&egrave;re &eacute;tape est de supprimer les includes et de d&eacute;faire notre hack pr&eacute;c&eacute;dent...
<pre>
&lt;?php<strong>
require_once('../classes/log.php');</strong>

class TestOfLogging extends UnitTestCase {
    
    function testCreatingNewFile() {
        @unlink('/temp/test.log');
        $log = new Log('/temp/test.log');
        $this-&gt;assertFalse(file_exists('/temp/test.log'));
        $log-&gt;message('Should write this to a file');
        $this-&gt;assertTrue(file_exists('/temp/test.log'));<strong>
    }
}
?&gt;</strong>
</pre>
                Ensuite nous cr&eacute;ons un nouveau fichier appel&eacute; <em>tests/all_tests.php</em>. On y ins&egrave;re le code suivant...
<pre>
<strong>&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');

$test = &amp;new GroupTest('All tests');
$test-&gt;addTestFile('log_test.php');
$test-&gt;run(new HtmlReporter());
?&gt;</strong>
</pre>
                Cette m&eacute;thode <span class="new_code">GroupTest::addTestFile()</span> va inclure le fichier de sc&eacute;narios de test et lire parmi toutes les nouvelles classes cr&eacute;&eacute;es celles qui sont issues de <span class="new_code">TestCase</span>. Dans un premier temps, seuls les noms sont stock&eacute;s, de la sorte le lanceur de test peut instancier la classe au fur et &agrave; mesure qu'il ex&eacute;cute votre suite de tests.
            </p>
            <p>
                Pour que &ccedil;a puisse marcher proprement le fichier de suite de tests ne devrait pas inclure aveuglement d'autres extensions de sc&eacute;narios de test qui n'ex&eacute;cuteraient pas effectivement de test. Le r&eacute;sultat pourrait &ecirc;tre que des tests suppl&eacute;mentaires soient alors comptabilis&eacute;s pendant l'ex&eacute;cution des tests. Ce n'est pas un probl&egrave;me grave mais pour &eacute;viter ce d&eacute;sagr&eacute;ment, il suffit d'ajouter la commande <span class="new_code">SimpleTestOptions::ignore()</span> quelque part dans le fichier de sc&eacute;nario de test. Par ailleurs le sc&eacute;nario de test ne devrait pas avoir &eacute;t&eacute; inclus ailleurs ou alors aucun sc&eacute;nario ne sera ajout&eacute; aux groupes de test. Il s'agirait l&agrave; d'une erreur autrement s&eacute;rieuse : si toutes les classes de sc&eacute;nario de test sont charg&eacute;es par PHP, alors la m&eacute;thode <span class="new_code">GroupTest::addTestFile()</span> ne pourra pas les d&eacute;tecter.
            </p>
            <p>
                Pour afficher les r&eacute;sultats, il est seulement n&eacute;cessaire d'invoquer <em>tests/all_tests.php</em> &agrave; partir du serveur web.
            </p>
        
        <p>
<a class="target" name="mock">
<h2>Utiliser les objets fantaisie</h2>
</a>
</p>
            <p>
                Avan&ccedil;ons un peu plus dans le futur.
            </p>
            <p>
                Supposons que notre class logging soit test&eacute;e et termin&eacute;e. Supposons aussi que nous testons une autre classe qui ait besoin d'&eacute;crire des messages de log, disons <span class="new_code">SessionPool</span>. Nous voulons tester une m&eacute;thode qui ressemblera probablement &agrave; quelque chose comme...
<pre>
<strong>
class SessionPool {
    ...
    function logIn($username) {
        ...
        $this-&gt;_log-&gt;message('User $username logged in.');
        ...
    }
    ...
}
</strong>
</pre>
                Avec le concept de "r&eacute;utilisation de code" comme fil conducteur, nous utilisons notre class <span class="new_code">Log</span>. Un sc&eacute;nario de test classique ressemblera peut-&ecirc;tre &agrave;...
<pre>
<strong>
&lt;?php
require_once('../classes/log.php');
require_once('../classes/session_pool.php');

class TestOfSessionLogging extends UnitTestCase {
    
    function setUp() {
        @unlink('/temp/test.log');
    }
    
    function tearDown() {
        @unlink('/temp/test.log');
    }
    
    function testLogInIsLogged() {
        $log = new Log('/temp/test.log');
        $session_pool = &amp;new SessionPool($log);
        $session_pool-&gt;logIn('fred');
        $messages = file('/temp/test.log');
        $this-&gt;assertEqual($messages[0], "User fred logged in.\n");
    }
}
?&gt;</strong>
</pre>
                Le design de ce sc&eacute;nario de test n'est pas compl&egrave;tement mauvais, mais on peut l'am&eacute;liorer. Nous passons du temps &agrave; tripoter les fichiers de log qui ne font pas partie de notre test. Pire, nous avons cr&eacute;&eacute; des liens de proximit&eacute; entre la classe <span class="new_code">Log</span> et ce test. Que se passerait-il si nous n'utilisions plus de fichiers, mais la biblioth&egrave;que <em>syslog</em> &agrave; la place ? Avez-vous remarqu&eacute; le retour chariot suppl&eacute;mentaire &agrave; la fin du message ? A-t-il &eacute;t&eacute; ajout&eacute; par le loggueur ? Et si il ajoutait aussi un timestamp ou d'autres donn&eacute;es ?
            </p>
            <p>
                L'unique partie &agrave; tester r&eacute;ellement est l'envoi d'un message pr&eacute;cis au loggueur. Nous r&eacute;duisons le couplage en cr&eacute;ant une fausse classe de logging : elle ne fait qu'enregistrer le message pour le test, mais ne produit aucun r&eacute;sultat. Sauf qu'elle doit ressembler exactement &agrave; l'original.
            </p>
            <p>
                Si l'objet fantaisie n'&eacute;crit pas dans un fichier alors nous nous &eacute;pargnons la suppression du fichier avant et apr&egrave;s le test. Nous pourrions m&ecirc;me nous &eacute;pargner quelques lignes de code suppl&eacute;mentaires si l'objet fantaisie pouvait ex&eacute;cuter l'assertion.
            <p>
            </p>
                Trop beau pour &ecirc;tre vrai ? Par chance on peut cr&eacute;er un tel objet tr&egrave;s facilement...
<pre>
&lt;?php
require_once('../classes/log.php');
require_once('../classes/session_pool.php');<strong>
Mock::generate('Log');</strong>

class TestOfSessionLogging extends UnitTestCase {
    
    function testLogInIsLogged() {<strong>
        $log = &amp;new MockLog($this);
        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
        $session_pool = &amp;new SessionPool($log);
        $session_pool-&gt;logIn('fred');<strong>
        $log-&gt;tally();</strong>
    }
}
?&gt;
</pre>
                L'appel <span class="new_code">tally()</span> est n&eacute;cessaire pour annoncer &agrave; l'objet fantaisie qu'il n'y aura plus d'appels ult&eacute;rieurs. Sans &ccedil;a l'objet fantaisie pourrait attendre pendant une &eacute;ternit&eacute; l'appel de la m&eacute;thode sans jamais pr&eacute;venir le sc&eacute;nario de test. Les autres tests sont d&eacute;clench&eacute;s automatiquement quand l'appel &agrave; <span class="new_code">message()</span> est invoqu&eacute; sur l'objet <span class="new_code">MockLog</span>. L'appel <span class="new_code">mock</span> va d&eacute;clencher une comparaison des param&egrave;tres et ensuite envoyer le message "pass" ou "fail" au test pour l'affichage. Des jokers peuvent &ecirc;tre inclus ici aussi afin d'emp&ecirc;cher que les tests ne deviennent trop sp&eacute;cifiques.
            </p>
            <p>
                Les objets fantaisie dans la suite SimpleTest peuvent avoir un ensemble de valeurs de sortie arbitraires, des s&eacute;quences de sorties, des valeurs de sortie s&eacute;lectionn&eacute;es &agrave; partir des arguments d'entr&eacute;e, des s&eacute;quences de param&egrave;tres attendus et des limites sur le nombre de fois qu'une m&eacute;thode peut &ecirc;tre invoqu&eacute;e.
            </p>
            <p>
                Pour que ce test fonctionne la librairie avec les objets fantaisie doit &ecirc;tre incluse dans la suite de tests, par exemple dans <em>all_tests.php</em>.
            </p>
        
        <p>
<a class="target" name="web">
<h2>Tester une page web</h2>
</a>
</p>
            <p>
                Une des exigences des sites web, c'est qu'ils produisent des pages web. Si vous construisez un projet de A &agrave; Z et que vous voulez int&eacute;grer des tests au fur et &agrave; mesure alors vous voulez un outil qui puisse effectuer une navigation automatique et en examiner le r&eacute;sultat. C'est le boulot d'un testeur web.
            </p>
            <p>
                Effectuer un test web via SimpleTest reste assez primitif : il n'y a pas de javascript par exemple. Pour vous donner une id&eacute;e, voici un exemple assez trivial : aller chercher une page web, &agrave; partir de l&agrave; naviguer vers la page "about" et finalement tester un contenu d&eacute;termin&eacute; par le client.
<pre>
&lt;?php<strong>
require_once('simpletest/web_tester.php');</strong>
require_once('simpletest/reporter.php');
<strong>
class TestOfAbout extends WebTestCase {
    
    function setUp() {
        $this-&gt;get('http://test-server/index.php');
        $this-&gt;clickLink('About');
    }
    
    function testSearchEngineOptimisations() {
        $this-&gt;assertTitle('A long title about us for search engines');
        $this-&gt;assertWantedPattern('/a popular keyphrase/i');
    }
}</strong>
$test = &amp;new TestOfAbout();
$test-&gt;run(new HtmlReporter());
?&gt;
</pre>
                Avec ce code comme test de recette, vous pouvez vous assurer que le contenu corresponde toujours aux sp&eacute;cifications &agrave; la fois des d&eacute;veloppeurs et des autres parties prenantes au projet.
            </p>
            <p>
                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
            </p>
        
    </div>
        References and related information...
        <ul>
<li>
            <a href="T&eacute;l&eacute;charger" rel="nofollow">https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">T&eacute;l&eacute;charger PHP Simple Test</a>
            depuis <a href="SourceForge." rel="nofollow">http://sourceforge.net/projects/simpletest/">SourceForge</a>.
        </li>
<li>
            L'<a href="API" rel="nofollow">http://simpletest.sourceforge.net/">API de SimpleTest pour d&eacute;veloppeur</a>
            donne tous les d&eacute;tails sur les classes et assertions existantes.
        </li>
</ul>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<div class="copyright">
            Copyright<br>Marcus Baker 2006
        </div>
</body>
</html>

--- NEW FILE: mock_objects_documentation.html ---
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Documentation SimpleTest : les objets fantaise</title>
<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
</head>
<body>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<h1>Documentation sur les objets fantaisie</h1>
        This page...
        <ul>
<li>
            <a href="#quoi">Que sont les objets fantaisie ?</a>
        </li>
<li>
            <a href="#creation">Cr&eacute;er des objets fantaisie</a>.
        </li>
<li>
            <a href="#bouchon">L'objet fantaisie - acteur</a> ou bouchon.
        </li>
<li>
            <a href="#attentes">L'objet fantaisie - critique</a> avec des attentes.
        </li>
<li>
            <a href="#approches">D'autres approches</a> y compris des librairies d'objets fantaisie.
        </li>
<li>
            Utiliser les objets fantaisie avec <a href="#autres_testeurs">d'autres testeurs unitaires</a>.
        </li>
</ul>
<div class="content">
        <p>
<a class="target" name="quoi">
<h2>Que sont les objets fantaisie ?</h2>
</a>
</p>
            <p>
                Les objets fantaisie - ou "mock objects" en anglais - ont deux r&ocirc;les pendant un sc&eacute;nario de test : acteur et critique.
            </p>
            <p>
                Le comportement d'acteur est celui de simuler des objets difficiles &agrave; initialiser ou trop consommateurs en temps pendant un test. Le cas classique est celui de la connexion &agrave; une base de donn&eacute;es. Mettre sur pied une base de donn&eacute;es de test au lancement de chaque test ralentirait consid&eacute;rablement les tests et en plus exigerait l'installation d'un moteur de base de donn&eacute;es ainsi que des donn&eacute;es sur la machine de test. Si nous pouvons simuler la connexion et renvoyer des donn&eacute;es &agrave; notre guise alors non seulement nous gagnons en pragmatisme sur les tests mais en sus nous pouvons nourrir notre base avec des donn&eacute;es falsifi&eacute;es et voir comment il r&eacute;pond. Nous pouvons simuler une base de donn&eacute;es en suspens ou d'autres cas extr&ecirc;mes sans avoir &agrave; cr&eacute;er une v&eacute;ritable panne de base de donn&eacute;es. En d'autres termes nous pouvons gagner en contr&ocirc;le sur l'environnement de test.
            </p>
            <p>
                Si les objets fantaisie ne se comportaient que comme des acteurs alors on les conna&icirc;trait sous le nom de <a href="server_stubs_documentation.html">bouchons serveur</a>.
            </p>
            <p>
                Cependant non seulement les objets fantaisie jouent un r&ocirc;le (en fournissant &agrave; la demande les valeurs requises) mais en plus ils sont aussi sensibles aux messages qui leur sont envoy&eacute;s (par le biais d'attentes). En posant les param&egrave;tres attendus d'une m&eacute;thode ils agissent comme des gardiens : un appel sur eux doit &ecirc;tre r&eacute;alis&eacute; correctement. Si les attentes ne sont pas atteintes ils nous &eacute;pargnent l'effort de l'&eacute;criture d'une assertion de test avec &eacute;chec en r&eacute;alisant cette t&acirc;che &agrave; notre place. Dans le cas d'une connexion &agrave; une base de donn&eacute;es imaginaire ils peuvent tester si la requ&ecirc;te, disons SQL, a bien &eacute;t&eacute; form&eacute; par l'objet qui utilise cette connexion. Mettez-les sur pied avec des attentes assez pr&eacute;cises et vous verrez que vous n'aurez presque plus d'assertion &agrave; &eacute;crire manuellement.
            </p>
        
        <p>
<a class="target" name="creation">
<h2>Cr&eacute;er des objets fantaisie</h2>
</a>
</p>
            <p>
                Comme pour la cr&eacute;ation des bouchons serveur, tout ce dont nous avons besoin c'est d'un classe existante. La fameuse connexion &agrave; une base de donn&eacute;es qui ressemblerait &agrave;...
<pre>
<strong>class DatabaseConnection {
    function DatabaseConnection() {
    }
    
    function query() {
    }
    
    function selectQuery() {
    }
}</strong>
</pre>
                Cette classe n'a pas encore besoin d'&ecirc;tre impl&eacute;ment&eacute;e. Pour en cr&eacute;er sa version fantaisie nous devons juste inclure la librairie d'objet fantaisie puis lancer le g&eacute;n&eacute;rateur...
<pre>
<strong>require_once('simpletest/unit_tester.php');
require_once('simpletest/mock_objects.php');
require_once('database_connection.php');

Mock::generate('DatabaseConnection');</strong>
</pre>
                Ceci g&eacute;n&egrave;re une classe clone appel&eacute;e <span class="new_code">MockDatabaseConnection</span>. Nous pouvons d&eacute;sormais cr&eacute;er des instances de cette nouvelle classe &agrave; l'int&eacute;rieur m&ecirc;me de notre sc&eacute;nario de test...
<pre>
require_once('simpletest/unit_tester.php');
require_once('simpletest/mock_objects.php');
require_once('database_connection.php');

Mock::generate('DatabaseConnection');
<strong>
class MyTestCase extends UnitTestCase {
    
    function testSomething() {
        $connection = &amp;new MockDatabaseConnection($this);
    }
}</strong>
</pre>
                Contrairement aux bouchons, le constructeur d'une classe fantaisie a besoin d'une r&eacute;f&eacute;rence au sc&eacute;nario de test pour pouvoir transmettre les succ&egrave;s et les &eacute;checs pendant qu'il v&eacute;rifie les attentes. Concr&egrave;tement &ccedil;a veut dire que les objets fantaisie ne peuvent &ecirc;tre utilis&eacute;s qu'au sein d'un sc&eacute;nario de test. Malgr&eacute; tout, cette puissance suppl&eacute;mentaire implique que les bouchons ne sont que rarement utilis&eacute;s si des objets fantaisie sont disponibles.
            </p>
            <p>
                <a class="target" name="bouchon">
<h2>Objets fantaisie en action</h2>
</a>
            </p>
            <p>
                La version fantaisie d'une classe contient toutes les m&eacute;thodes de l'originale. De la sorte une op&eacute;ration comme <span class="new_code">$connection-&gt;query()</span> est encore possible. Tout comme avec les bouchons, nous pouvons remplacer la valeur nulle renvoy&eacute;e par d&eacute;faut...
<pre>
<strong>$connection-&gt;setReturnValue('query', 37);</strong>
</pre>
                D&eacute;sormais &agrave; chaque appel de <span class="new_code">$connection-&gt;query()</span> nous recevons comme r&eacute;sultat 37. Tout comme avec les bouchons nous pouvons utiliser des jokers et surcharger le param&egrave;tre joker. Nous pouvons aussi ajouter des m&eacute;thodes suppl&eacute;mentaires &agrave; l'objet fantaisie lors de sa g&eacute;n&eacute;ration et lui choisir un nom de classe qui lui soit propre...
<pre>
<strong>Mock::generate('DatabaseConnection', 'MyMockDatabaseConnection', array('setOptions'));</strong>
</pre>
                Ici l'objet fantaisie se comportera comme si <span class="new_code">setOptions()</span> existait dans la classe originale. C'est pratique si une classe a utilis&eacute; le m&eacute;canisme <span class="new_code">overload()</span> de PHP pour ajouter des m&eacute;thodes dynamiques. Vous pouvez cr&eacute;er des fantaisies sp&eacute;ciales pour simuler cette situation.
            </p>
            <p>
                Tous les mod&egrave;les disponibles avec les bouchons serveur le sont &eacute;galement avec les objets fantaisie...
<pre>
class Iterator {
    function Iterator() {
    }
    
    function next() {
    }
}
</pre>
                Une nouvelle fois, supposons que cet it&eacute;rateur ne retourne que du texte jusqu'au moment o&ugrave; il atteint son terme, quand il renvoie <span class="new_code">false</span>. Nous pouvons le simuler avec...
<pre>
Mock::generate('Iterator');

class IteratorTest extends UnitTestCase() {
    
    function testASequence() {<strong>
        $iterator = &amp;new MockIterator($this);
        $iterator-&gt;setReturnValue('next', false);
        $iterator-&gt;setReturnValueAt(0, 'next', 'First string');
        $iterator-&gt;setReturnValueAt(1, 'next', 'Second string');</strong>
        ...
    }
}
</pre>
                Au moment du premier appel &agrave; <span class="new_code">next()</span> sur l'it&eacute;rateur fantaisie il renverra tout d'abord "First string", puis ce sera au tour de "Second string" au deuxi&egrave;me appel et ensuite pour tout appel suivant <span class="new_code">false</span> sera renvoy&eacute;. Ces valeurs renvoy&eacute;es successivement sont prioritaires sur la valeur constante retourn&eacute;e. Cette derni&egrave;re est un genre de valeur par d&eacute;faut si vous voulez.
            </p>
            <p>
                Reprenons aussi le conteneur d'information bouchonn&eacute; avec des pairs clef / valeur...
<pre>
class Configuration {
    function Configuration() {
    }
    
    function getValue($key) {
    }
}
</pre>
                Il s'agit l&agrave; d'une situation classique d'utilisation d'objets fantaisie &eacute;tant donn&eacute; que la configuration peut varier grandement de machine &agrave; machine : &ccedil;a contraint fortement la fiabilit&eacute; de nos tests si nous l'utilisons directement. Le probl&egrave;me est que toutes les donn&eacute;es nous parviennent &agrave; travers la m&eacute;thode <span class="new_code">getValue()</span> et que nous voulons des r&eacute;sultats diff&eacute;rents pour des clefs diff&eacute;rentes. Heureusement les objets fantaisie ont un syst&egrave;me de filtrage...
<pre>
<strong>$config = &amp;new MockConfiguration($this);
$config-&gt;setReturnValue('getValue', 'primary', array('db_host'));
$config-&gt;setReturnValue('getValue', 'admin', array('db_user'));
$config-&gt;setReturnValue('getValue', 'secret', array('db_password'));</strong>
</pre>
                Le param&egrave;tre en plus est une liste d'arguments &agrave; faire correspondre. Dans ce cas nous essayons de faire correspondre un unique argument : en l'occurrence la clef recherch&eacute;e. Maintenant que la m&eacute;thode <span class="new_code">getValue()</span> est invoqu&eacute;e sur l'objet fantaisie...
<pre>
$config-&gt;getValue('db_user')
</pre>
                ...elle renverra "admin". Elle le trouve en essayant de faire correspondre les arguments entrants dans sa liste d'arguments sortants les uns apr&egrave;s les autres jusqu'au moment o&ugrave; une correspondance exacte est atteinte.
            </p>
            <p>
                Il y a des fois o&ugrave; vous souhaitez qu'un objet sp&eacute;cifique soit servi par la fantaisie plut&ocirc;t qu'une copie. De nouveau c'est identique au m&eacute;canisme des bouchons serveur...
<pre>
class Thing {
}

class Vector {
    function Vector() {
    }
    
    function get($index) {
    }
}
</pre>
                Dans ce cas vous pouvez placer une r&eacute;f&eacute;rence dans la liste renvoy&eacute;e par l'objet fantaisie...
<pre>
$thing = new Thing();<strong>
$vector = &amp;new MockVector($this);
$vector-&gt;setReturnReference('get', $thing, array(12));</strong>
</pre>
                Avec cet arrangement vous savez qu'&agrave; chaque appel de <span class="new_code">$vector-&gt;get(12)</span> le m&ecirc;me <span class="new_code">$thing</span> sera renvoy&eacute;.
            </p>
        
        <p>
<a class="target" name="attentes">
<h2>Objets fantaisie en critique</h2>
</a>
</p>
            <p>
                M&ecirc;me si les bouchons serveur vous isolent du d&eacute;sordre du monde r&eacute;el, il ne s'agit l&agrave; que de la moiti&eacute; du b&eacute;n&eacute;fice potentiel. Vous pouvez avoir une classe de test recevant les messages ad hoc, mais est-ce que votre nouvelle classe renvoie bien les bons ? Le tester peut devenir cafouillis sans une librairie d'objets fantaisie.
            </p>
            <p>
                Pour l'exemple, prenons une classe <span class="new_code">SessionPool</span> &agrave; laquelle nous allons ajouter une fonction de log. Plut&ocirc;t que de complexifier la classe originale, nous souhaitons ajouter ce comportement avec un d&eacute;corateur (GOF). Pour l'instant le code de <span class="new_code">SessionPool</span> ressemble &agrave;...
<pre>
<strong>class SessionPool {
    function SessionPool() {
        ...
    }
    
    function &amp;findSession($cookie) {
        ...
    }
    ...
}

class Session {
    ...
}</strong>

</pre>
                Alors que pour notre code de log, nous avons...
<pre>
<strong>
class Log {
    function Log() {
        ...
    }
    
    function message() {
        ...
    }
}

class LoggingSessionPool {
    function LoggingSessionPool(&amp;$session_pool, &amp;$log) {
        ...
    }
    
    function &amp;findSession(\$cookie) {
        ...
    }
    ...
}</strong>
</pre>
                Dans tout ceci, la seule classe &agrave; tester est <span class="new_code">LoggingSessionPool</span>. En particulier, nous voulons v&eacute;rifier que la m&eacute;thode <span class="new_code">findSession()</span> est appel&eacute;e avec le bon identifiant de session au sein du cookie et qu'elle renvoie bien le message "Starting session $cookie" au loggueur.
            </p>
            <p>
                Bien que nous ne testions que quelques lignes de code de production, voici la liste des choses &agrave; faire dans un sc&eacute;nario de test conventionnel :
                <ol>
                    <li>Cr&eacute;er un objet de log.</li>
                    <li>Indiquer le r&eacute;pertoire d'&eacute;criture du fichier de log.</li>
                    <li>Modifier les droits sur le r&eacute;pertoire pour pouvoir y &eacute;crire le fichier.</li>
                    <li>Cr&eacute;er un objet <span class="new_code">SessionPool</span>.</li>
                    <li>Lancer une session, ce qui demande probablement pas mal de choses.</li>
                    <li>Invoquer <span class="new_code">findSession()</span>.</li>
                    <li>Lire le nouvel identifiant de session (en esp&eacute;rant qu'il existe un accesseur !).</li>
                    <li>Lever une assertion de test pour v&eacute;rifier que cet identifiant correspond bien au cookie.</li>
                    <li>Lire la derni&egrave;re ligne du fichier de log.</li>
                    <li>Supprimer avec une (ou plusieurs) expression rationnelle les timestamps de log en trop, etc.</li>
                    <li>V&eacute;rifier que le message de session est bien dans le texte.</li>
                </ol>
                Pas &eacute;tonnant que les d&eacute;veloppeurs d&eacute;testent &eacute;crire des tests quand ils sont aussi ingrats. Pour rendre les choses encore pire, &agrave; chaque fois que le format de log change ou bien que la m&eacute;thode de cr&eacute;ation des sessions change, nous devons r&eacute;&eacute;crire une partie des tests alors m&ecirc;me qu'ils ne testent pas ces parties du syst&egrave;me. Nous sommes en train de pr&eacute;parer le cauchemar pour les d&eacute;veloppeurs de ces autres classes.
            </p>
            <p>
                A la place, voici la m&eacute;thode compl&egrave;te pour le test avec un peu de magie via les objets fantaisie...
<pre>
Mock::generate('Session');
Mock::generate('SessionPool');
Mock::generate('Log');

class LoggingSessionPoolTest extends UnitTestCase {
    ...
    function testFindSessionLogging() {<strong>
        $session = &amp;new MockSession($this);
        $pool = &amp;new MockSessionPool($this);
        $pool-&gt;setReturnReference('findSession', $session);
        $pool-&gt;expectOnce('findSession', array('abc'));
        
        $log = &amp;new MockLog($this);
        $log-&gt;expectOnce('message', array('Starting session abc'));
        
        $logging_pool = &amp;new LoggingSessionPool($pool, $log);
        $this-&gt;assertReference($logging_pool-&gt;findSession('abc'), $session);
        $pool-&gt;tally();
        $log-&gt;tally();</strong>
    }
}
</pre>
                Commen&ccedil;ons par &eacute;crire une session simulacre. Pas la peine d'&ecirc;tre trop pointilleux avec celle-ci puisque la v&eacute;rification de la session d&eacute;sir&eacute;e est effectu&eacute;e ailleurs. Nous avons juste besoin de v&eacute;rifier qu'il s'agit de la m&ecirc;me que celle qui vient du groupe commun des sessions.
            </p>
            <p>
                <span class="new_code">findSession()</span> est un m&eacute;thode fabrique dont la simulation est d&eacute;crite <a href="#stub">plus haut</a>. Le point de d&eacute;part vient avec le premier appel <span class="new_code">expectOnce()</span>. Cette ligne indique qu'&agrave; chaque fois que <span class="new_code">findSession()</span> est invoqu&eacute; sur l'objet fantaisie, il v&eacute;rifiera les arguments entrant. S'il ne re&ccedil;oit que la cha&icirc;ne "abc" en tant qu'argument alors un succ&egrave;s est envoy&eacute; au testeur unitaire, sinon c'est un &eacute;chec qui est g&eacute;n&eacute;r&eacute;. Il s'agit l&agrave; de la partie qui teste si nous avons bien la bonne session. La liste des arguments suit une format identique &agrave; celui qui pr&eacute;cise les valeurs renvoy&eacute;es. Vous pouvez avoir des jokers et des s&eacute;quences et l'ordre de l'&eacute;valuation restera le m&ecirc;me.
            </p>
            <p>
                Si l'appel n'est jamais effectu&eacute; alors n'est g&eacute;n&eacute;r&eacute; ni le succ&egrave;s, ni l'&eacute;chec. Pour contourner cette limitation, nous devons dire &agrave; l'objet fantaisie que le test est termin&eacute; : il pourra alors d&eacute;cider si les attentes ont &eacute;t&eacute; r&eacute;pondues. L'assertion du testeur unitaire de ceci est d&eacute;clench&eacute;e par l'appel <span class="new_code">tally()</span> &agrave; la fin du test.
            </p>
            <p>
                Nous utilisons le m&ecirc;me mod&egrave;le pour mettre sur pied le loggueur fantaisie. Nous lui indiquons que <span class="new_code">message()</span> devrait &ecirc;tre invoqu&eacute; une fois et une fois seulement avec l'argument "Starting session abc". En testant les arguments d'appel, plut&ocirc;t que ceux de sortie du loggueur, nous isolons le test de tout modification dans le loggueur.
            </p>
            <p>
                Nous commen&ccedil;ons le lancement nos tests &agrave; la cr&eacute;ation du nouveau <span class="new_code">LoggingSessionPool</span> et nous l'alimentons avec nos objets fantaisie juste cr&eacute;&eacute;s. D&eacute;sormais tout est sous contr&ocirc;le. Au final nous confirmons que le <span class="new_code">$session</span> donn&eacute; au d&eacute;corateur est bien celui re&ccedil;u et prions les objets fantaisie de lancer leurs tests de comptage d'appel interne avec les appels <span class="new_code">tally()</span>.
            </p>
            <p>
                Il y a encore pas mal de code de test, mais ce code est tr&egrave;s strict. S'il vous semble encore terrifiant il l'est bien moins que si nous avions essay&eacute; sans les objets fantaisie et ce test en particulier, interactions plut&ocirc;t que r&eacute;sultat, est toujours plus difficile &agrave; mettre en place. Le plus souvent vous aurez besoin de tester des situations plus complexes sans ce niveau ni cette pr&eacute;cision. En outre une partie peut &ecirc;tre remani&eacute;e avec la m&eacute;thode de sc&eacute;nario de test <span class="new_code">setUp()</span>.
            </p>
            <p>
                Voici la liste compl&egrave;te des attentes que vous pouvez placer sur un objet fantaisie avec <a href="SimpleTest..." rel="nofollow">http://www.lastcraft.com/simple_test.php">SimpleTest</a>...
                <table>
<thead>
                    <tr>
<th>Attente</th><th>N&eacute;cessite <span class="new_code">tally()</span></th>
</tr>
                    </thead>
<tbody>
<tr>
                        <td><span class="new_code">expectArguments($method, $args)</span></td>
                        <td style="text-align: center">Non</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectArgumentsAt($timing, $method, $args)</span></td>
                        <td style="text-align: center">Non</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectCallCount($method, $count)</span></td>
                        <td style="text-align: center">Oui</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
                        <td style="text-align: center">Non</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
                        <td style="text-align: center">Oui</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectNever($method)</span></td>
                        <td style="text-align: center">Non</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectOnce($method, $args)</span></td>
                        <td style="text-align: center">Oui</td>
                    </tr>
                    <tr>
                        <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
                        <td style="text-align: center">Oui</td>
                    </tr>
                </tbody>
</table>
                O&ugrave; les param&egrave;tres sont...
                <dl>
                    <dt class="new_code">$method</dt>
                    <dd>Le nom de la m&eacute;thode, sous la forme d'une cha&icirc;ne, &agrave; laquelle la condition doit &ecirc;tre appliqu&eacute;e.</dd>
                    <dt class="new_code">$args</dt>
                    <dd>
                        Les arguments sous la forme d'une l...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/include/simpletest
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest

Added Files:
      Tag: BRANCH-2-0
	url.php exceptions.php VERSION http.php scorer.php 
	HELP_MY_TESTS_DONT_WORK_ANYMORE shell_tester.php selector.php 
	README collector.php simpletest.php user_agent.php remote.php 
	web_tester.php reflection_php5.php LICENSE compatibility.php 
	page.php authentication.php xml.php encoding.php 
	unit_tester.php errors.php browser.php dumper.php 
	expectation.php reflection_php4.php mock_objects.php 
	reporter.php frames.php test_case.php cookies.php parser.php 
	invoker.php socket.php form.php tag.php detached.php 
Log Message:
TRY including TDD

--- NEW FILE: parser.php ---
<?php
    /**
     *	base include file for SimpleTest
     *	@package	SimpleTest
     *	@subpackage	MockObjects
     *	@version	$Id: parser.php,v 1.1.2.1 2007/06/05 13:08:41 edeweerdt Exp $
     */

    /**#@+
     * Lexer mode stack constants
     */
    if (! defined('LEXER_ENTER')) {
        define('LEXER_ENTER', 1);
    }
    if (! defined('LEXER_MATCHED')) {
        define('LEXER_MATCHED', 2);
    }
    if (! defined('LEXER_UNMATCHED')) {
        define('LEXER_UNMATCHED', 3);
    }
    if (! defined('LEXER_EXIT')) {
        define('LEXER_EXIT', 4);
    }
    if (! defined('LEXER_SPECIAL')) {
        define('LEXER_SPECIAL', 5);
    }
    /**#@-*/
    
    /**
     *    Compounded regular expression. Any of
     *    the contained patterns could match and
     *    when one does, it's label is returned.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class ParallelRegex {
        var $_patterns;
        var $_labels;
        var $_regex;
        var $_case;
        
        /**
         *    Constructor. Starts with no patterns.
         *    @param boolean $case    True for case sensitive, false
         *                            for insensitive.
         *    @access public
         */
        function ParallelRegex($case) {
            $this->_case = $case;
            $this->_patterns = array();
            $this->_labels = array();
            $this->_regex = null;
        }
        
        /**
         *    Adds a pattern with an optional label.
         *    @param string $pattern      Perl style regex, but ( and )
         *                                lose the usual meaning.
         *    @param string $label        Label of regex to be returned
         *                                on a match.
         *    @access public
         */
        function addPattern($pattern, $label = true) {
            $count = count($this->_patterns);
            $this->_patterns[$count] = $pattern;
            $this->_labels[$count] = $label;
            $this->_regex = null;
        }
        
        /**
         *    Attempts to match all patterns at once against
         *    a string.
         *    @param string $subject      String to match against.
         *    @param string $match        First matched portion of
         *                                subject.
         *    @return boolean             True on success.
         *    @access public
         */
        function match($subject, &$match) {
            if (count($this->_patterns) == 0) {
                return false;
            }
            if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
                $match = '';
                return false;
            }
            $match = $matches[0];
            for ($i = 1; $i < count($matches); $i++) {
                if ($matches[$i]) {
                    return $this->_labels[$i - 1];
                }
            }
            return true;
        }
        
        /**
         *    Compounds the patterns into a single
         *    regular expression separated with the
         *    "or" operator. Caches the regex.
         *    Will automatically escape (, ) and / tokens.
         *    @param array $patterns    List of patterns in order.
         *    @access private
         */
        function _getCompoundedRegex() {
            if ($this->_regex == null) {
                for ($i = 0, $count = count($this->_patterns); $i < $count; $i++) {
                    $this->_patterns[$i] = '(' . str_replace(
                            array('/', '(', ')'),
                            array('\/', '\(', '\)'),
                            $this->_patterns[$i]) . ')';
                }
                $this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
            }
            return $this->_regex;
        }
        
        /**
         *    Accessor for perl regex mode flags to use.
         *    @return string       Perl regex flags.
         *    @access private
         */
        function _getPerlMatchingFlags() {
            return ($this->_case ? "msS" : "msSi");
        }
    }
    
    /**
     *    States for a stack machine.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class SimpleStateStack {
        var $_stack;
        
        /**
         *    Constructor. Starts in named state.
         *    @param string $start        Starting state name.
         *    @access public
         */
        function SimpleStateStack($start) {
            $this->_stack = array($start);
        }
        
        /**
         *    Accessor for current state.
         *    @return string       State.
         *    @access public
         */
        function getCurrent() {
            return $this->_stack[count($this->_stack) - 1];
        }
        
        /**
         *    Adds a state to the stack and sets it
         *    to be the current state.
         *    @param string $state        New state.
         *    @access public
         */
        function enter($state) {
            array_push($this->_stack, $state);
        }
        
        /**
         *    Leaves the current state and reverts
         *    to the previous one.
         *    @return boolean    False if we drop off
         *                       the bottom of the list.
         *    @access public
         */
        function leave() {
            if (count($this->_stack) == 1) {
                return false;
            }
            array_pop($this->_stack);
            return true;
        }
    }
    
    /**
     *    Accepts text and breaks it into tokens.
     *    Some optimisation to make the sure the
     *    content is only scanned by the PHP regex
     *    parser once. Lexer modes must not start
     *    with leading underscores.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class SimpleLexer {
        var $_regexes;
        var $_parser;
        var $_mode;
        var $_mode_handlers;
        var $_case;
        
        /**
         *    Sets up the lexer in case insensitive matching
         *    by default.
         *    @param SimpleSaxParser $parser  Handling strategy by
         *                                    reference.
         *    @param string $start            Starting handler.
         *    @param boolean $case            True for case sensitive.
         *    @access public
         */
        function SimpleLexer(&$parser, $start = "accept", $case = false) {
            $this->_case = $case;
            $this->_regexes = array();
            $this->_parser = &$parser;
            $this->_mode = &new SimpleStateStack($start);
            $this->_mode_handlers = array($start => $start);
        }
        
        /**
         *    Adds a token search pattern for a particular
         *    parsing mode. The pattern does not change the
         *    current mode.
         *    @param string $pattern      Perl style regex, but ( and )
         *                                lose the usual meaning.
         *    @param string $mode         Should only apply this
         *                                pattern when dealing with
         *                                this type of input.
         *    @access public
         */
        function addPattern($pattern, $mode = "accept") {
            if (! isset($this->_regexes[$mode])) {
                $this->_regexes[$mode] = new ParallelRegex($this->_case);
            }
            $this->_regexes[$mode]->addPattern($pattern);
            if (! isset($this->_mode_handlers[$mode])) {
                $this->_mode_handlers[$mode] = $mode;
            }
        }
        
        /**
         *    Adds a pattern that will enter a new parsing
         *    mode. Useful for entering parenthesis, strings,
         *    tags, etc.
         *    @param string $pattern      Perl style regex, but ( and )
         *                                lose the usual meaning.
         *    @param string $mode         Should only apply this
         *                                pattern when dealing with
         *                                this type of input.
         *    @param string $new_mode     Change parsing to this new
         *                                nested mode.
         *    @access public
         */
        function addEntryPattern($pattern, $mode, $new_mode) {
            if (! isset($this->_regexes[$mode])) {
                $this->_regexes[$mode] = new ParallelRegex($this->_case);
            }
            $this->_regexes[$mode]->addPattern($pattern, $new_mode);
            if (! isset($this->_mode_handlers[$new_mode])) {
                $this->_mode_handlers[$new_mode] = $new_mode;
            }
        }
        
        /**
         *    Adds a pattern that will exit the current mode
         *    and re-enter the previous one.
         *    @param string $pattern      Perl style regex, but ( and )
         *                                lose the usual meaning.
         *    @param string $mode         Mode to leave.
         *    @access public
         */
        function addExitPattern($pattern, $mode) {
            if (! isset($this->_regexes[$mode])) {
                $this->_regexes[$mode] = new ParallelRegex($this->_case);
            }
            $this->_regexes[$mode]->addPattern($pattern, "__exit");
            if (! isset($this->_mode_handlers[$mode])) {
                $this->_mode_handlers[$mode] = $mode;
            }
        }
        
        /**
         *    Adds a pattern that has a special mode. Acts as an entry
         *    and exit pattern in one go, effectively calling a special
         *    parser handler for this token only.
         *    @param string $pattern      Perl style regex, but ( and )
         *                                lose the usual meaning.
         *    @param string $mode         Should only apply this
         *                                pattern when dealing with
         *                                this type of input.
         *    @param string $special      Use this mode for this one token.
         *    @access public
         */
        function addSpecialPattern($pattern, $mode, $special) {
            if (! isset($this->_regexes[$mode])) {
                $this->_regexes[$mode] = new ParallelRegex($this->_case);
            }
            $this->_regexes[$mode]->addPattern($pattern, "_$special");
            if (! isset($this->_mode_handlers[$special])) {
                $this->_mode_handlers[$special] = $special;
            }
        }
        
        /**
         *    Adds a mapping from a mode to another handler.
         *    @param string $mode        Mode to be remapped.
         *    @param string $handler     New target handler.
         *    @access public
         */
        function mapHandler($mode, $handler) {
            $this->_mode_handlers[$mode] = $handler;
        }
        
        /**
         *    Splits the page text into tokens. Will fail
         *    if the handlers report an error or if no
         *    content is consumed. If successful then each
         *    unparsed and parsed token invokes a call to the
         *    held listener.
         *    @param string $raw        Raw HTML text.
         *    @return boolean           True on success, else false.
         *    @access public
         */
        function parse($raw) {
            if (! isset($this->_parser)) {
                return false;
            }
            $length = strlen($raw);
            while (is_array($parsed = $this->_reduce($raw))) {
                list($raw, $unmatched, $matched, $mode) = $parsed;
                if (! $this->_dispatchTokens($unmatched, $matched, $mode)) {
                    return false;
                }
                if ($raw === '') {
                    return true;
                }
                if (strlen($raw) == $length) {
                    return false;
                }
                $length = strlen($raw);
            }
            if (! $parsed) {
                return false;
            }
            return $this->_invokeParser($raw, LEXER_UNMATCHED);
        }
        
        /**
         *    Sends the matched token and any leading unmatched
         *    text to the parser changing the lexer to a new
         *    mode if one is listed.
         *    @param string $unmatched    Unmatched leading portion.
         *    @param string $matched      Actual token match.
         *    @param string $mode         Mode after match. A boolean
         *                                false mode causes no change.
         *    @return boolean             False if there was any error
         *                                from the parser.
         *    @access private
         */
        function _dispatchTokens($unmatched, $matched, $mode = false) {
            if (! $this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
                return false;
            }
            if (is_bool($mode)) {
                return $this->_invokeParser($matched, LEXER_MATCHED);
            }
            if ($this->_isModeEnd($mode)) {
                if (! $this->_invokeParser($matched, LEXER_EXIT)) {
                    return false;
                }
                return $this->_mode->leave();
            }
            if ($this->_isSpecialMode($mode)) {
                $this->_mode->enter($this->_decodeSpecial($mode));
                if (! $this->_invokeParser($matched, LEXER_SPECIAL)) {
                    return false;
                }
                return $this->_mode->leave();
            }
            $this->_mode->enter($mode);
            return $this->_invokeParser($matched, LEXER_ENTER);
        }
        
        /**
         *    Tests to see if the new mode is actually to leave
         *    the current mode and pop an item from the matching
         *    mode stack.
         *    @param string $mode    Mode to test.
         *    @return boolean        True if this is the exit mode.
         *    @access private
         */
        function _isModeEnd($mode) {
            return ($mode === "__exit");
        }
        
        /**
         *    Test to see if the mode is one where this mode
         *    is entered for this token only and automatically
         *    leaves immediately afterwoods.
         *    @param string $mode    Mode to test.
         *    @return boolean        True if this is the exit mode.
         *    @access private
         */
        function _isSpecialMode($mode) {
            return (strncmp($mode, "_", 1) == 0);
        }
        
        /**
         *    Strips the magic underscore marking single token
         *    modes.
         *    @param string $mode    Mode to decode.
         *    @return string         Underlying mode name.
         *    @access private
         */
        function _decodeSpecial($mode) {
            return substr($mode, 1);
        }
        
        /**
         *    Calls the parser method named after the current
         *    mode. Empty content will be ignored. The lexer
         *    has a parser handler for each mode in the lexer.
         *    @param string $content        Text parsed.
         *    @param boolean $is_match      Token is recognised rather
         *                                  than unparsed data.
         *    @access private
         */
        function _invokeParser($content, $is_match) {
            if (($content === '') || ($content === false)) {
                return true;
            }
            $handler = $this->_mode_handlers[$this->_mode->getCurrent()];
            return $this->_parser->$handler($content, $is_match);
        }
        
        /**
         *    Tries to match a chunk of text and if successful
         *    removes the recognised chunk and any leading
         *    unparsed data. Empty strings will not be matched.
         *    @param string $raw         The subject to parse. This is the
         *                               content that will be eaten.
         *    @return array/boolean      Three item list of unparsed
         *                               content followed by the
         *                               recognised token and finally the
         *                               action the parser is to take.
         *                               True if no match, false if there
         *                               is a parsing error.
         *    @access private
         */
        function _reduce($raw) {
            if ($action = $this->_regexes[$this->_mode->getCurrent()]->match($raw, $match)) {
                $unparsed_character_count = strpos($raw, $match);
                $unparsed = substr($raw, 0, $unparsed_character_count);
                $raw = substr($raw, $unparsed_character_count + strlen($match));
                return array($raw, $unparsed, $match, $action);
            }
            return true;
        }
    }
    
    /**
     *    Breas HTML into SAX events.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class SimpleHtmlLexer extends SimpleLexer {
        
        /**
         *    Sets up the lexer with case insensitive matching
         *    and adds the HTML handlers.
         *    @param SimpleSaxParser $parser  Handling strategy by
         *                                    reference.
         *    @access public
         */
        function SimpleHtmlLexer(&$parser) {
            $this->SimpleLexer($parser, 'text');
            $this->mapHandler('text', 'acceptTextToken');
            $this->_addSkipping();
            foreach ($this->_getParsedTags() as $tag) {
                $this->_addTag($tag);
            }
            $this->_addInTagTokens();
        }
        
        /**
         *    List of parsed tags. Others are ignored.
         *    @return array        List of searched for tags.
         *    @access private
         */
        function _getParsedTags() {
            return array('a', 'title', 'form', 'input', 'button', 'textarea', 'select',
                    'option', 'frameset', 'frame', 'label');
        }
        
        /**
         *    The lexer has to skip certain sections such
         *    as server code, client code and styles.
         *    @access private
         */
        function _addSkipping() {
            $this->mapHandler('css', 'ignore');
            $this->addEntryPattern('<style', 'text', 'css');
            $this->addExitPattern('</style>', 'css');
            $this->mapHandler('js', 'ignore');
            $this->addEntryPattern('<script', 'text', 'js');
            $this->addExitPattern('</script>', 'js');
            $this->mapHandler('comment', 'ignore');
            $this->addEntryPattern('<!--', 'text', 'comment');
            $this->addExitPattern('-->', 'comment');
        }
        
        /**
         *    Pattern matches to start and end a tag.
         *    @param string $tag          Name of tag to scan for.
         *    @access private
         */
        function _addTag($tag) {
            $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
            $this->addEntryPattern("<$tag", 'text', 'tag');
        }
        
        /**
         *    Pattern matches to parse the inside of a tag
         *    including the attributes and their quoting.
         *    @access private
         */
        function _addInTagTokens() {
            $this->mapHandler('tag', 'acceptStartToken');
            $this->addSpecialPattern('\s+', 'tag', 'ignore');
            $this->_addAttributeTokens();
            $this->addExitPattern('/>', 'tag');
            $this->addExitPattern('>', 'tag');
        }
        
        /**
         *    Matches attributes that are either single quoted,
         *    double quoted or unquoted.
         *    @access private
         */
        function _addAttributeTokens() {
            $this->mapHandler('dq_attribute', 'acceptAttributeToken');
            $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
            $this->addPattern("\\\\\"", 'dq_attribute');
            $this->addExitPattern('"', 'dq_attribute');
            $this->mapHandler('sq_attribute', 'acceptAttributeToken');
            $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
            $this->addPattern("\\\\'", 'sq_attribute');
            $this->addExitPattern("'", 'sq_attribute');
            $this->mapHandler('uq_attribute', 'acceptAttributeToken');
            $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
        }
    }
    
    /**
     *    Converts HTML tokens into selected SAX events.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class SimpleHtmlSaxParser {
        var $_lexer;
        var $_listener;
        var $_tag;
        var $_attributes;
        var $_current_attribute;
        
        /**
         *    Sets the listener.
         *    @param SimpleSaxListener $listener    SAX event handler.
         *    @access public
         */
        function SimpleHtmlSaxParser(&$listener) {
            $this->_listener = &$listener;
            $this->_lexer = &$this->createLexer($this);
            $this->_tag = '';
            $this->_attributes = array();
            $this->_current_attribute = '';
        }
        
        /**
         *    Runs the content through the lexer which
         *    should call back to the acceptors.
         *    @param string $raw      Page text to parse.
         *    @return boolean         False if parse error.
         *    @access public
         */
        function parse($raw) {
            return $this->_lexer->parse($raw);
        }
        
        /**
         *    Sets up the matching lexer. Starts in 'text' mode.
         *    @param SimpleSaxParser $parser    Event generator, usually $self.
         *    @return SimpleLexer               Lexer suitable for this parser.
         *    @access public
         *    @static
         */
        function &createLexer(&$parser) {
            $lexer = &new SimpleHtmlLexer($parser);
            return $lexer;
        }
        
        /**
         *    Accepts a token from the tag mode. If the
         *    starting element completes then the element
         *    is dispatched and the current attributes
         *    set back to empty. The element or attribute
         *    name is converted to lower case.
         *    @param string $token     Incoming characters.
         *    @param integer $event    Lexer event type.
         *    @return boolean          False if parse error.
         *    @access public
         */
        function acceptStartToken($token, $event) {
            if ($event == LEXER_ENTER) {
                $this->_tag = strtolower(substr($token, 1));
                return true;
            }
            if ($event == LEXER_EXIT) {
                $success = $this->_listener->startElement(
                        $this->_tag,
                        $this->_attributes);
                $this->_tag = '';
                $this->_attributes = array();
                return $success;
            }
            if ($token != '=') {
                $this->_current_attribute = strtolower(SimpleHtmlSaxParser::decodeHtml($token));
                $this->_attributes[$this->_current_attribute] = '';
            }
            return true;
        }
        
        /**
         *    Accepts a token from the end tag mode.
         *    The element name is converted to lower case.
         *    @param string $token     Incoming characters.
         *    @param integer $event    Lexer event type.
         *    @return boolean          False if parse error.
         *    @access public
         */
        function acceptEndToken($token, $event) {
            if (! preg_match('/<\/(.*)>/', $token, $matches)) {
                return false;
            }
            return $this->_listener->endElement(strtolower($matches[1]));
        }
        
        /**
         *    Part of the tag data.
         *    @param string $token     Incoming characters.
         *    @param integer $event    Lexer event type.
         *    @return boolean          False if parse error.
         *    @access public
         */
        function acceptAttributeToken($token, $event) {
            if ($this->_current_attribute) {
                if ($event == LEXER_UNMATCHED) {
                    $this->_attributes[$this->_current_attribute] .=
                            SimpleHtmlSaxParser::decodeHtml($token);
                }
                if ($event == LEXER_SPECIAL) {
                    $this->_attributes[$this->_current_attribute] .=
                            preg_replace('/^=\s*/' , '', SimpleHtmlSaxParser::decodeHtml($token));
                }
            }
            return true;
        }
        
        /**
         *    A character entity.
         *    @param string $token    Incoming characters.
         *    @param integer $event   Lexer event type.
         *    @return boolean         False if parse error.
         *    @access public
         */
        function acceptEntityToken($token, $event) {
        }
        
        /**
         *    Character data between tags regarded as
         *    important.
         *    @param string $token     Incoming characters.
         *    @param integer $event    Lexer event type.
         *    @return boolean          False if parse error.
         *    @access public
         */
        function acceptTextToken($token, $event) {
            return $this->_listener->addContent($token);
        }
        
        /**
         *    Incoming data to be ignored.
         *    @param string $token     Incoming characters.
         *    @param integer $event    Lexer event type.
         *    @return boolean          False if parse error.
         *    @access public
         */
        function ignore($token, $event) {
            return true;
        }
        
        /**
         *    Decodes any HTML entities.
         *    @param string $html    Incoming HTML.
         *    @return string         Outgoing plain text.
         *    @access public
         *    @static
         */
        function decodeHtml($html) {
            static $translations;
            if (! isset($translations)) {
                $translations = array_flip(get_html_translation_table(HTML_ENTITIES));
            }
            return strtr($html, $translations);
        }
        
        /**
         *    Turns HTML into text browser visible text. Images
         *    are converted to their alt text and tags are supressed.
         *    Entities are converted to their visible representation.
         *    @param string $html        HTML to convert.
         *    @return string             Plain text.
         *    @access public
         *    @static
         */
        function normalise($html) {
            $text = preg_replace('|<!--.*?-->|', '', $html);
            $text = preg_replace('|<img.*?alt\s*=\s*"(.*?)".*?>|', ' \1 ', $text);
            $text = preg_replace('|<img.*?alt\s*=\s*\'(.*?)\'.*?>|', ' \1 ', $text);
            $text = preg_replace('|<img.*?alt\s*=\s*([a-zA-Z_]+).*?>|', ' \1 ', $text);
            $text = preg_replace('|<.*?>|', '', $text);
            $text = SimpleHtmlSaxParser::decodeHtml($text);
            $text = preg_replace('|\s+|', ' ', $text);
            return trim($text);
        }
    }
    
    /**
     *    SAX event handler.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     *    @abstract
     */
    class SimpleSaxListener {
        
        /**
         *    Sets the document to write to.
         *    @access public
         */
        function SimpleSaxListener() {
        }
        
        /**
         *    Start of element event.
         *    @param string $name        Element name.
         *    @param hash $attributes    Name value pairs.
         *                               Attributes without content
         *                               are marked as true.
         *    @return boolean            False on parse error.
         *    @access public
         */
        function startElement($name, $attributes) {
        }
        
        /**
         *    End of element event.
         *    @param string $name        Element name.
         *    @return boolean            False on parse error.
         *    @access public
         */
        function endElement($name) {
        }
        
        /**
         *    Unparsed, but relevant data.
         *    @param string $text        May include unparsed tags.
         *    @return boolean            False on parse error.
         *    @access public
         */
        function addContent($text) {
        }
    }
?>
--- NEW FILE: LICENSE ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!

--- NEW FILE: page.php ---
<?php
    /**
     *	Base include file for SimpleTest
     *	@package	SimpleTest
     *	@subpackage	WebTester
     *	@version	$Id: page.php,v 1.1.2.1 2007/06/05 13:08:38 edeweerdt Exp $
     */

    /**#@+
     *	include other SimpleTest class files
     */
    require_once(dirname(__FILE__) . '/http.php');
    require_once(dirname(__FILE__) . '/parser.php');
    require_once(dirname(__FILE__) . '/tag.php');
    require_once(dirname(__FILE__) . '/form.php');
    require_once(dirname(__FILE__) . '/selector.php');
    /**#@-*/

    /**
     *    Creates tags and widgets given HTML tag
     *    attributes.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class SimpleTagBuilder {

        /**
         *    Factory for the tag objects. Creates the
         *    appropriate tag object for the incoming tag name
         *    and attributes.
         *    @param string $name        HTML tag name.
         *    @param hash $attributes    Element attributes.
         *    @return SimpleTag          Tag object.
         *    @access public
         */
        function createTag($name, $attributes) {
            static $map = array(
                    'a' => 'SimpleAnchorTag',
                    'title' => 'SimpleTitleTag',
                    'button' => 'SimpleButtonTag',
                    'textarea' => 'SimpleTextAreaTag',
                    'option' => 'SimpleOptionTag',
                    'label' => 'SimpleLabelTag',
                    'form' => 'SimpleFormTag',
                    'frame' => 'SimpleFrameTag');
            $attributes = $this->_keysToLowerCase($attributes);
            if (array_key_exists($name, $map)) {
                $tag_class = $map[$name];
                return new $tag_class($attributes);
            } elseif ($name == 'select') {
                return $this->_createSelectionTag($attributes);
            } elseif ($name == 'input') {
                return $this->_createInputTag($attributes);
            }
            return new SimpleTag($name, $attributes);
        }

        /**
         *    Factory for selection fields.
         *    @param hash $attributes    Element attributes.
         *    @return SimpleTag          Tag object.
         *    @access protected
         */
        function _createSelectionTag($attributes) {
            if (isset($attributes['multiple'])) {
                return new MultipleSelectionTag($attributes);
            }
            return new SimpleSelectionTag($attributes);
        }

        /**
         *    Factory for input tags.
         *    @param hash $attributes    Element attributes.
         *    @return SimpleTag          Tag object.
         *    @access protected
         */
        function _createInputTag($attributes) {
            if (! isset($attributes['type'])) {
                return new SimpleTextTag($attributes);
            }
            $type = strtolower(trim($attributes['type']));
            $map = array(
                    'submit' => 'SimpleSubmitTag',
                    'image' => 'SimpleImageSubmitTag',
                    'checkbox' => 'SimpleCheckboxTag',
                    'radio' => 'SimpleRadioButtonTag',
                    'text' => 'SimpleTextTag',
                    'hidden' => 'SimpleTextTag',
                    'password' => 'SimpleTextTag',
                    'file' => 'SimpleUploadTag');
            if (array_key_exists($type, $map)) {
                $tag_class = $map[$type];
                return new $tag_class($attributes);
            }
            return false;
        }

        /**
         *    Make the keys lower case for case insensitive look-ups.
         *    @param hash $map   Hash to convert.
         *    @return hash       Unchanged values, but keys lower case.
         *    @access private
         */
        function _keysToLowerCase($map) {
            $lower = array();
            foreach ($map as $key => $value) {
                $lower[strtolower($key)] = $value;
            }
            return $lower;
        }
    }

    /**
     *    SAX event handler. Maintains a list of
     *    open tags and dispatches them as they close.
	 *    @package SimpleTest
	 *    @subpackage WebTester
     */
    class SimplePageBuilder extends SimpleSaxListener {
        var $_tags;
        var $_page;
        var $_private_content_tag;

        /**
         *    Sets the builder up empty.
         *    @access public
         */
        function SimplePageBuilder() {
            $this->SimpleSaxListener();
        }
        
        /**
         *    Frees up any references so as to allow the PHP garbage...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/include/simpletest/docs/en
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13989/include/simpletest/docs/en

Added Files:
      Tag: BRANCH-2-0
	web_tester_documentation.html reporter_documentation.html 
	expectation_documentation.html browser_documentation.html 
	unit_test_documentation.html group_test_documentation.html 
	mock_objects_documentation.html docs.css overview.html 
	authentication_documentation.html 
	partial_mocks_documentation.html index.html 
	form_testing_documentation.html 
Log Message:
TRY including TDD

--- NEW FILE: expectation_documentation.html ---
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>
        Extending the SimpleTest unit tester with additional expectation classes
    </title>
<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
</head>
<body>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <span class="chosen">Expectations</span>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<h1>Expectation documentation</h1>
        This page...
        <ul>
<li>
            Using expectations for
            <a href="#mock">more precise testing with mock objects</a>
        </li>
<li>
            <a href="#behaviour">Changing mock object behaviour</a> with expectations
        </li>
<li>
            <a href="#extending">Extending the expectations</a>
        </li>
<li>
            Underneath SimpleTest <a href="#unit">uses expectation classes</a>
        </li>
</ul>
<div class="content">
        <p>
<a class="target" name="mock">
<h2>More control over mock objects</h2>
</a>
</p>
            <p>
                The default behaviour of the
                <a href="mock_objects_documentation.html">mock objects</a>
                in
                <a href="SimpleTest" rel="nofollow">http://sourceforge.net/projects/simpletest/">SimpleTest</a>
                is either an identical match on the argument or to allow any argument at all.
                For almost all tests this is sufficient.
                Sometimes, though, you want to weaken a test case.
            </p>
            <p>
                One place where a test can be too tightly coupled is with
                text matching.
                Suppose we have a component that outputs a helpful error
                message when something goes wrong.
                You want to test that the correct error was sent, but the actual
                text may be rather long.
                If you test for the text exactly, then every time the exact wording
                of the message changes, you will have to go back and edit the test suite.
            </p>
            <p>
                For example, suppose we have a news service that has failed
                to connect to its remote source.
<pre>
<strong>class NewsService {
    ...
    function publish(&amp;$writer) {
        if (! $this-&gt;isConnected()) {
            $writer-&gt;write('Cannot connect to news service "' .
                    $this-&gt;_name . '" at this time. ' .
                    'Please try again later.');
        }
        ...
    }
}</strong>
</pre>
                Here it is sending its content to a
                <span class="new_code">Writer</span> class.
                We could test this behaviour with a
                <span class="new_code">MockWriter</span> like so...
<pre>
class TestOfNewsService extends UnitTestCase {
    ...
    function testConnectionFailure() {&lt;strong&gt;
        $writer = &amp;new MockWriter();
        $writer-&gt;expectOnce('write', array(
                'Cannot connect to news service ' .
                '"BBC News" at this time. ' .
                'Please try again later.'));
        
        $service = &amp;new NewsService('BBC News');
        $service-&gt;publish($writer);
    }
}
</pre>
                This is a good example of a brittle test.
                If we decide to add additional instructions, such as
                suggesting an alternative news source, we will break
                our tests even though no underlying functionality
                has been altered.
            </p>
            <p>
                To get around this, we would like to do a regular expression
                test rather than an exact match.
                We can actually do this with...
<pre>
class TestOfNewsService extends UnitTestCase {
    ...
    function testConnectionFailure() {
        $writer = &amp;new MockWriter();<strong>
        $writer-&gt;expectOnce(
                'write',
                array(new PatternExpectation('/cannot connect/i')));</strong>
        
        $service = &amp;new NewsService('BBC News');
        $service-&gt;publish($writer);
    }
}
</pre>
                Instead of passing in the expected parameter to the
                <span class="new_code">MockWriter</span> we pass an
                expectation class called
                <span class="new_code">WantedPatternExpectation</span>.
                The mock object is smart enough to recognise this as special
                and to treat it differently.
                Rather than simply comparing the incoming argument to this
                object, it uses the expectation object itself to
                perform the test.
            </p>
            <p>
                The <span class="new_code">WantedPatternExpectation</span> takes
                the regular expression to match in its constructor.
                Whenever a comparison is made by the <span class="new_code">MockWriter</span>
                against this expectation class, it will do a
                <span class="new_code">preg_match()</span> with this pattern.
                With our test case above, as long as "cannot connect"
                appears in the text of the string, the mock will issue a pass
                to the unit tester.
                The rest of the text does not matter.
            </p>
            <p>
                The possible expectation classes are...
                <table>
<tbody>
                    <tr>
<td><span class="new_code">AnythingExpectation</span></td><td>Will always match</td>
</tr>
                    <tr>
<td><span class="new_code">EqualExpectation</span></td><td>An equality, rather than the stronger identity comparison</td>
</tr>
                    <tr>
<td><span class="new_code">NotEqualExpectation</span></td><td>An inequality comparison</td>
</tr>
                    <tr>
<td><span class="new_code">IndenticalExpectation</span></td><td>The default mock object check which must match exactly</td>
</tr>
                    <tr>
<td><span class="new_code">NotIndenticalExpectation</span></td><td>Inverts the mock object logic</td>
</tr>
                    <tr>
<td><span class="new_code">WithinMarginExpectation</span></td><td>Compares a value to within a margin</td>
</tr>
                    <tr>
<td><span class="new_code">OutsideMarginExpectation</span></td><td>Checks that a value is out side the margin</td>
</tr>
                    <tr>
<td><span class="new_code">PatternExpectation</span></td><td>Uses a Perl Regex to match a string</td>
</tr>
                    <tr>
<td><span class="new_code">NoPatternExpectation</span></td><td>Passes only if failing a Perl Regex</td>
</tr>
                    <tr>
<td><span class="new_code">IsAExpectation</span></td><td>Checks the type or class name only</td>
</tr>
                    <tr>
<td><span class="new_code">NotAExpectation</span></td><td>Opposite of the <span class="new_code">IsAExpectation</span></td>
</tr>
                    <tr>
<td><span class="new_code">MethodExistsExpectation</span></td><td>Checks a method is available on an object</td>
</tr>
                </tbody>
</table>
                Most take the expected value in the constructor.
                The exceptions are the pattern matchers, which take a regular expression,
                and the <span class="new_code">IsAExpectation</span> and <span class="new_code">NotAExpectation</span> which takes a type
                or class name as a string.
            </p>
            <p>
                Some examples...
            </p>
            <p>
<pre>
$mock-&gt;expectOnce('method', array(new IdenticalExpectation(14)));
</pre>
                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array(14))</span>.
<pre>
$mock-&gt;expectOnce('method', array(new EqualExpectation(14)));
</pre>
                This is different from the previous version in that the string
                <span class="new_code">"14"</span> as a parameter will also pass.
                Sometimes the additional type checks of SimpleTest are too restrictive.
<pre>
$mock-&gt;expectOnce('method', array(new AnythingExpectation(14)));
</pre>
                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array('*'))</span>.
<pre>
$mock-&gt;expectOnce('method', array(new IdenticalExpectation('*')));
</pre>
                This is handy if you want to assert a literal <span class="new_code">"*"</span>.
<pre>
new NotIdenticalExpectation(14)
</pre>
                This matches on anything other than integer 14.
                Even the string <span class="new_code">"14"</span> would pass.
<pre>
new WithinMarginExpectation(14.0, 0.001)
</pre>
                This will accept any value from 13.999 to 14.001 inclusive.
            </p>
        
        <p>
<a class="target" name="behaviour">
<h2>Using expectations to control stubs</h2>
</a>
</p>
            <p>
                The expectation classes can be used not just for sending assertions
                from mock objects, but also for selecting behaviour for the
                <a href="mock_objects_documentation.html">mock objects</a>.
                Anywhere a list of arguments is given, a list of expectation objects
                can be inserted instead.
            </p>
            <p>
                Suppose we want a mock authorisation server to simulate a successful login,
                but only if it receives a valid session object.
                We can do this as follows...
<pre>
Mock::generate('Authorisation');
<strong>
$authorisation = new MockAuthorisation();
$authorisation-&gt;setReturnValue(
        'isAllowed',
        true,
        array(new IsAExpectation('Session', 'Must be a session')));
$authorisation-&gt;setReturnValue('isAllowed', false);</strong>
</pre>
                We have set the default mock behaviour to return false when
                <span class="new_code">isAllowed</span> is called.
                When we call the method with a single parameter that
                is a <span class="new_code">Session</span> object, it will return true.
                We have also added a second parameter as a message.
                This will be displayed as part of the mock object
                failure message if this expectation is the cause of
                a failure.
            </p>
            <p>
                This kind of sophistication is rarely useful, but is included for
                completeness.
            </p>
        
        <p>
<a class="target" name="extending">
<h2>Creating your own expectations</h2>
</a>
</p>
            <p>
                The expectation classes have a very simple structure.
                So simple that it is easy to create your own versions for
                commonly used test logic.
            </p>
            <p>
                As an example here is the creation of a class to test for
                valid IP addresses.
                In order to work correctly with the stubs and mocks the new
                expectation class should extend
                <span class="new_code">SimpleExpectation</span>...
<pre>
<strong>class ValidIp extends SimpleExpectation {
    
    function test($ip) {
        return (ip2long($ip) != -1);
    }
    
    function testMessage($ip) {
        return "Address [$ip] should be a valid IP address";
    }
}</strong>
</pre>
                There are only two methods to implement.
                The <span class="new_code">test()</span> method should
                evaluate to true if the expectation is to pass, and
                false otherwise.
                The <span class="new_code">testMessage()</span> method
                should simply return some helpful text explaining the test
                that was carried out.
            </p>
            <p>
                This class can now be used in place of the earlier expectation
                classes.
            </p>
        
        <p>
<a class="target" name="unit">
<h2>Under the bonnet of the unit tester</h2>
</a>
</p>
            <p>
                The <a href="SimpleTest" rel="nofollow">http://sourceforge.net/projects/simpletest/">SimpleTest unit testing framework</a>
                also uses the expectation classes internally for the
                <a href="unit_test_documentation.html">UnitTestCase class</a>.
                We can also take advantage of these mechanisms to reuse our
                homebrew expectation classes within the test suites directly.
            </p>
            <p>
                The most crude way of doing this is to use the
                <span class="new_code">SimpleTest::assert()</span> method to
                test against it directly...
<pre>
<strong>class TestOfNetworking extends UnitTestCase {
    ...
    function testGetValidIp() {
        $server = &amp;new Server();
        $this-&gt;assert(
                new ValidIp(),
                $server-&gt;getIp(),
                'Server IP address-&gt;%s');
    }
}</strong>
</pre>
                This is a little untidy compared with our usual
                <span class="new_code">assert...()</span> syntax.
            </p>
            <p>
                For such a simple case we would normally create a
                separate assertion method on our test case rather
                than bother using the expectation class.
                If we pretend that our expectation is a little more
                complicated for a moment, so that we want to reuse it,
                we get...
<pre>
class TestOfNetworking extends UnitTestCase {
    ...<strong>
    function assertValidIp($ip, $message = '%s') {
        $this-&gt;assert(new ValidIp(), $ip, $message);
    }</strong>
    
    function testGetValidIp() {
        $server = &amp;new Server();<strong>
        $this-&gt;assertValidIp(
                $server-&gt;getIp(),
                'Server IP address-&gt;%s');</strong>
    }
}
</pre>
                It is unlikely we would ever need this degree of control
                over the testing machinery.
                It is rare to need the expectations for more than pattern
                matching.
                Also, complex expectation classes could make the tests
                harder to read and debug.
                These mechanisms are really of most use to authors of systems
                that will extend the test framework to create their own tool set.
            </p>
        
    </div>
        References and related information...
        <ul>
<li>
            SimpleTest project page on <a href="SourceForge." rel="nofollow">http://sourceforge.net/projects/simpletest/">SourceForge</a>.
        </li>
<li>
            SimpleTest download page on <a href="LastCraft." rel="nofollow">http://www.lastcraft.com/simple_test.php">LastCraft</a>.
        </li>
<li>
            The expectations mimic the constraints in <a href="JMock." rel="nofollow">http://www.jmock.org/">JMock</a>.
        </li>
<li>
            <a href="Full" rel="nofollow">http://simpletest.sourceforge.net/">Full API for SimpleTest</a>
            from the PHPDoc.
        </li>
</ul>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <span class="chosen">Expectations</span>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<div class="copyright">
            Copyright<br>Marcus Baker 2006
        </div>
</body>
</html>

--- NEW FILE: index.html ---
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>
        Download the Simple Test testing framework -
        Unit tests and mock objects for PHP
    </title>
<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
</head>
<body>
<div class="menu_back">
<div class="menu">
<span class="chosen">SimpleTest</span>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<h1>Simple Test for PHP</h1>
        This page...
        <ul>
<li>
            <a href="#unit">Using unit tester</a>
            with an example.
        </li>
<li>
            <a href="#group">Grouping tests</a>
            for testing with one click.
        </li>
<li>
            <a href="#mock">Using mock objects</a>
            to ease testing and gain tighter control.
        </li>
<li>
            <a href="#web">Testing web pages</a>
            at the browser level.
        </li>
</ul>
<div class="content">
        
        
            <p>
                The following assumes that you are familiar with the concept
                of unit testing as well as the PHP web development language.
                It is a guide for the impatient new user of
                <a href="SimpleTest." rel="nofollow">https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
                For fuller documentation, especially if you are new
                to unit testing see the ongoing
                <a href="unit_test_documentation.html">documentation</a>, and for
                example test cases see the
                <a href="unit" rel="nofollow">http://www.lastcraft.com/first_test_tutorial.php">unit testing tutorial</a>.
            </p>
        
        <p>
<a class="target" name="unit">
<h2>Using the tester quickly</h2>
</a>
</p>
            <p>
                Amongst software testing tools, a unit tester is the one
                closest to the developer.
                In the context of agile development the test code sits right
                next to the source code as both are written simultaneously.
                In this context SimpleTest aims to be a complete PHP developer
                test solution and is called "Simple" because it
                should be easy to use and extend.
                It wasn't a good choice of name really.
                It includes all of the typical functions you would expect from
                <a href="JUnit" rel="nofollow">http://www.junit.org/">JUnit</a> and the
                <a href="PHPUnit" rel="nofollow">http://sourceforge.net/projects/phpunit/">PHPUnit</a>
                ports, but also adds
                <a href="http://www.mockobjects.com">mock objects</a>.
                It has some <a href="JWebUnit" rel="nofollow">http://sourceforge.net/projects/jwebunit/">JWebUnit</a>
                functionality as well.
                This includes web page navigation, cookie testing and form submission.
            </p>
            <p>
                The quickest way to demonstrate is with an example.
            </p>
            <p>
                Let us suppose we are testing a simple file logging class called
                <span class="new_code">Log</span> in <em>classes/log.php</em>.
                We start by creating a test script which we will call
                <em>tests/log_test.php</em> and populate it as follows...
<pre>
&lt;?php<strong>
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');

class TestOfLogging extends UnitTestCase {
}</strong>
?&gt;
</pre>
                Here the <em>simpletest</em> folder is either local or in the path.
                You would have to edit these locations depending on where you
                placed the toolset.
                The <span class="new_code">TestOfLogging</span> is our frst test case and it's
                currently empty.
            </p>
            <p>
                Now we have five lines of scaffolding code and still no tests.
                However from this part on we get return on our investment very quickly.
                We'll assume that the <span class="new_code">Log</span> class
                takes the file name to write to in the constructor and we have
                a temporary folder in which to place this file...
<pre>
&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');

class TestOfLogging extends UnitTestCase {
    <strong>
    function testCreatingNewFile() {
        @unlink('/temp/test.log');
        $log = new Log('/temp/test.log');
        $this-&gt;assertFalse(file_exists('/temp/test.log'));
        $log-&gt;message('Should write this to a file');
        $this-&gt;assertTrue(file_exists('/temp/test.log'));
    }</strong>
}
?&gt;
</pre>
                When a test case runs it will search for any method that
                starts with the string <span class="new_code">test</span>
                and execute that method.
                We would normally have more than one test method of course.
                Assertions within the test methods trigger messages to the
                test framework which displays the result immediately.
                This immediate response is important, not just in the event
                of the code causing a crash, but also so that
                <span class="new_code">print</span> statements can display
                their content right next to the test case concerned.
            </p>
            <p>
                To see these results we have to actually run the tests.
                If this is the only test case we wish to run we can achieve
                it with...
<pre>
&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');
require_once('../classes/log.php');

class TestOfLogging extends UnitTestCase {
    
    function testCreatingNewFile() {
        @unlink('/temp/test.log');
        $log = new Log('/temp/test.log');
        $this-&gt;assertFalse(file_exists('/temp/test.log'));
        $log-&gt;message('Should write this to a file');
        $this-&gt;assertTrue(file_exists('/temp/test.log'));
    }
}
<strong>
$test = &amp;new TestOfLogging();
$test-&gt;run(new HtmlReporter());</strong>
?&gt;
</pre>
            </p>
            <p>
                On failure the display looks like this...
                <div class="demo">
                    <h1>testoflogging</h1>
                    <span class="fail">Fail</span>: testcreatingnewfile-&gt;True assertion failed.<br>
                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
                </div>
                ...and if it passes like this...
                <div class="demo">
                    <h1>testoflogging</h1>
                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
                </div>
				And if you get this...
                <div class="demo">
                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
                </div>
				it means you're missing the <em>classes/Log.php</em> file that could look like...
<pre>
&lt;?php
class Log {
    
        function Log($file_path) {
        }

		function message() {
		}
}
?&gt;;
</pre>
            </p>
        
        <p>
<a class="target" name="group">
<h2>Building group tests</h2>
</a>
</p>
            <p>
                It is unlikely in a real application that we will only ever run
                one test case.
                This means that we need a way of grouping cases into a test
                script that can, if need be, run every test in the application.
            </p>
            <p>
                Our first step is to strip the includes and to undo our
                previous hack...
<pre>
&lt;?php<strong>
require_once('../classes/log.php');</strong>

class TestOfLogging extends UnitTestCase {
    
    function testCreatingNewFile() {
        @unlink('/temp/test.log');
        $log = new Log('/temp/test.log');
        $this-&gt;assertFalse(file_exists('/temp/test.log'));
        $log-&gt;message('Should write this to a file');
        $this-&gt;assertTrue(file_exists('/temp/test.log'));<strong>
    }
}
?&gt;</strong>
</pre>
                Next we create a new file called <em>tests/all_tests.php</em>
                and insert the following code...
<pre>
<strong>&lt;?php
require_once('simpletest/unit_tester.php');
require_once('simpletest/reporter.php');

$test = &amp;new TestSuite('All tests');
$test-&gt;addTestFile('log_test.php');
$test-&gt;run(new HtmlReporter());
?&gt;</strong>
</pre>
                The method <span class="new_code">TestSuite::addTestFile()</span>
                will include the test case file and read any new classes created
                that are descended from <span class="new_code">SimpleTestCase</span>, of which
                <span class="new_code">UnitTestCase</span> is one example.
                Just the class names are stored for now, so that the test runner
                can instantiate the class when it works its way
                through your test suite.
            </p>
            <p>
                For this to work properly the test case file should not blindly include
                any other test case extensions that do not actually run tests.
                This could result in extra test cases being counted during the test
                run.
                Hardly a major problem, but to avoid this inconvenience simply add
                a <span class="new_code">SimpleTestOptions::ignore()</span> directive
                somewhere in the test case file.
                Also the test case file should not have been included
                elsewhere or no cases will be added to this group test.
                This would be a more serious error as if the test case classes are
                already loaded by PHP the <span class="new_code">TestSuite::addTestFile()</span>
                method will not detect them.
            </p>
            <p>
                To display the results it is necessary only to invoke
                <em>tests/all_tests.php</em> from the web server.
            </p>
        
        <p>
<a class="target" name="mock">
<h2>Using mock objects</h2>
</a>
</p>
            <p>
                Let's move further into the future.
            </p>
            <p>
                Assume that our logging class is tested and completed.
                Assume also that we are testing another class that is
                required to write log messages, say a
                <span class="new_code">SessionPool</span>.
                We want to test a method that will probably end up looking
                like this...
<pre>
<strong>
class SessionPool {
    ...
    function logIn($username) {
        ...
        $this-&gt;_log-&gt;message("User $username logged in.");
        ...
    }
    ...
}
</strong>
</pre>
                In the spirit of reuse we are using our
                <span class="new_code">Log</span> class.
                A conventional test case might look like this...
<pre>
<strong>
&lt;?php
require_once('../classes/log.php');
require_once('../classes/session_pool.php');

class TestOfSessionLogging extends UnitTestCase {
    
    function setUp() {
        @unlink('/temp/test.log');
    }
    
    function tearDown() {
        @unlink('/temp/test.log');
    }
    
    function testLogInIsLogged() {
        $log = new Log('/temp/test.log');
        $session_pool = &amp;new SessionPool($log);
        $session_pool-&gt;logIn('fred');
        $messages = file('/temp/test.log');
        $this-&gt;assertEqual($messages[0], "User fred logged in.\n");
    }
}
?&gt;</strong>
</pre>
                This test case design is not all bad, but it could be improved.
                We are spending time fiddling with log files which are
                not part of our test. Worse, we have created close ties
                with the <span class="new_code">Log</span> class and
                this test.
                What if we don't use files any more, but use ths
                <em>syslog</em> library instead?
                Did you notice the extra carriage return in the message?
                Was that added by the logger?
                What if it also added a time stamp or other data?
            </p>
            <p>
                The only part that we really want to test is that a particular
                message was sent to the logger.
                We reduce coupling if we can pass in a fake logging class
                that simply records the message calls for testing, but
                takes no action.
                It would have to look exactly like our original though.
            </p>
            <p>
                If the fake object doesn't write to a file then we save on deleting
                the file before and after each test. We could save even more
                test code if the fake object would kindly run the assertion for us.
            <p>
            </p>
                Too good to be true?
                Luckily we can create such an object easily...
<pre>
&lt;?php
require_once('../classes/log.php');
require_once('../classes/session_pool.php');<strong>
Mock::generate('Log');</strong>

class TestOfSessionLogging extends UnitTestCase {
    
    function testLogInIsLogged() {<strong>
        $log = &amp;new MockLog();
        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
        $session_pool = &amp;new SessionPool($log);
        $session_pool-&gt;logIn('fred');
    }
}
?&gt;
</pre>
                The test will be triggered when the call to
                <span class="new_code">message()</span> is invoked on the
                <span class="new_code">MockLog</span> object.
                The mock call will trigger a parameter comparison and then send the
                resulting pass or fail event to the test display.
                Wildcards can be included here too so as to prevent tests
                becoming too specific.
            </p>
            <p>
                If the mock reaches the end of the test case without the
                method being called, the <span class="new_code">expectOnce()</span>
                expectation will trigger a test failure.
                In other words the mocks can detect the absence of
                behaviour as well as the presence.
            </p>
            <p>
                The mock objects in the SimpleTest suite can have arbitrary
                return values set, sequences of returns, return values
                selected according to the incoming arguments, sequences of
                parameter expectations and limits on the number of times
                a method is to be invoked.
            </p>
            <p>
                For this test to run the mock objects library must have been
                included in the test suite, say in <em>all_tests.php</em>.
            </p>
        
        <p>
<a class="target" name="web">
<h2>Web page testing</h2>
</a>
</p>
            <p>
                One of the requirements of web sites is that they produce web
                pages.
                If you are building a project top-down and you want to fully
                integrate testing along the way then you will want a way of
                automatically navigating a site and examining output for
                correctness.
                This is the job of a web tester.
            </p>
            <p>
                The web testing in SimpleTest is fairly primitive, there is
                no JavaScript for example.
                To give an idea here is a trivial example where a home
                page is fetched, from which we navigate to an "about"
                page and then test some client determined content.
<pre>
&lt;?php<strong>
require_once('simpletest/web_tester.php');</strong>
require_once('simpletest/reporter.php');
<strong>
class TestOfAbout extends WebTestCase {
    
    function setUp() {
        $this-&gt;get('http://test-server/index.php');
        $this-&gt;click('About');
    }
    
    function testSearchEngineOptimisations() {
        $this-&gt;assertTitle('A long title about us for search engines');
        $this-&gt;assertPattern('/a popular keyphrase/i');
    }
}</strong>
$test = &amp;new TestOfAbout();
$test-&gt;run(new HtmlReporter());
?&gt;
</pre>
                With this code as an acceptance test you can ensure that
                the content always meets the specifications of both the
                developers and the other project stakeholders.
            </p>
            <p>
                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
            </p>
        
    </div>
        References and related information...
        <ul>
<li>
            <a href="Download" rel="nofollow">https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Download PHP Simple Test</a>
            from <a href="SourceForge." rel="nofollow">http://sourceforge.net/projects/simpletest/">SourceForge</a>.
        </li>
<li>
            The <a href="developer's" rel="nofollow">http://simpletest.sourceforge.net/">developer's API for SimpleTest</a>
            gives full detail on the classes and assertions available.
        </li>
</ul>
<div class="menu_back">
<div class="menu">
<span class="chosen">SimpleTest</span>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <a href="reporter_documentation.html">Reporting</a>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<div class="copyright">
            Copyright<br>Marcus Baker 2006
        </div>
</body>
</html>

--- NEW FILE: reporter_documentation.html ---
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>SimpleTest for PHP test runner and display documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
</head>
<body>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <span class="chosen">Reporting</span>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<h1>Test reporter documentation</h1>
        This page...
        <ul>
<li>
            Displaying <a href="#html">results in HTML</a>
        </li>
<li>
            Displaying and <a href="#other">reporting results</a>
            in other formats
        </li>
<li>
            Using <a href="#cli">SimpleTest from the command line</a>
        </li>
<li>
            Using <a href="#xml">Using XML</a> for remote testing
        </li>
</ul>
<div class="content">
        
            <p>
                SimpleTest pretty much follows the MVC pattern
                (Model-View-Controller).
                The reporter classes are the view and the model is your
                test cases and their hiearchy.
                The controller is mostly hidden from the user of
                SimpleTest unless you want to change how the test cases
                are actually run, in which case it is possible to
                override the runner objects from within the test case.
                As usual with MVC, the controller is mostly undefined
                and there are other places to control the test run.
            </p>
        
        <p>
<a class="target" name="html">
<h2>Reporting results in HTML</h2>
</a>
</p>
            <p>
                The default test display is minimal in the extreme.
                It reports success and failure with the conventional red and
                green bars and shows a breadcrumb trail of test groups
                for every failed assertion.
                Here's a fail...
                <div class="demo">
                    <h1>File test</h1>
                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
                </div>
                And here all tests passed...
                <div class="demo">
                    <h1>File test</h1>
                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
                </div>
                The good news is that there are several points in the display
                hiearchy for subclassing.
            </p>
            <p>
                For web page based displays there is the
                <span class="new_code">HtmlReporter</span> class with the following
                signature...
<pre>
class HtmlReporter extends SimpleReporter {
    public HtmlReporter($encoding) { ... }
    public makeDry(boolean $is_dry) { ... }
    public void paintHeader(string $test_name) { ... }
    public void sendNoCacheHeaders() { ... }
    public void paintFooter(string $test_name) { ... }
    public void paintGroupStart(string $test_name, integer $size) { ... }
    public void paintGroupEnd(string $test_name) { ... }
    public void paintCaseStart(string $test_name) { ... }
    public void paintCaseEnd(string $test_name) { ... }
    public void paintMethodStart(string $test_name) { ... }
    public void paintMethodEnd(string $test_name) { ... }
    public void paintFail(string $message) { ... }
    public void paintPass(string $message) { ... }
    public void paintError(string $message) { ... }
    public void paintException(string $message) { ... }
    public void paintMessage(string $message) { ... }
    public void paintFormattedMessage(string $message) { ... }
    protected string _getCss() { ... }
    public array getTestList() { ... }
    public integer getPassCount() { ... }
    public integer getFailCount() { ... }
    public integer getExceptionCount() { ... }
    public integer getTestCaseCount() { ... }
    public integer getTestCaseProgress() { ... }
}
</pre>
                Here is what some of these methods mean. First the display methods
                that you will probably want to override...
                <ul class="api">
                    <li>
                        <span class="new_code">HtmlReporter(string $encoding)</span>
<br>
                        is the constructor.
                        Note that the unit test sets up the link to the display
                        rather than the other way around.
                        The display is a mostly passive receiver of test events.
                        This allows easy adaption of the display for other test
                        systems beside unit tests, such as monitoring servers.
                        The encoding is the character encoding you wish to
                        display the test output in.
                        In order to correctly render debug output when
                        using the web tester, this should match the encoding
                        of the site you are trying to test.
                        The available character set strings are described in
                        the PHP <a href="html_entities()" rel="nofollow">http://www.php.net/manual/en/function.htmlentities.php">html_entities()</a>
                        function.
                    </li>
                    <li>
                        <span class="new_code">void paintHeader(string $test_name)</span>
<br>
                        is called once at the very start of the test when the first
                        start event arrives.
                        The first start event is usually delivered by the top level group
                        test and so this is where <span class="new_code">$test_name</span>
                        comes from.
                        It paints the page titles, CSS, body tag, etc.
                        It returns nothing (<span class="new_code">void</span>).
                    </li>
                    <li>
                        <span class="new_code">void paintFooter(string $test_name)</span>
<br>
                        Called at the very end of the test to close any tags opened
                        by the page header.
                        By default it also displays the red/green bar and the final
                        count of results.
                        Actually the end of the test happens when a test end event
                        comes in with the same name as the one that started it all
                        at the same level.
                        The tests nest you see.
                        Closing the last test finishes the display.
                    </li>
                    <li>
                        <span class="new_code">void paintMethodStart(string $test_name)</span>
<br>
                        is called at the start of each test method.
                        The name normally comes from method name.
                        The other test start events behave the same way except
                        that the group test one tells the reporter how large
                        it is in number of held test cases.
                        This is so that the reporter can display a progress bar
                        as the runner churns through the test cases.
                    </li>
                    <li>
                        <span class="new_code">void paintMethodEnd(string $test_name)</span>
<br>
                        backs out of the test started with the same name.
                    </li>
                    <li>
                        <span class="new_code">void paintFail(string $message)</span>
<br>
                        paints a failure.
                        By default it just displays the word fail, a breadcrumbs trail
                        showing the current test nesting and the message issued by
                        the assertion.
                    </li>
                    <li>
                        <span class="new_code">void paintPass(string $message)</span>
<br>
                        by default does nothing.
                    </li>
                    <li>
                        <span class="new_code">string _getCss()</span>
<br>
                        Returns the CSS styles as a string for the page header
                        method.
                        Additional styles have to be appended here if you are
                        not overriding the page header.
                        You will want to use this method in an overriden page header
                        if you want to include the original CSS.
                    </li>
                </ul>
                There are also some accessors to get information on the current
                state of the test suite.
                Use these to enrich the display...
                <ul class="api">
                    <li>
                        <span class="new_code">array getTestList()</span>
<br>
                        is the first convenience method for subclasses.
                        Lists the current nesting of the tests as a list
                        of test names.
                        The first, most deeply nested test, is first in the
                        list and the current test method will be last.
                    </li>
                    <li>
                        <span class="new_code">integer getPassCount()</span>
<br>
                        returns the number of passes chalked up so far.
                        Needed for the display at the end.
                    </li>
                    <li>
                        <span class="new_code">integer getFailCount()</span>
<br>
                        is likewise the number of fails so far.
                    </li>
                    <li>
                        <span class="new_code">integer getExceptionCount()</span>
<br>
                        is likewise the number of errors so far.
                    </li>
                    <li>
                        <span class="new_code">integer getTestCaseCount()</span>
<br>
                        is the total number of test cases in the test run.
                        This includes the grouping tests themselves.
                    </li>
                    <li>
                        <span class="new_code">integer getTestCaseProgress()</span>
<br>
                        is the number of test cases completed so far.
                    </li>
                </ul>
                One simple modification is to get the HtmlReporter to display
                the passes as well as the failures and errors...
<pre>
<strong>class ShowPasses extends HtmlReporter {
    
    function paintPass($message) {
        parent::paintPass($message);
        print "&amp;&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
        $breadcrumb = $this-&gt;getTestList();
        array_shift($breadcrumb);
        print implode("-&amp;gt;", $breadcrumb);
        print "-&amp;gt;$message&lt;br /&gt;\n";
    }
    
    function _getCss() {
        return parent::_getCss() . ' .pass { color: green; }';
    }
}</strong>
</pre>
            </p>
            <p>
                One method that was glossed over was the <span class="new_code">makeDry()</span>
                method.
                If you run this method, with no parameters, on the reporter
                before the test suite is run no actual test methods
                will be called.
                You will still get the events of entering and leaving the
                test methods and test cases, but no passes or failures etc,
                because the test code will not actually be executed.
            </p>
            <p>
                The reason for this is to allow for more sophistcated
                GUI displays that allow the selection of individual test
                cases.
                In order to build a list of possible tests they need a
                report on the test structure for drawing, say a tree view
                of the test suite.
                With a reporter set to dry run that just sends drawing events
                this is easily accomplished.
            </p>
        
        <p>
<a class="target" name="other">
<h2>Extending the reporter</h2>
</a>
</p>
            <p>
                Rather than simply modifying the existing display, you might want to
                produce a whole new HTML look, or even generate text or XML.
                Rather than override every method in
                <span class="new_code">HtmlReporter</span> we can take one
                step up the class hiearchy to <span class="new_code">SimpleReporter</span>
                in the <em>simple_test.php</em> source file.
            </p>
            <p>
                A do nothing display, a blank canvas for your own creation, would
                be...
<pre>
<strong>require_once('simpletest/simple_test.php');</strong>

class MyDisplay extends SimpleReporter {<strong>
    </strong>
    function paintHeader($test_name) {
    }
    
    function paintFooter($test_name) {
    }
    
    function paintStart($test_name, $size) {<strong>
        parent::paintStart($test_name, $size);</strong>
    }
    
    function paintEnd($test_name, $size) {<strong>
        parent::paintEnd($test_name, $size);</strong>
    }
    
    function paintPass($message) {<strong>
        parent::paintPass($message);</strong>
    }
    
    function paintFail($message) {<strong>
        parent::paintFail($message);</strong>
    }
}
</pre>
                No output would come from this class until you add it.
            </p>
        
        <p>
<a class="target" name="cli">
<h2>The command line reporter</h2>
</a>
</p>
            <p>
                SimpleTest also ships with a minimal command line reporter.
                The interface mimics JUnit to some extent, but paints the
                failure messages as they arrive.
                To use the command line reporter simply substitute it
                for the HTML version...
<pre>
&lt;?php
    require_once('simpletest/unit_tester.php');
    require_once('simpletest/reporter.php');

    $test = &amp;new TestSuite('File test');
    $test-&gt;addTestFile('tests/file_test.php');
    $test-&gt;run(<strong>new TextReporter()</strong>);
?&gt;
</pre>
                Then invoke the test suite from the command line...
<pre class="shell">
php file_test.php
</pre>
                You will need the command line version of PHP installed
                of course.
                A passing test suite looks like this...
<pre class="shell">
File test
OK
Test cases run: 1/1, Failures: 0, Exceptions: 0
</pre>
                A failure triggers a display like this...
<pre class="shell">
File test
1) True assertion failed.
	in createnewfile
FAILURES!!!
Test cases run: 1/1, Failures: 1, Exceptions: 0
</pre>
            </p>
            <p>
                One of the main reasons for using a command line driven
                test suite is of using the tester as part of some automated
                process.
                To function properly in shell scripts the test script should
                return a non-zero exit code on failure.
                If a test suite fails the value <span class="new_code">false</span>
                is returned from the <span class="new_code">SimpleTest::run()</span>
                method.
                We can use that result to exit the script with the desired return
                code...
<pre>
&lt;?php
    require_once('simpletest/unit_tester.php');
    require_once('simpletest/reporter.php');

    $test = &amp;new TestSuite('File test');
    $test-&gt;addTestFile('tests/file_test.php');
    <strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
?&gt;
</pre>
                Of course we don't really want to create two test scripts,
                a command line one and a web browser one, for each test suite.
                The command line reporter includes a method to sniff out the
                run time environment...
<pre>
&lt;?php
    require_once('simpletest/unit_tester.php');
    require_once('simpletest/reporter.php');

    $test = &amp;new TestSuite('File test');
    $test-&gt;addTestFile('tests/file_test.php');
    <strong>if (TextReporter::inCli()) {</strong>
        exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
    <strong>}</strong>
    $test-&gt;run(new HtmlReporter());
?&gt;
</pre>
                This is the form used within SimpleTest itself.
            </p>
        
        <p>
<a class="target" name="xml">
<h2>Remote testing</h2>
</a>
</p>
            <p>
                SimpleTest ships with an <span class="new_code">XmlReporter</span> class
                used for internal communication.
                When run the output looks like...
<pre class="shell">
&lt;?xml version="1.0"?&gt;
&lt;run&gt;
  &lt;group size="4"&gt;
    &lt;name&gt;Remote tests&lt;/name&gt;
    &lt;group size="4"&gt;
      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
      &lt;case&gt;
        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
        &lt;test&gt;
          &lt;name&gt;testofresults&lt;/name&gt;
          &lt;pass&gt;This assertion passed&lt;/pass&gt;
          &lt;fail&gt;This assertion failed&lt;/fail&gt;
        &lt;/test&gt;
        &lt;test&gt;
          ...
        &lt;/test&gt;
      &lt;/case&gt;
    &lt;/group&gt;
  &lt;/group&gt;
&lt;/run&gt;
</pre>
                You can make use of this format with the parser
                supplied as part of SimpleTest itself.
                This is called <span class="new_code">SimpleTestXmlParser</span> and
                resides in <em>xml.php</em> within the SimpleTest package...
<pre>
&lt;?php
    require_once('simpletest/xml.php');
    
    ...
    $parser = &amp;new SimpleTestXmlParser(new HtmlReporter());
    $parser-&gt;parse($test_output);
?&gt;
</pre>
                The <span class="new_code">$test_output</span> should be the XML format
                from the XML reporter, and could come from say a command
                line run of a test case.
                The parser sends events to the reporter just like any
                other test run.
                There are some odd occasions where this is actually useful.
            </p>
            <p>
                A problem with large test suites is thet they can exhaust
                the default 8Mb memory limit on a PHP process.
                By having the test groups output in XML and run in
                separate processes, the output can be reparsed to
                aggregate the results into a much smaller footprint top level
                test.
            </p>
            <p>
                Because the XML output can come from anywhere, this opens
                up the possibility of aggregating test runs from remote
                servers.
                A test case already exists to do this within the SimpleTest
                framework, but it is currently experimental...
<pre>
&lt;?php
    <strong>require_once('../remote.php');</strong>
    require_once('../reporter.php');
    
    $test_url = ...;
    $dry_url = ...;
    
    $test = &amp;new TestSuite('Remote tests');
    $test-&gt;addTestCase(<strong>new RemoteTestCase($test_url, $dry_url)</strong>);
    $test-&gt;run(new HtmlReporter());
?&gt;
</pre>
                The <span class="new_code">RemoteTestCase</span> takes the actual location
                of the test runner, basically a web page in XML format.
                It also takes the URL of a reporter set to do a dry run.
                This is so that progress can be reported upward correctly.
                The <span class="new_code">RemoteTestCase</span> can be added to test suites
                just like any other group test.
            </p>
        
    </div>
        References and related information...
        <ul>
<li>
            SimpleTest project page on <a href="SourceForge." rel="nofollow">http://sourceforge.net/projects/simpletest/">SourceForge</a>.
        </li>
<li>
            SimpleTest download page on <a href="LastCraft." rel="nofollow">http://www.lastcraft.com/simple_test.php">LastCraft</a>.
        </li>
<li>
            The <a href="developer's" rel="nofollow">http://simpletest.sourceforge.net/">developer's API for SimpleTest</a>
            gives full detail on the classes and assertions available.
        </li>
</ul>
<div class="menu_back">
<div class="menu">
<a href="index.html">SimpleTest</a>
                |
                <a href="overview.html">Overview</a>
                |
                <a href="unit_test_documentation.html">Unit tester</a>
                |
                <a href="group_test_documentation.html">Group tests</a>
                |
                <a href="mock_objects_documentation.html">Mock objects</a>
                |
                <a href="partial_mocks_documentation.html">Partial mocks</a>
                |
                <span class="chosen">Reporting</span>
                |
                <a href="expectation_documentation.html">Expectations</a>
                |
                <a href="web_tester_documentation.html">Web tester</a>
                |
                <a href="form_testing_documentation.html">Testing forms</a>
                |
                <a href="authentication_documentation.html">Authentication</a>
                |
                <a href="browser_documentation.html">Scriptable browser</a>
</div>
</div>
<div class="copyright">
            Copyright<br>Marcus Baker 2006
        </div>
</body>
</html>

--- NEW FILE: docs.css ---
body {
    paddi...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/include/simpletest/test/support/collector
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/test/support/collector

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/test/support/collector added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest/test
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/test

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/test added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest/docs
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/docs

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/docs added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest/docs/en
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/docs/en

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/docs/en added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest/docs/fr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/docs/fr

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/docs/fr added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest/extensions
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/extensions

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/extensions added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest/test/support
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest/test/support

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest/test/support added to the repository

Update of /cvsroot/tutos/tutos/include/simpletest
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13644/include/simpletest

Log Message:
Directory /cvsroot/tutos/tutos/include/simpletest added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13092/php

Modified Files:
      Tag: BRANCH-2-0
	timetrack_new.php 
Log Message:
Change the timetrack_new page for speed

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.50.2.14
retrieving revision 1.50.2.15
diff -u -d -r1.50.2.14 -r1.50.2.15
--- timetrack_new.php	23 May 2007 10:05:20 -0000	1.50.2.14
+++ timetrack_new.php	5 Jun 2007 13:06:56 -0000	1.50.2.15
@@ -6,336 +6,320 @@
  * @module timetrack_new
  * @package timetrack
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'timetrack.pinc';
- include_once 'task.pinc';
-
- include_once 'layout/layout.pinc';
-
- /* Check if user is allowed to use it */
- check_user();
- loadmodules("timetrack","new");
+include_once 'webelements.p3';
+include_once 'permission.p3';
+include_once 'timetrack.pinc';
+include_once 'task.pinc';
 
- /**
-  * change/modify a timetrack entry
-  */
- class timetrack_new extends layout {
-   /**
-    * display the form
-    */
-   Function info() {
-     global $lang, $tutos,$table;
+include_once 'layout/layout.pinc';
 
-     if ( $this->mode == 1 ) {
-       # if we are in time record mode we first give a list of all OPEN records
-       $q = "SELECT * from ". $this->obj->tablename ." WHERE t_start is not null AND t_end is NULL and adr_id = ". $this->obj->worker->id;
-       $r = $this->dbconn->Exec($q);
-       $n = $r->numrows();
-       $a = 0;
-       if ( $n > 0 ) {
-         echo $this->DataTableStart();
-         echo "<tr>\n";
-         echo "<th>". $lang['Timetrack'] ."</th>\n";
-         echo "<th>". $lang['AppStart'] ."</th>\n";
-         echo "<th>". $lang['TimetrackRef'] ."</th>\n";
-         echo "<th>". $lang['TimetrackModify'] ."</th>\n";
-         echo "<th>". $lang['TTfinish'] ."</th>\n";
-         echo "</tr>\n";
-       }
-       $line = 0 ;
-       while ( $a < $n ) {
-         $f = new timetrack($this->dbconn);
-         $f->read_result($r,$a);
-         $a++;
-         echo $this->OverviewRowStart($line);
-         echo "<td>". $f->getLink() ."</td>";
-         echo "<td>". $f->t_start->getDateTime() ."</td>";
-         echo "<td>". $f->ref->getLink() ."</td>";
-         echo "<td>". makelink("timetrack_new.php?mode=2&id=". $f->id,$lang['Modify'],$lang['TimetrackModify']) ."</td>";
-         echo "<td>". makelink("timetrack_finish.php?id=". $f->id,$lang['TTfinish'],$lang['TTfinish']) ."</td>";
-         echo $this->OverviewRowEnd($line++);
-       }
-       $r->free();
-       if ( $n > 0 ) {
-         echo $this->DataTableEnd();
-         return;
-       }
-     }
+/* Check if user is allowed to use it */
+check_user();
+loadmodules("timetrack","new");
 
-     /**
-      * Here begins the template stuff
-      *
-      * Note for the moment just one mode is implemented, other ways
-      * of displaying a timetrack are to be reviewed before to be
-      * re-implemented  as is  in the v2.
-      */
+/**
+ * change/modify a timetrack entry
+ */
+class timetrack_new extends layout {
+    /**
+     * display the form
+     */
+    Function info() {
+        global $lang, $tutos,$table;
 
-     $this->assign('action', 'timetrack_ins.php');
-     $this->assign('mode', $mode);
-     $this->assign('id', $this->obj->id);
-     $this->assign('lid', $this->obj->ref->id);
+        if ( $this->mode == 1 ) {
+            # if we are in time record mode we first give a list of all OPEN records
+            $q = "SELECT * from ". $this->obj->tablename ." WHERE t_start is not null AND t_end is NULL and adr_id = ". $this->obj->worker->id;
+            $r = $this->dbconn->Exec($q);
+            $n = $r->numrows();
+            $a = 0;
+            if ( $n > 0 ) {
+                echo $this->DataTableStart();
+                echo "<tr>\n";
+                echo "<th>". $lang['Timetrack'] ."</th>\n";
+                echo "<th>". $lang['AppStart'] ."</th>\n";
+                echo "<th>". $lang['TimetrackRef'] ."</th>\n";
+                echo "<th>". $lang['TimetrackModify'] ."</th>\n";
+                echo "<th>". $lang['TTfinish'] ."</th>\n";
+                echo "</tr>\n";
+            }
+            $line = 0 ;
+            while ( $a < $n ) {
+                $f = new timetrack($this->dbconn);
+                $f->read_result($r,$a);
+                $a++;
+                echo $this->OverviewRowStart($line);
+                echo "<td>". $f->getLink() ."</td>";
+                echo "<td>". $f->t_start->getDateTime() ."</td>";
+                echo "<td>". $f->ref->getLink() ."</td>";
+                echo "<td>". makelink("timetrack_new.php?mode=2&id=". $f->id,$lang['Modify'],$lang['TimetrackModify']) ."</td>";
+                echo "<td>". makelink("timetrack_finish.php?id=". $f->id,$lang['TTfinish'],$lang['TTfinish']) ."</td>";
+                echo $this->OverviewRowEnd($line++);
+            }
+            $r->free();
+            if ( $n > 0 ) {
+                echo $this->DataTableEnd();
+                return;
+            }
+        }
 
-     $this->assign('hours', $lang['hours']);
+        /**
+         * Here begins the template stuff
+         *
+         * Note for the moment just one mode is implemented, other ways
+         * of displaying a timetrack are to be reviewed before to be
+         * re-implemented  as is  in the v2.
+         */
 
-     if( ($this->obj->ref != -1)
-	  && ($this->obj->ref->gettype() != "address") ) {
+        $this->assign('action', 'timetrack_ins.php');
+        $this->assign('mode', $mode);
+        $this->assign('id', $this->obj->id);
+        $this->assign('lid', $this->obj->ref->id);
 
-       $parents = array();
-       $x = $this->obj->ref;
-       while ( isset ( $x ) ) {
-         // echo $pre . $lang[$x->gettype()] . "&nbsp;" . $x->getLink();
-	 $parents[] = array('label' => $x->getFullName(),
-			    'title' => $x->getFullName(),
-			    'link'  => $x->getUrl(),
-			    'type'  => $lang[$x->gettype()]);
+        $this->assign('hours', $lang['hours']);
 
-         if( isset($x->parent) && $x->parent != -1 )
-           $x = $x->parent;
-         else
-           unset($x);
-       }
-       // $this->debug($parents);
-       $this->assign('parents',
-		     array('label'   => $lang['TaskSubTask'],
-			   'parents' => $parents));
-     }
+        if( ($this->obj->ref != -1) && ($this->obj->ref->gettype() != "address") ) {
 
-     $this->assign('ref',
-		   array('id'    => $this->obj->ref->id,
-			 'label' => $lang['TimetrackRef'],
-			 'value' => $this->obj->ref->getFullName(),
-			 'title' => $this->obj->ref->getFullName(),
-			 'link'  => $this->obj->ref->getUrl()));
+            $parents = array();
+            $x = $this->obj->ref;
+            $limit = 2;
+            while ( isset ( $x ) && $limit) {
+                // echo $pre . $lang[$x->gettype()] . "&nbsp;" . $x->getLink();
+                $parents[] = array('label' => $x->getFullName(),
+                                   'title' => $x->getFullName(),
+                                   'link'  => $x->getUrl(),
+                                   'type'  => $lang[$x->gettype()]);
 
-     $this->assign('worker',
-		   array('id'    => 'w',
-			 'name'  => "wfn",
-			 'label' => $lang['TimetrackWorker'],
-			 'value' => $this->obj->worker->getFullName(),
-			 'title' => $this->obj->worker->getFullName(),
-			 'link'  => $this->obj->worker->getUrl()));
-				   
+                if( isset($x->parent) && $x->parent != -1 )
+                    $x = $x->parent;
+                else
+                    unset($x);
+                $limit--;
+            }
+            // $this->debug($parents);
+            $this->assign('parents', array('label'   => $lang['TaskSubTask'], 'parents' => $parents));
+        }
 
-     $this->assign('volume_done',
-		   array('name'  => 'volume',
-			 'label' => $lang['TaskVolumeDone'],
-			 'value' => number_format($this->obj->volume, 2,
-						  $lang['DecPoint'],
-						  $lang['ThousandPoint'])));
+        $this->assign('ref', array('id'    => $this->obj->ref->id,
+                                   'label' => $lang['TimetrackRef'],
+                                   'value' => $this->obj->ref->getFullName(),
+                                   'title' => $this->obj->ref->getFullName(),
+                                   'link'  => $this->obj->ref->getUrl()));
 
-     $this->assign_date($lang['atDateTime'], "wd", $this->obj->wday);
+        $this->assign('worker', array('id'    => 'w',
+                                      'name'  => "wfn",
+                                      'label' => $lang['TimetrackWorker'],
+                                      'value' => $this->obj->worker->getFullName(),
+                                      'title' => $this->obj->worker->getFullName(),
+                                      'link'  => $this->obj->worker->getUrl()));
+         
 
-     $this->assign('ref_type', $this->obj->ref->getType());
+        $this->assign('volume_done', array('name'  => 'volume',
+                                           'label' => $lang['TaskVolumeDone'],
+                                           'value' => number_format($this->obj->volume, 2, $lang['DecPoint'], $lang['ThousandPoint'])));
 
-     if( $this->obj->ref->getType() == "task" ) {
-       if( $this->obj->ref->volume_todo == -1 )
-         $volume_todo = $this->obj->ref->volume - $this->obj->ref->volume_done;
-       else
-         $volume_todo = $this->obj->ref->volume_todo;
+        $this->assign_date($lang['atDateTime'], "wd", $this->obj->wday);
+        $this->assign('ref_type', $this->obj->ref->getType());
 
+		if( $this->obj->ref->getType() == "task" ) {
+		    if( $this->obj->ref->volume_todo == -1 )
+			    $volume_todo = $this->obj->ref->volume - $this->obj->ref->volume_done;
+		    else
+			    $volume_todo = $this->obj->ref->volume_todo;
 
-       // give a check box for the user to choose to indicate volume
-       // done or to ask the system to calculate it
-       $this->assign('calc_volume_todo',
-		     array('id'    => 'calc_volume_todo',
-			   'label' => $lang['TaskVolumeTodoC'],
-			   'value' => 0));
 
-       $this->assign('volume_todo',
-		     array('name'  => 'volume_todo',
-			   'label' => $lang['TaskVolumeTodo'],
-			   'value' => $volume_todo));
-     }
+			// give a check box for the user to choose to indicate volume
+			// done or to ask the system to calculate it
+			$this->assign('calc_volume_todo', array('id'    => 'calc_volume_todo',
+						                            'label' => $lang['TaskVolumeTodoC'],
+						                            'value' => 0));
+            $this->assign('volume_todo', array('name'  => 'volume_todo',
+						                       'label' => $lang['TaskVolumeTodo'],
+						                       'value' => $volume_todo));
+        }
 
-     $this->assign('useinvoice', $tutos[useinvoice]);
-     if( $tutos[useinvoice] == 1 ) {
-       $this->assign('currency',
-		     array('id'       => 'cph',
-			   'name'     => 'currency',
-			   'label'    => $lang['TTcph'],
-			   'value'    => number_format($this->obj->cph, 2,
-						       $lang['DecPoint'],
-						       $lang['ThousandPoint']),
-			   'options'  => $tutos[currencies],
-			   'currency' => $this->obj->currency));
-       
-       $this->assign('state',
-		     array('id'      => 'id',
-			   'name'    => 'state',
-			   'label'   => $lang['TTState'],
-			   'value'   => $this->obj->state,
-			   'options' => $lang['TTStates']));
-     }
+        $this->assign('useinvoice', $tutos[useinvoice]);
+		if( $tutos[useinvoice] == 1 ) {
+		    $this->assign('currency',
+			       	      array('id'       => 'cph',
+					 	        'name'     => 'currency',
+						        'label'    => $lang['TTcph'],
+						        'value'    => number_format($this->obj->cph, 2,$lang['DecPoint'],$lang['ThousandPoint']),
+						        'options'  => $tutos[currencies],
+						        'currency' => $this->obj->currency));
+						       
+			$this->assign('state',
+					      array('id'      => 'id',
+			 			        'name'    => 'state',
+						        'label'   => $lang['TTState'],
+						        'value'   => $this->obj->state,
+						        'options' => $lang['TTStates']));
+	    }
 
-     $this->assign('desc',
-		   array('name'  => 'desc',
-			 'label' => $lang['Description'],
-			 'value' => $this->obj->desc,
-			 'size'  => $table['timetrack']['description'][size]));
+		$this->assign('desc',
+					  array('name'  => 'desc',
+		 				    'label' => $lang['Description'],
+						    'value' => $this->obj->desc,
+						    'size'  => $table['timetrack']['description'][size]));
 
-     $this->assign('InputOk',   $lang['InputOk']);
-     $this->assign('ChangesOk', $lang['ChangesOk']);
-     $this->assign('Enter', $lang['Enter']);
-     $this->assign('Reset', $lang['Reset']);
+        $this->assign('InputOk',   $lang['InputOk']);
+		$this->assign('ChangesOk', $lang['ChangesOk']);
+		$this->assign('Enter', $lang['Enter']);
+		$this->assign('Reset', $lang['Reset']);
 
-     $this->assign('focus', "ttadd.name");
+		$this->assign('focus', "ttadd.name");
 
-     $this->assign('FldsRequired', $lang['FldsRequired']);
+		$this->assign('FldsRequired', $lang['FldsRequired']);
 
-     $this->template('timetrack_new');
-   }
+		$this->template('timetrack_new');
+    }
 
-   /**
-    * navigate
-    */
-   Function navigate() {
-     global $lang;
+    /**
+     * navigate
+     */
+    Function navigate() {
+        global $lang;
 
-     $this->menu_categories['obj'] =
-       array('label' => $lang['Timetrack'],
-	     'icon'  => 'timetrack');     
-   }
+        $this->menu_categories['obj'] =
+        array('label' => $lang['Timetrack'],
+        'icon'  => 'timetrack');
+    }
 
-   /**
-    * prepare
-    */
-   Function prepare() {
-     global $msg,$tutos,$lang;
-     #
-     # Mode
-     # 0 = classical Timetrack
-     # 1 = timerecord with a list of open entries
-     # 2 = timerecord editable
-     #
-     if ( isset($_GET['mode']) ) {
-       $this->mode = $_GET['mode'];
-     } else {
-       $this->mode = 0;
-     }
-     $this->obj = new timetrack($this->dbconn);
-     if ( isset($_GET['id']) && ($_GET['id'] > 0) ) {
-       # existing timetrack
-       $this->obj->read($_GET['id']);
-       if ( ($this->obj->t_start->notime == 0) && ( $this->mode != 2) ) {
-         $this->mode = 1;
-       }
-       if ( ($this->obj->id < 0) ) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
-         $this->stop = true;
-       }
-     } else {
-       # new stuff
-       if ( $this->mode == 1 ) {
-         $this->obj->t_start = new TutosDateTime();
-       }
-       $this->obj->ref = $this->user;
-     }
-     $this->obj->read_relations();
+    /**
+     * prepare
+     */
+    Function prepare() {
+        global $msg,$tutos,$lang;
+        #
+        # Mode
+        # 0 = classical Timetrack
+        # 1 = timerecord with a list of open entries
+        # 2 = timerecord editable
+        #
+        if ( isset($_GET['mode']) ) {
+            $this->mode = $_GET['mode'];
+        } else {
+            $this->mode = 0;
+        }
+        $this->obj = new timetrack($this->dbconn);
+        if ( isset($_GET['id']) && ($_GET['id'] > 0) ) {
+            # existing timetrack
+            $this->obj->read($_GET['id']);
+            if ( ($this->obj->t_start->notime == 0) && ( $this->mode != 2) ) {
+                $this->mode = 1;
+            }
+            if ( ($this->obj->id < 0) ) {
+                $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+                $this->stop = true;
+            }
+        } else {
+            # new stuff
+            if ( $this->mode == 1 ) {
+                $this->obj->t_start = new TutosDateTime();
+            }
+            $this->obj->ref = $this->user;
+        }
+        $this->obj->read_relations();
 
-     if ( ($this->obj->id < 0) && !$this->user->feature_ok(usetimetrack,PERM_NEW) ) {
-       $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
-       $this->stop = true;
-     }
-     if ( $this->mode != 0 ) {
-       $this->name = $lang['TTRecord'];
-     } else if ( $this->obj->id > 0 )  {
-       $this->name = $lang['TimetrackModify'];
-     } else {
-       $this->name = $lang['TimetrackNew'];
-     }
+        if ( ($this->obj->id < 0) && !$this->user->feature_ok(usetimetrack,PERM_NEW) ) {
+            $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
+            $this->stop = true;
+        }
+        if ( $this->mode != 0 ) {
+            $this->name = $lang['TTRecord'];
+        } else if ( $this->obj->id > 0 )  {
+            $this->name = $lang['TimetrackModify'];
+        } else {
+            $this->name = $lang['TimetrackNew'];
+        }
 
-     if ( isset($_GET['reftype']) ) {
-       $this->obj->reftype = StripSlashes($_GET['reftype']);
-     } else {
-       $this->obj->reftype = "";
-     }
-     if ( isset($_GET['desc']) ) {
-       $this->obj->desc = StripSlashes($_GET['desc']);
-     }
-     if ( isset($_GET['volume']) ) {
-       $this->obj->volume = $_GET['volume'];
-     }
-     if ( isset($_GET['state']) ) {
-       $this->obj->state = $_GET['state'];
-     }
-     if ( isset($_GET['cph']) ) {
-       $this->obj->cph = $_GET['cph'];
-     }
-     if ( isset($_GET['currency']) ) {
-       $this->obj->currncy = $_GET['currency'];
-     }
-     if ( isset($_GET['wd']) ) {
-       $this->obj->wday->setDateTime($_GET['wd']);
-     }
-     if ( isset($_GET['start']) ) {
-       $this->obj->t_start->setDateTime($_GET['start']);
-     }
-     if ( isset($_GET['end']) ) {
-       $this->obj->t_end->setDateTime($_GET['end']);
-     }
+        if ( isset($_GET['reftype']) ) {
+            $this->obj->reftype = StripSlashes($_GET['reftype']);
+        } else {
+            $this->obj->reftype = "";
+        }
+        if ( isset($_GET['desc']) ) {
+            $this->obj->desc = StripSlashes($_GET['desc']);
+        }
+        if ( isset($_GET['volume']) ) {
+            $this->obj->volume = $_GET['volume'];
+        }
+        if ( isset($_GET['state']) ) {
+            $this->obj->state = $_GET['state'];
+        }
+        if ( isset($_GET['cph']) ) {
+            $this->obj->cph = $_GET['cph'];
+        }
+        if ( isset($_GET['currency']) ) {
+            $this->obj->currncy = $_GET['currency'];
+        }
+        if ( isset($_GET['wd']) ) {
+            $this->obj->wday->setDateTime($_GET['wd']);
+        }
+        if ( isset($_GET['start']) ) {
+            $this->obj->t_start->setDateTime($_GET['start']);
+        }
+        if ( isset($_GET['end']) ) {
+            $this->obj->t_end->setDateTime($_GET['end']);
+        }
 
-     preset_from_array_or_input($this->obj,'worker',"w");
-     preset_from_array_or_input($this->obj,'ref',"l");
+        preset_from_array_or_input($this->obj,'worker',"w");
+        preset_from_array_or_input($this->obj,'ref',"l");
 
-	 if ($this->obj->ref == -1) {
-       $this->obj->link_id = -1;
-	 } else {
-       $this->obj->link_id = $this->obj->ref->id;
-	 }
-     if ( $this->obj->link_id == -1 ) {
-       $msg .= "Unknown reference";
-       $this->stop = true;
-     }
+        if ($this->obj->ref == -1) {
+            $this->obj->link_id = -1;
+        } else {
+            $this->obj->link_id = $this->obj->ref->id;
+        }
+        if ( $this->obj->link_id == -1 ) {
+            $msg .= "Unknown reference";
+            $this->stop = true;
+        }
 
-     # menu
-     $x = timetrack::getSelectLink($this->user);
-     $x['category'][] = "obj";
-     $x['image'] = "search";
-     $this->addmenu($x);
+        # menu
+        $x = timetrack::getSelectLink($this->user);
+        $x['category'][] = "obj";
+        $x['image'] = "search";
+        $this->addmenu($x);
 
-     $x = timetrack::getaddlink($this->user,$this->obj->ref);
-     $this->addMenu($x);
+        $x = timetrack::getaddlink($this->user,$this->obj->ref);
+        $this->addMenu($x);
 
-     if ( ($this->obj->id > 0)
-	  && $this->obj->del_ok() && ($this->obj->ref >0 ) ) {
-       $x = array('url'  => $this->obj->getDelURL(),
-                  'text' => $lang['Delete'],
-                  'info' => sprintf($lang['TimetrackDelI'],
-				    $this->obj->ref->getFullname()),
-		  'image' => 'delete',
-                  'confirm' => true,
-                  'category' => array("timetrack","del","obj")
-                 );
-       $this->addMenu($x);
-     }
+        if ( ($this->obj->id > 0)
+        && $this->obj->del_ok() && ($this->obj->ref >0 ) ) {
+            $x = array('url'  => $this->obj->getDelURL(),
+            'text' => $lang['Delete'],
+            'info' => sprintf($lang['TimetrackDelI'],
+            $this->obj->ref->getFullname()),
+            'image' => 'delete',
+            'confirm' => true,
+            'category' => array("timetrack","del","obj")
+            );
+            $this->addMenu($x);
+        }
 
-     if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
-       $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
-                   'text'  => $lang['AclDetail'],
-		   'image' => 'acls',
-                   'info'  => sprintf($lang['AclDetailI'],
-				      $this->obj->getFullname()),
-                   'category' => array("timetrack", "acl","obj")
-                 );
-       $this->addMenu($x);
-     }
-     add_module_newlinks($this,$this->obj);
-     
-     // read the rates possible for this new timetrack
-     if ( class_exists ("rate") ) {
-       rate::obj_read($this->obj);
-     }
+        if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
+            $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
+            'text'  => $lang['AclDetail'],
+            'image' => 'acls',
+            'info'  => sprintf($lang['AclDetailI'],
+            $this->obj->getFullname()),
+            'category' => array("timetrack", "acl","obj")
+            );
+            $this->addMenu($x);
+        }
+        add_module_newlinks($this,$this->obj);
+         
+        // read the rates possible for this new timetrack
+        if ( class_exists ("rate") ) {
+            rate::obj_read($this->obj);
+        }
 
-     web_StackStartLayout($this,"timetrack_new.php","timetrack_new.php?".$_SERVER['QUERY_STRING']);          
-   }
- }
+        web_StackStartLayout($this,"timetrack_new.php","timetrack_new.php?".$_SERVER['QUERY_STRING']);
+    }
+}
 
- $l = new timetrack_new($current_user);
- $l->display();
- $dbconn->Close();
-?>
-<!--
-    CVS Info:  $Id$
-    $Author$
--->
\ No newline at end of file
+$l = new timetrack_new($current_user);
+$l->display();
+$dbconn->Close();
+?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13092/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	timetrack_new.tpl 
Log Message:
Change the timetrack_new page for speed

Index: timetrack_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_new.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- timetrack_new.tpl	26 May 2005 15:12:51 -0000	1.1.2.7
+++ timetrack_new.tpl	5 Jun 2007 13:06:57 -0000	1.1.2.8
@@ -19,7 +19,7 @@
 {if $parents != ""}
  
 {foreach name=parents from=$parents.parents item=p}
- {if not $smarty.foreach.parents.first}»{/if}
+ {if not $smarty.foreach.parents.first} >{/if}
   
  {$p.type}
   

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21176/layout

Modified Files:
	classic_base.pinc classic_layout.pinc layout_base.pinc 
	new_layout.pinc test_layout.pinc 
Log Message:
nothing important

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- new_layout.pinc	4 Apr 2007 19:14:35 -0000	1.70
+++ new_layout.pinc	1 Jun 2007 19:08:36 -0000	1.71
@@ -500,6 +500,11 @@
     echo "<!-- all rights reserved -->\n";
     echo " <head>\n";
     echo "  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=". $lang['content_encoding'] ."\"".$c;
+    echo '  <title>TUTOS -- '. myentities($this->name);
+    if (isset($this->dbconn)) {
+      echo " -- ". $this->dbconn->db->alias ."";
+    }
+    echo "</title>\n";
     echo "  <meta name=\"GENERATOR\" content=\"TUTOS ". $tutos[version] ."\"".$c;
     if ( isset($tutos[lang]) && $tutos[lang] != "" ) {
       echo '  <meta name="language" content="'. $tutos[lang] .'"'.$c;
@@ -542,11 +547,6 @@
     # TUTOS javascript
     #
     echo '  <script type="text/javascript" language="JavaScript" src="'. getBaseUrl().$tutos['base'] .'/html/tutos.js"></script>'."\n";
-    echo '  <title>TUTOS -- '. myentities($this->name);
-    if (isset($this->dbconn)) {
-      echo " -- ". $this->dbconn->db->alias ."";
-    }
-    echo "</title>\n";
     echo " </head>\n";
     echo " <body>\n";
   }

Index: classic_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/classic_layout.pinc,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- classic_layout.pinc	19 Nov 2006 09:26:45 -0000	1.50
+++ classic_layout.pinc	1 Jun 2007 19:08:36 -0000	1.51
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2006 by Gero Kohnert
+ *  Copyright 2002 - 2007 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -23,6 +23,12 @@
   /**
    * initialize
    */
+  function layout (&$user) {
+    $this->init($user);
+  }
+  /**
+   * initialize
+   */
   function init (&$user) {
     $this->stylename = "classic_layout";
     parent::init($user);
@@ -332,4 +338,4 @@
     return;
   }
 }
-?>
+?>
\ No newline at end of file

Index: classic_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/classic_base.pinc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- classic_base.pinc	2 Jan 2007 19:59:58 -0000	1.53
+++ classic_base.pinc	1 Jun 2007 19:08:36 -0000	1.54
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2006 by Gero Kohnert
+ *  Copyright 2002 - 2007 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- layout_base.pinc	11 Apr 2007 07:47:55 -0000	1.43
+++ layout_base.pinc	1 Jun 2007 19:08:36 -0000	1.44
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2006 by Gero Kohnert
+ *  Copyright 2002 - 2007 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -495,4 +495,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: test_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/test_layout.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- test_layout.pinc	3 Apr 2005 18:32:15 -0000	1.43
+++ test_layout.pinc	1 Jun 2007 19:08:36 -0000	1.44
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2002 - 2004 by Gero Kohnert
+ * Copyright 2002 - 2007 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -19,6 +19,12 @@
   /**
    * initialize
    */
+  function layout (&$user) {
+    $this->init($user);
+  }
+  /**
+   * initialize
+   */
   function init (&$user) {
     $this->stylename = "test_layout";
     parent::init($user);

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20346

Modified Files:
	history_show.php product_overview.php user.pinc 
Log Message:
fix

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- product_overview.php	11 Apr 2007 07:47:55 -0000	1.117
+++ product_overview.php	1 Jun 2007 19:06:50 -0000	1.118
@@ -882,7 +882,6 @@
      } else {
        $from->setDateTimeF("f");
        # remember this
-#       session_register('prodsearchfrom');
        $_SESSION['prodsearchfrom'] = $from->getYYYYMMDD();
      }
      if ( $from->notime != 1 ) {
@@ -899,7 +898,6 @@
      } else {
        $to->setDateTimeF("t");
        # remember this
-#       session_register('prodsearchto');
        $_SESSION['prodsearchto'] = $to->getYYYYMMDD();
      }
      if ( $to->notime != 1 ) {

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- user.pinc	5 Apr 2007 16:14:56 -0000	1.154
+++ user.pinc	1 Jun 2007 19:06:50 -0000	1.155
@@ -164,6 +164,9 @@
     $this->tz       = StripSlashes($r->get($pos, "tz"));
     $this->theme    = StripSlashes($r->get($pos, "theme"));
     $this->ly       = StripSlashes($r->get($pos, "layout"));
+    if ($this->ly == "") {
+      $this->ly        = $tutos[layouts][0];
+    }
     $holidays   = StripSlashes($r->get($pos, "holidays"));
     foreach($tutos[holiday] as $i => $f) {
       $this->holiday[strtolower($i)] = 0;

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- history_show.php	5 Apr 2007 16:14:55 -0000	1.74
+++ history_show.php	1 Jun 2007 19:06:50 -0000	1.75
@@ -103,7 +103,7 @@
 
        if ( $this->id == -1 ) {
          $x = getObject($this->dbconn,$f["obj_id"],1);
-         if ( $x == -1 ) {
+         if (!is_object($x) && ($x == -1) ) {
            echo " <td colspan=\"2\"><b>&nbsp;". $f["obj_id"] ."</b></td>\n";
          } else {
            echo " <td>&nbsp;". $lang[$x->getType()] ."</td><td>&nbsp;<b>". $x->getLink() ."</b></td>\n";

Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28529/watchlist

Added Files:
	.cvsignore 
Log Message:
added custom ignore


--- NEW FILE: .cvsignore ---
#
# $Id: .cvsignore,v 1.1 2007/06/01 16:49:23 gokohnert Exp $
#
*~
*_custom.p3