From 0f3a577bed4d828472469675e90fcab032e33f44 Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 2 Jun 2006 18:27:02 +0000 Subject: merge from 3.0 branch till 1133. --- tests/FunctionalTests/selenium/php/TestRunner.php | 214 ++++++++++++---------- tests/FunctionalTests/selenium/php/selenium.php | 8 +- 2 files changed, 119 insertions(+), 103 deletions(-) (limited to 'tests/FunctionalTests/selenium/php') diff --git a/tests/FunctionalTests/selenium/php/TestRunner.php b/tests/FunctionalTests/selenium/php/TestRunner.php index fb3cefb3..9bb5ada3 100644 --- a/tests/FunctionalTests/selenium/php/TestRunner.php +++ b/tests/FunctionalTests/selenium/php/TestRunner.php @@ -1,7 +1,8 @@ - + + - + @@ -24,40 +25,47 @@ Copyright 2004 ThoughtWorks, Inc --> -Prado Functional Test Runner - - - - - - - - - - +Selenium Functional Test Runner + + + + + + + + + + + + + + + - + @@ -65,92 +73,98 @@ Copyright 2004 ThoughtWorks, Inc - - - - - - - - + + + + + - +
-

Selenium TestRunner

-
- -
- Execute Tests - -
- - - -
- -
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Elapsed:00.00
TestsCommands
0run0passed
0failed0failed
0incomplete
- -
- Tools - - - - -
- -
+ + + + + + + +
+

Selenium TestRunner

+
+ +
+ Execute Tests + +
+ + + +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Elapsed:00.00
TestsCommands
0run0passed
0failed0failed
0incomplete
+ +
+ Tools + + + + +
+ +
+
- + \ No newline at end of file diff --git a/tests/FunctionalTests/selenium/php/selenium.php b/tests/FunctionalTests/selenium/php/selenium.php index 4a4c6e19..960791b8 100644 --- a/tests/FunctionalTests/selenium/php/selenium.php +++ b/tests/FunctionalTests/selenium/php/selenium.php @@ -112,15 +112,17 @@ class SeleneseInterpreter public function __call($func, $args) { if($func{0} == '_') return; + $ID = isset($args[0]) ? $args[0] : ""; - //if($ID instanceof TControl) - // $ID = $ID->ClientID; $value = isset($args[1]) ? $args[1] : ""; if(strpos(strtolower($func),'htmlpresent') || strpos(strtolower($func),'htmlnotpresent')) $ID = htmlspecialchars($ID); - //$command = "|{$func}|{$ID}|{$value}|"; $command = array($func, $ID, $value); $trace = debug_backtrace(); + + if(is_int(strpos(strtolower($func), 'visible'))) + $this->addCommand(array('pause','500',''),$trace); + return $this->addCommand($command, $trace); } -- cgit v1.2.3