[ticket/12597] Modification of return statuses and of test files

ptitlazy · ptitlazy · commit 0d839cbefc19 · 2014-05-28T18:02:30.000+02:00
PHPBB3-12597
diff --git a/phpBB/phpbb/console/command/cron/run_all.php b/phpBB/phpbb/console/command/cron/run_all.php
@@ -60,7 +60,7 @@ protected function configure()
 	* @param InputInterface input The input stream, unused here
 	* @param OutputInterface output The output stream, used for printig verbose-mode
 	*							and error information.
-	* @return null
+	* @return boolean 0 if all is ok, 1 if a lock error occured
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
diff --git a/tests/console/cron/run_all_test.php b/tests/console/cron/run_all_test.php
@@ -21,6 +21,7 @@ class phpbb_console_command_cron_run_all_test extends phpbb_database_test_case
 	protected $user;
 	protected $cron_manager;
 	protected $command_name;
+	protected $task;
 
 	public function getDataSet()
 	{
@@ -40,8 +41,9 @@ public function setUp()
 		$this->user = $this->getMock('\phpbb\user');
 		$this->user->method('lang')->will($this->returnArgument(0));
 
+		$this->task = new phpbb_cron_task_simple();
 		$tasks = array(
-			new phpbb_cron_task_simple(),
+			$this->task,
 		);
 		$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $pathEx);
 
@@ -58,7 +60,7 @@ public function test_normal_use()
 		$command_tester->execute(array('command' => $this->command_name));
 
 		$this->assertSame('', $command_tester->getDisplay());
-		$this->assertSame(1, $cron_num_exec);
+		$this->assertSame(true, $this->task->executed);
 	}
 
 	public function test_verbose_mode()
@@ -69,7 +71,7 @@ public function test_verbose_mode()
 		$command_tester->execute(array('command' => $this->command_name, '--verbose' => true));
 
 		$this->assertContains('RUNNING_TASK', $command_tester->getDisplay());
-		$this->assertSame(1, $cron_num_exec);
+		$this->assertSame(true, $this->task->executed);
 	}
 
 	public function test_error_lock()
@@ -81,7 +83,7 @@ public function test_error_lock()
 		$command_tester->execute(array('command' => $this->command_name));
 
 		$this->assertContains('CRON_LOCK_ERROR', $command_tester->getDisplay());
-		$this->assertSame(0, $cron_num_exec);
+		$this->assertSame(false, $this->task->executed);
 	}
 
 	public function get_command_tester()
diff --git a/tests/console/cron/tasks/simple.php b/tests/console/cron/tasks/simple.php
@@ -2,14 +2,21 @@
 
 class phpbb_cron_task_simple extends \phpbb\cron\task\base
 {
+	public $executed;
+
+	public function __construct()
+	{
+		$executed = false;
+		parent::__construct();
+	}
+
 	public function get_name()
 	{
 		return get_class($this);
 	}
 
 	public function run()
 	{
-		global $cron_num_exec;
-		$cron_num_exec++;
+		$this->executed = true;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ protected function configure()`
`60`	`60`	`* @param InputInterface input The input stream, unused here`
`61`	`61`	`* @param OutputInterface output The output stream, used for printig verbose-mode`
`62`	`62`	`* and error information.`
`63`		`- * @return null`
	`63`	`+ * @return boolean 0 if all is ok, 1 if a lock error occured`
`64`	`64`	`*/`
`65`	`65`	`protected function execute(InputInterface $input, OutputInterface $output)`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,21 @@`
`2`	`2`
`3`	`3`	`class phpbb_cron_task_simple extends \phpbb\cron\task\base`
`4`	`4`	`{`
	`5`	`+ public $executed;`
	`6`	`+`
	`7`	`+ public function __construct()`
	`8`	`+ {`
	`9`	`+ $executed = false;`
	`10`	`+ parent::__construct();`
	`11`	`+ }`
	`12`	`+`
`5`	`13`	`public function get_name()`
`6`	`14`	`{`
`7`	`15`	`return get_class($this);`
`8`	`16`	`}`
`9`	`17`
`10`	`18`	`public function run()`
`11`	`19`	`{`
`12`		`- global $cron_num_exec;`
`13`		`- $cron_num_exec++;`
	`20`	`+ $this->executed = true;`
`14`	`21`	`}`
`15`	`22`	`}`