com phpruntests: phpruntests - minor adjustment taskScheduler - fixed tmp bug in testcase: src/taskScheduler/rtTask.php
src/taskScheduler/rtTaskTestGroup.php src/testrun/rtPhpTestRun.php tests/rtTaskSchedulerTest.php

Commit: f5b4aa5d3f3d58325f0ab3fb02cd66af44ca33b7 Author: Georg Gradwohl <g2@php.net> Tue, 30 Jun 2009 15:39:52 +0000 Parents: 3272f571e02b7f3f6781368e10cb29b2284822f2 Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=f5b4aa5d3f3d58325f0ab3fb02cd66af44ca33b7 Log: phpruntests - minor adjustment taskScheduler - fixed tmp bug in testcase Changed paths: M src/taskScheduler/rtTask.php M src/taskScheduler/rtTaskTestGroup.php M src/testrun/rtPhpTestRun.php M tests/rtTaskSchedulerTest.php Diff: diff --git a/src/taskScheduler/rtTask.php b/src/taskScheduler/rtTask.php index de45a3f..3f5919a 100644 --- a/src/taskScheduler/rtTask.php +++ b/src/taskScheduler/rtTask.php @@ -11,7 +11,7 @@ abstract class rtTask private $message = NULL; - public function finish() {} + public function evaluate() {} public function setState($state) diff --git a/src/taskScheduler/rtTaskTestGroup.php b/src/taskScheduler/rtTaskTestGroup.php index 373c89d..f2f46ae 100644 --- a/src/taskScheduler/rtTaskTestGroup.php +++ b/src/taskScheduler/rtTaskTestGroup.php @@ -15,13 +15,15 @@ class rtTaskTestGroup extends rtTask implements rtTaskInterface { 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 @@ class rtTaskTestGroup extends rtTask implements rtTaskInterface */ 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); } diff --git a/src/testrun/rtPhpTestRun.php b/src/testrun/rtPhpTestRun.php index 156aacb..e4722d0 100644 --- a/src/testrun/rtPhpTestRun.php +++ b/src/testrun/rtPhpTestRun.php @@ -62,9 +62,8 @@ class rtPhpTestRun // 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(); diff --git a/tests/rtTaskSchedulerTest.php b/tests/rtTaskSchedulerTest.php index 470d1aa..757672b 100644 --- a/tests/rtTaskSchedulerTest.php +++ b/tests/rtTaskSchedulerTest.php @@ -57,7 +57,10 @@ class rtTaskIncTest extends rtTask implements rtTaskInterface public function getNumber() { return $this->num; - } + } + + // temp - remove this function + public function getDir() {} } ?> \ No newline at end of file