g2 Tue Jun 30 15:39:52 2009 UTC
Modified files:
/phpruntests/src/testrun rtPhpTestRun.php
/phpruntests/src/taskScheduler rtTask.php rtTaskTestGroup.php
/phpruntests/tests rtTaskSchedulerTest.php
Log:
phpruntests - minor adjustment taskScheduler - fixed tmp bug in testcase
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.16&r2=1.17&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.16
phpruntests/src/testrun/rtPhpTestRun.php:1.17
--- phpruntests/src/testrun/rtPhpTestRun.php:1.16 Tue Jun 30 13:35:42 2009
+++ phpruntests/src/testrun/rtPhpTestRun.php Tue Jun 30 15:39:51 2009
@@ -62,9 +62,8 @@
// create the task-list
$taskList = array();
foreach ($subDirectories as $subDirectory) {
- $taskList[] = new
rtTaskTestGroup($runConfiguration, $subDirectory);
+ $taskList[] = new
rtTaskTestGroup($runConfiguration, $subDirectory, $this->outType);
}
-
// start the task-scheduler for multi-processing
$scheduler = rtTaskScheduler::getInstance();
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTask.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/taskScheduler/rtTask.php
diff -u phpruntests/src/taskScheduler/rtTask.php:1.2
phpruntests/src/taskScheduler/rtTask.php:1.3
--- phpruntests/src/taskScheduler/rtTask.php:1.2 Mon Jun 29 01:34:54 2009
+++ phpruntests/src/taskScheduler/rtTask.php Tue Jun 30 15:39:52 2009
@@ -11,7 +11,7 @@
private $message = NULL;
- public function finish() {}
+ public function evaluate() {}
public function setState($state)
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskTestGroup.php?r1=1.5&r2=1.6&diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskTestGroup.php
diff -u phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.5
phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.6
--- phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.5 Mon Jun 29
22:00:13 2009
+++ phpruntests/src/taskScheduler/rtTaskTestGroup.php Tue Jun 30 15:39:52 2009
@@ -15,13 +15,15 @@
{
private $runConfiguration;
private $subDirectory;
+ private $outType;
private $results;
- public function __construct($runConfiguration, $subDirectory)
+ public function __construct($runConfiguration, $subDirectory,
$outType='list')
{
$this->runConfiguration = $runConfiguration;
$this->subDirectory = $subDirectory;
+ $this->outType = $outType;
}
@@ -46,12 +48,7 @@
*/
public function evaluate($cid=null)
{
- $outType = 'list';
- if ($this->runConfiguration->hasCommandLineOption('o')) {
- $outType = $this->runConfiguration->getCommandLineOption('o');
- }
-
- $testOutputWriter = rtTestOutputWriter::getInstance($this->results,
$outType);
+ $testOutputWriter = rtTestOutputWriter::getInstance($this->results,
$this->outType);
$testOutputWriter->write($this->subDirectory, $cid);
}
http://cvs.php.net/viewvc.cgi/phpruntests/tests/rtTaskSchedulerTest.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/tests/rtTaskSchedulerTest.php
diff -u phpruntests/tests/rtTaskSchedulerTest.php:1.2
phpruntests/tests/rtTaskSchedulerTest.php:1.3
--- phpruntests/tests/rtTaskSchedulerTest.php:1.2 Sat Jun 27 23:57:46 2009
+++ phpruntests/tests/rtTaskSchedulerTest.php Tue Jun 30 15:39:52 2009
@@ -57,7 +57,10 @@
public function getNumber()
{
return $this->num;
- }
+ }
+
+ // temp - remove this function
+ public function getDir() {}
}
?>
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
