diff options
| author | xue <> | 2006-09-30 18:40:40 +0000 |
|---|---|---|
| committer | xue <> | 2006-09-30 18:40:40 +0000 |
| commit | 1c32172efb18e8d08ea483e2460813670ebfe1a5 (patch) | |
| tree | 8420f9e53eaba35d7b4822fac823197254f0d131 /tests/test_tools/selenium/php/selenium.php | |
| parent | 6b1d87352911e43672b46b7a65a3c90dd8e5b8b1 (diff) | |
merge from 3.0 branch till 1451.
Diffstat (limited to 'tests/test_tools/selenium/php/selenium.php')
| -rw-r--r-- | tests/test_tools/selenium/php/selenium.php | 103 |
1 files changed, 85 insertions, 18 deletions
diff --git a/tests/test_tools/selenium/php/selenium.php b/tests/test_tools/selenium/php/selenium.php index 683bcaa2..fcbbe562 100644 --- a/tests/test_tools/selenium/php/selenium.php +++ b/tests/test_tools/selenium/php/selenium.php @@ -65,12 +65,23 @@ class SeleniumTestStorage { protected $outputs = array(); protected $tests = array(); + protected $options=array(); public function getTests() { return $this->tests; } + public function getOptions() + { + return $this->options; + } + + public function addOption($test_name, $option) + { + $this->options[$test_name] = $option; + } + public function addCommand($test_case_id, $command) { $data = array($test_case_id, $command); @@ -105,6 +116,11 @@ class SeleneseInterpreter return $this->storage->getTests(); } + public function getOptions() + { + return $this->storage->getOptions(); + } + public function getCommand() { $command = $this->storage->getCommand(); @@ -115,12 +131,15 @@ class SeleneseInterpreter { if($func{0} == '_') return; + $trace = debug_backtrace(); + if($this->isTestOptionFunction($func,$args,$trace)) + return; + $ID = isset($args[0]) ? $args[0] : ""; $value = isset($args[1]) ? $args[1] : ""; if(strpos(strtolower($func),'htmlpresent') || strpos(strtolower($func),'htmlnotpresent')) $ID = htmlspecialchars($ID); $command = array($func, $ID, $value); - $trace = debug_backtrace(); if(is_int(strpos(strtolower($func), 'visible'))) $this->addCommand(array('pause','500',''),$trace); @@ -128,6 +147,17 @@ class SeleneseInterpreter return $this->addCommand($command, $trace); } + protected function isTestOptionFunction($func,$args,$trace) + { + if(strtolower($func)==='skipcondition') + { + list($trace, $test, $suite) = $this->tracer->getTrace($trace); + $this->storage->addOption($test,$args[0]); + return true; + } + return false; + } + protected function addCommand($command, $trace) { list($trace, $test, $suite) = $this->tracer->getTrace($trace); @@ -236,34 +266,26 @@ class SeleniumTestSuiteWriter protected function renderHeader() { - $contents = <<<EOD -<html> -<head> -<meta content="text/html; charset=UTF-8" http-equiv="content-type"> -<title>Test Suite</title> + $base_dir = $this->runner->getDriver().'?sr='; -</head> + include(dirname(__FILE__).'/TestSuiteHeader.php'); -<body> - -<table cellpadding="1" - cellspacing="1" - border="1"> - <tbody> + $contents = <<<EOD <tr><td><b>{$this->name}</b></td></tr> EOD; - return $contents; + echo $contents; } public function render() { - echo $this->renderHeader(); + $this->renderHeader(); foreach($this->suites as $name => $suite) { $file = $suite[0]['trace']['file']; $file = strtr($file,'\\','/'); + $option = $suite[0]['option']===null?'':' unless="'.$suite[0]['option'].'" '; $url = $this->runner->getDriver()."?case={$name}&file={$file}"; - echo "<tr>\n"; + echo "<tr{$option}>\n"; echo "<td><a href=\"{$url}\">{$name}</a></td>\n"; echo "</tr>\n"; } @@ -289,7 +311,18 @@ EOD; { $trace = '';//$this->getJsTraceInfo(); $contents = <<<EOD - </tbody> + </tbody> + </table> + + <br /> + <em>Not supported in this browser</em> + <table id="skippedTests" cellpadding="1" + cellspacing="1" + border="1" + class="selenium"> + <tbody> + <tr><td><b>Skipped Tests</b></td></tr> + </tbody> </table> <script type="text/javascript"> /*<![CDATA[*/ @@ -377,11 +410,14 @@ class SeleniumTestRunnerServer protected function initialize($int) { + $options = $int->getOptions(); foreach($int->getTests() as $command) { $case = $command[5]; + $option=isset($options[$case])?$options[$case]:null; $this->cases[$case][] = - array('test' => $command[2], 'trace' => $command[4]); + array('test' => $command[2], + 'trace' => $command[4], 'option'=>$option); if(is_null($this->name)) $this->name = $command[6]; } @@ -449,6 +485,18 @@ class SeleniumTestCase extends UnitTestCase protected $selenium; protected $Page; + const KONQUEROR='browserVersion.isKonqueror'; + const OPERA='browserVersion.isOpera'; + const CHROME='browserVersion.isChrome'; + const INTERNET_EXPLORER='browserVersion.isIE'; + const SAFARI='browserVersion.isSafari'; + const KHTML='browserVersion.khtml'; + const FIREFOX='browserVersion.isFirefox'; + const MOZILLA='browserVersion.isMozilla'; + const GECKO='browserVersion.isGecko'; + + protected $options=array(); + function __construct() { $server = SimpleSeleniumProxyServer::getInstance(); @@ -472,6 +520,25 @@ class SeleniumTestCase extends UnitTestCase else if (count($args) == 2) return $this->selenium->{$func}($args[0], $args[1]); } + + function disabled() + { + $this->selenium->skipCondition('DISABLED'); + } + + function skipBrowsers() + { + $arg_list = func_get_args(); + $browsers=array(); + foreach($arg_list as $arg) + { + if(is_array($arg)) + $browsers[] = '('.implode(' && ', $arg).')'; + else + $browsers[] = $arg; + } + $this->selenium->skipCondition(implode(' || ', $browsers)); + } } ?>
\ No newline at end of file |