From 022b4282cd26e4ade38af1913197965a50717c7f Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 13:31:14 +0100 Subject: [PATCH 01/15] unittests for task factory and dummy task classes for tests created --- Mage/Task/Factory.php | 4 +- tests/Dummies/Task/MyInconsistentTask.php | 27 ++++++++ tests/Dummies/Task/MyTask.php | 36 ++++++++++ tests/MageTest/Task/FactoryTest.php | 83 +++++++++++++++++++++++ 4 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 tests/Dummies/Task/MyInconsistentTask.php create mode 100644 tests/Dummies/Task/MyTask.php create mode 100644 tests/MageTest/Task/FactoryTest.php diff --git a/Mage/Task/Factory.php b/Mage/Task/Factory.php index 912026f..033af83 100644 --- a/Mage/Task/Factory.php +++ b/Mage/Task/Factory.php @@ -11,6 +11,7 @@ namespace Mage\Task; use Mage\Config; +use Mage\Task\AbstractTask; use Exception; @@ -26,7 +27,6 @@ class Factory * * @param string|array $taskData * @param \Mage\Config $taskConfig - * @param Config $taskConfig * @param boolean $inRollback * @param string $stage * @return \Mage\Task\AbstractTask @@ -59,7 +59,7 @@ class Factory $instance = new $className($taskConfig, $inRollback, $stage, $taskParameters); - if (!is_a($instance, 'Mage\Task\AbstractTask')) { + if (!$instance instanceof AbstractTask) { throw new Exception('The Task ' . $taskName . ' must be an instance of Mage\Task\AbstractTask.'); } diff --git a/tests/Dummies/Task/MyInconsistentTask.php b/tests/Dummies/Task/MyInconsistentTask.php new file mode 100644 index 0000000..93d3cb7 --- /dev/null +++ b/tests/Dummies/Task/MyInconsistentTask.php @@ -0,0 +1,27 @@ +config = $this->getMock('Mage\Config'); + } + + /** + * @dataProvider taskDataProvider + */ + public function testGet($taskData) + { + $task = Factory::get($taskData, $this->config); + $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage The Task MyInconsistentTask must be an instance of Mage\Task\AbstractTask. + */ + public function testGetInconsistentException() + { + Factory::get('my-inconsistent-task', $this->config); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage Task "Notknowntask" not found. + */ + public function testGetClassDoesNotExist() + { + Factory::get('notknowntask', $this->config); + } + + /** + * Only build in tasks contains a slash + * + * @return array + */ + public function taskDataProvider() + { + return array( + array( + array( + 'name' => 'my-task', + 'parameters' => array(), + ) + ), + array('my-task'), + array( + array( + 'name' => 'composer/install', + 'parameters' => array(), + ) + ), + array('composer/install'), + array( + array( + 'name' => 'magento/clear-cache', + 'parameters' => array(), + ) + ), + array('magento/clear-cache'), + ); + } +} + \ No newline at end of file From 008383333a8d0054deb3dad4de77c0143ff33469 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 14:14:55 +0100 Subject: [PATCH 02/15] minor phpdoc fix, test string fixed for unknown task class --- Mage/Task/Factory.php | 2 +- tests/MageTest/Task/FactoryTest.php | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Mage/Task/Factory.php b/Mage/Task/Factory.php index 033af83..37e1cee 100644 --- a/Mage/Task/Factory.php +++ b/Mage/Task/Factory.php @@ -30,7 +30,7 @@ class Factory * @param boolean $inRollback * @param string $stage * @return \Mage\Task\AbstractTask - * @throws \Exception|\Mage\Task\ErrorWithMessageException + * @throws \Exception */ public static function get($taskData, Config $taskConfig, $inRollback = false, $stage = null) { diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 2413cab..4b31ca2 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -30,6 +30,15 @@ class FactoryTest extends PHPUnit_Framework_TestCase $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); } + /** + * @dataProvider taskDataProvider + */ + public function testGetWith($taskData) + { + $task = Factory::get($taskData, $this->config); + $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + } + /** * @expectedException \Exception * @expectedExceptionMessage The Task MyInconsistentTask must be an instance of Mage\Task\AbstractTask. @@ -45,7 +54,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase */ public function testGetClassDoesNotExist() { - Factory::get('notknowntask', $this->config); + Factory::get('unknowntask', $this->config); } /** From 61964952c0590eca00bd56f03d15f9a524e7aa03 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 14:15:56 +0100 Subject: [PATCH 03/15] exception text adapted to renamed class --- tests/MageTest/Task/FactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 4b31ca2..38a0620 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -50,7 +50,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase /** * @expectedException \Exception - * @expectedExceptionMessage Task "Notknowntask" not found. + * @expectedExceptionMessage Task "Unknowntask" not found. */ public function testGetClassDoesNotExist() { From 7789e0d713433fc403992085adc2f3e390de6af5 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 14:28:37 +0100 Subject: [PATCH 04/15] test using optional parameters --- tests/MageTest/Task/FactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 38a0620..3a4fc4a 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -33,9 +33,9 @@ class FactoryTest extends PHPUnit_Framework_TestCase /** * @dataProvider taskDataProvider */ - public function testGetWith($taskData) + public function testGetWithOptionalParams($taskData) { - $task = Factory::get($taskData, $this->config); + $task = Factory::get($taskData, $this->config, true, 'production'); $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); } From 37de2806daaf3cf65fc46204bd09593c00d91199 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 23 Feb 2015 21:01:03 +0100 Subject: [PATCH 05/15] Dummy classes removed --- tests/Dummies/Task/MyInconsistentTask.php | 27 ----------------- tests/Dummies/Task/MyTask.php | 36 ----------------------- 2 files changed, 63 deletions(-) delete mode 100644 tests/Dummies/Task/MyInconsistentTask.php delete mode 100644 tests/Dummies/Task/MyTask.php diff --git a/tests/Dummies/Task/MyInconsistentTask.php b/tests/Dummies/Task/MyInconsistentTask.php deleted file mode 100644 index 93d3cb7..0000000 --- a/tests/Dummies/Task/MyInconsistentTask.php +++ /dev/null @@ -1,27 +0,0 @@ - Date: Mon, 23 Feb 2015 21:59:21 +0100 Subject: [PATCH 06/15] dummy classes dependency removed from task factory unittests --- tests/MageTest/Task/FactoryTest.php | 85 +++++++++++++---------------- 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 3a4fc4a..3804407 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -5,12 +5,11 @@ namespace MageTest\Task; use Mage\Task\Factory; use PHPUnit_Framework_TestCase; -require_once(__DIR__ . '/../../Dummies/Task/MyTask.php'); -require_once(__DIR__ . '/../../Dummies/Task/MyInconsistentTask.php'); - /** * @group MageTest_Task * @group MageTest_Task_Factory + * + * @group issue-176 */ class FactoryTest extends PHPUnit_Framework_TestCase { @@ -18,25 +17,47 @@ class FactoryTest extends PHPUnit_Framework_TestCase protected function setUp() { - $this->config = $this->getMock('Mage\Config'); + $this->config = $this->getMock('Mage\\Config'); } - /** - * @dataProvider taskDataProvider - */ - public function testGet($taskData) + public function testGet() { + $task = Factory::get('composer/install', $this->config); + $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); + } + + public function testGetTaskDataIsArray() + { + $taskData = array( + 'name' => 'composer/install', + 'parameters' => array(), + ); + $task = Factory::get($taskData, $this->config); - $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); } - /** - * @dataProvider taskDataProvider - */ - public function testGetWithOptionalParams($taskData) + public function testGetCustomTask() { - $task = Factory::get($taskData, $this->config, true, 'production'); - $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + $this->getMockBuilder('Mage\\Task\\AbstractTask') + ->disableOriginalConstructor() + ->setMockClassName('MyTask') + ->getMock(); + + /** + * current workaround + * @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/134 + */ + class_alias('MyTask', 'Task\\MyTask'); + + $task = Factory::get('my-task', $this->config); + $this->assertInstanceOf('Task\\MyTask', $task); + } + + public function testGetWithOptionalParams() + { + $task = Factory::get('composer/install', $this->config, true, 'production'); + $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); } /** @@ -45,6 +66,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase */ public function testGetInconsistentException() { + $this->getMock('Task\\MyInconsistentTask'); Factory::get('my-inconsistent-task', $this->config); } @@ -56,37 +78,4 @@ class FactoryTest extends PHPUnit_Framework_TestCase { Factory::get('unknowntask', $this->config); } - - /** - * Only build in tasks contains a slash - * - * @return array - */ - public function taskDataProvider() - { - return array( - array( - array( - 'name' => 'my-task', - 'parameters' => array(), - ) - ), - array('my-task'), - array( - array( - 'name' => 'composer/install', - 'parameters' => array(), - ) - ), - array('composer/install'), - array( - array( - 'name' => 'magento/clear-cache', - 'parameters' => array(), - ) - ), - array('magento/clear-cache'), - ); - } } - \ No newline at end of file From 2c27e2c46d394ff7a60ff9bc09e6dd51ee057dfe Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 13:31:14 +0100 Subject: [PATCH 07/15] unittests for task factory and dummy task classes for tests created --- Mage/Task/Factory.php | 2 +- tests/Dummies/Task/MyInconsistentTask.php | 27 ++++++++ tests/Dummies/Task/MyTask.php | 36 ++++++++++ tests/MageTest/Task/FactoryTest.php | 83 +++++++++++++++++++++++ 4 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 tests/Dummies/Task/MyInconsistentTask.php create mode 100644 tests/Dummies/Task/MyTask.php create mode 100644 tests/MageTest/Task/FactoryTest.php diff --git a/Mage/Task/Factory.php b/Mage/Task/Factory.php index 57dff35..e177f6b 100644 --- a/Mage/Task/Factory.php +++ b/Mage/Task/Factory.php @@ -11,6 +11,7 @@ namespace Mage\Task; use Mage\Config; +use Mage\Task\AbstractTask; use Exception; @@ -26,7 +27,6 @@ class Factory * * @param string|array $taskData * @param \Mage\Config $taskConfig - * @param Config $taskConfig * @param boolean $inRollback * @param string $stage * @return \Mage\Task\AbstractTask diff --git a/tests/Dummies/Task/MyInconsistentTask.php b/tests/Dummies/Task/MyInconsistentTask.php new file mode 100644 index 0000000..93d3cb7 --- /dev/null +++ b/tests/Dummies/Task/MyInconsistentTask.php @@ -0,0 +1,27 @@ +config = $this->getMock('Mage\Config'); + } + + /** + * @dataProvider taskDataProvider + */ + public function testGet($taskData) + { + $task = Factory::get($taskData, $this->config); + $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage The Task MyInconsistentTask must be an instance of Mage\Task\AbstractTask. + */ + public function testGetInconsistentException() + { + Factory::get('my-inconsistent-task', $this->config); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage Task "Notknowntask" not found. + */ + public function testGetClassDoesNotExist() + { + Factory::get('notknowntask', $this->config); + } + + /** + * Only build in tasks contains a slash + * + * @return array + */ + public function taskDataProvider() + { + return array( + array( + array( + 'name' => 'my-task', + 'parameters' => array(), + ) + ), + array('my-task'), + array( + array( + 'name' => 'composer/install', + 'parameters' => array(), + ) + ), + array('composer/install'), + array( + array( + 'name' => 'magento/clear-cache', + 'parameters' => array(), + ) + ), + array('magento/clear-cache'), + ); + } +} + \ No newline at end of file From 1acffae330814f45ee5c9d6972875980eae65ad9 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 14:14:55 +0100 Subject: [PATCH 08/15] minor phpdoc fix, test string fixed for unknown task class --- Mage/Task/Factory.php | 2 +- tests/MageTest/Task/FactoryTest.php | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Mage/Task/Factory.php b/Mage/Task/Factory.php index e177f6b..db53818 100644 --- a/Mage/Task/Factory.php +++ b/Mage/Task/Factory.php @@ -30,7 +30,7 @@ class Factory * @param boolean $inRollback * @param string $stage * @return \Mage\Task\AbstractTask - * @throws \Exception|\Mage\Task\ErrorWithMessageException + * @throws \Exception */ public static function get($taskData, Config $taskConfig, $inRollback = false, $stage = null) { diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 2413cab..4b31ca2 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -30,6 +30,15 @@ class FactoryTest extends PHPUnit_Framework_TestCase $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); } + /** + * @dataProvider taskDataProvider + */ + public function testGetWith($taskData) + { + $task = Factory::get($taskData, $this->config); + $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + } + /** * @expectedException \Exception * @expectedExceptionMessage The Task MyInconsistentTask must be an instance of Mage\Task\AbstractTask. @@ -45,7 +54,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase */ public function testGetClassDoesNotExist() { - Factory::get('notknowntask', $this->config); + Factory::get('unknowntask', $this->config); } /** From 57fe5b6d52949d94a549394fe8bca9a82c3e1a17 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 14:15:56 +0100 Subject: [PATCH 09/15] exception text adapted to renamed class --- tests/MageTest/Task/FactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 4b31ca2..38a0620 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -50,7 +50,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase /** * @expectedException \Exception - * @expectedExceptionMessage Task "Notknowntask" not found. + * @expectedExceptionMessage Task "Unknowntask" not found. */ public function testGetClassDoesNotExist() { From 4c4d76bd2d6aa815d7fb864ba86ea22b04c1807c Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 5 Jan 2015 14:28:37 +0100 Subject: [PATCH 10/15] test using optional parameters --- tests/MageTest/Task/FactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 38a0620..3a4fc4a 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -33,9 +33,9 @@ class FactoryTest extends PHPUnit_Framework_TestCase /** * @dataProvider taskDataProvider */ - public function testGetWith($taskData) + public function testGetWithOptionalParams($taskData) { - $task = Factory::get($taskData, $this->config); + $task = Factory::get($taskData, $this->config, true, 'production'); $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); } From 673acac0831b731a08df50622b63a5fd89baf421 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 23 Feb 2015 21:01:03 +0100 Subject: [PATCH 11/15] Dummy classes removed --- tests/Dummies/Task/MyInconsistentTask.php | 27 ----------------- tests/Dummies/Task/MyTask.php | 36 ----------------------- 2 files changed, 63 deletions(-) delete mode 100644 tests/Dummies/Task/MyInconsistentTask.php delete mode 100644 tests/Dummies/Task/MyTask.php diff --git a/tests/Dummies/Task/MyInconsistentTask.php b/tests/Dummies/Task/MyInconsistentTask.php deleted file mode 100644 index 93d3cb7..0000000 --- a/tests/Dummies/Task/MyInconsistentTask.php +++ /dev/null @@ -1,27 +0,0 @@ - Date: Mon, 23 Feb 2015 21:59:21 +0100 Subject: [PATCH 12/15] dummy classes dependency removed from task factory unittests --- tests/MageTest/Task/FactoryTest.php | 85 +++++++++++++---------------- 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 3a4fc4a..3804407 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -5,12 +5,11 @@ namespace MageTest\Task; use Mage\Task\Factory; use PHPUnit_Framework_TestCase; -require_once(__DIR__ . '/../../Dummies/Task/MyTask.php'); -require_once(__DIR__ . '/../../Dummies/Task/MyInconsistentTask.php'); - /** * @group MageTest_Task * @group MageTest_Task_Factory + * + * @group issue-176 */ class FactoryTest extends PHPUnit_Framework_TestCase { @@ -18,25 +17,47 @@ class FactoryTest extends PHPUnit_Framework_TestCase protected function setUp() { - $this->config = $this->getMock('Mage\Config'); + $this->config = $this->getMock('Mage\\Config'); } - /** - * @dataProvider taskDataProvider - */ - public function testGet($taskData) + public function testGet() { + $task = Factory::get('composer/install', $this->config); + $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); + } + + public function testGetTaskDataIsArray() + { + $taskData = array( + 'name' => 'composer/install', + 'parameters' => array(), + ); + $task = Factory::get($taskData, $this->config); - $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); } - /** - * @dataProvider taskDataProvider - */ - public function testGetWithOptionalParams($taskData) + public function testGetCustomTask() { - $task = Factory::get($taskData, $this->config, true, 'production'); - $this->assertInstanceOf('\\Mage\\Task\\AbstractTask', $task); + $this->getMockBuilder('Mage\\Task\\AbstractTask') + ->disableOriginalConstructor() + ->setMockClassName('MyTask') + ->getMock(); + + /** + * current workaround + * @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/134 + */ + class_alias('MyTask', 'Task\\MyTask'); + + $task = Factory::get('my-task', $this->config); + $this->assertInstanceOf('Task\\MyTask', $task); + } + + public function testGetWithOptionalParams() + { + $task = Factory::get('composer/install', $this->config, true, 'production'); + $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); } /** @@ -45,6 +66,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase */ public function testGetInconsistentException() { + $this->getMock('Task\\MyInconsistentTask'); Factory::get('my-inconsistent-task', $this->config); } @@ -56,37 +78,4 @@ class FactoryTest extends PHPUnit_Framework_TestCase { Factory::get('unknowntask', $this->config); } - - /** - * Only build in tasks contains a slash - * - * @return array - */ - public function taskDataProvider() - { - return array( - array( - array( - 'name' => 'my-task', - 'parameters' => array(), - ) - ), - array('my-task'), - array( - array( - 'name' => 'composer/install', - 'parameters' => array(), - ) - ), - array('composer/install'), - array( - array( - 'name' => 'magento/clear-cache', - 'parameters' => array(), - ) - ), - array('magento/clear-cache'), - ); - } } - \ No newline at end of file From 4c529e9e43d15c47f0cab1230e8161d846a5986e Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 16 Mar 2015 00:15:13 +0100 Subject: [PATCH 13/15] coverage annotations added --- tests/MageTest/Task/FactoryTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 3804407..8f7e005 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -8,6 +8,9 @@ use PHPUnit_Framework_TestCase; /** * @group MageTest_Task * @group MageTest_Task_Factory + * @uses Mage\Task\AbstractTask + * @uses Doctrine\Instantiator\Instantiator + * @covers Mage\Task\Factory * * @group issue-176 */ From 35aa80a82fcb752d3f39b8d03fc2294439054ce0 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 16 Mar 2015 00:22:07 +0100 Subject: [PATCH 14/15] fix for Instantiator coverage instead of uses annotation --- tests/MageTest/Task/FactoryTest.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 8f7e005..500ae21 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -9,7 +9,6 @@ use PHPUnit_Framework_TestCase; * @group MageTest_Task * @group MageTest_Task_Factory * @uses Mage\Task\AbstractTask - * @uses Doctrine\Instantiator\Instantiator * @covers Mage\Task\Factory * * @group issue-176 @@ -23,12 +22,18 @@ class FactoryTest extends PHPUnit_Framework_TestCase $this->config = $this->getMock('Mage\\Config'); } + /** + * @covers Mage\Task\Factory::get + */ public function testGet() { $task = Factory::get('composer/install', $this->config); $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); } + /** + * @covers Mage\Task\Factory::get + */ public function testGetTaskDataIsArray() { $taskData = array( @@ -40,10 +45,13 @@ class FactoryTest extends PHPUnit_Framework_TestCase $this->assertInstanceOf('\\Mage\\Task\\BuiltIn\\Composer\\InstallTask', $task); } + /** + * @covers Mage\Task\Factory::get + */ public function testGetCustomTask() { $this->getMockBuilder('Mage\\Task\\AbstractTask') - ->disableOriginalConstructor() + ->setConstructorArgs(array($this->config)) ->setMockClassName('MyTask') ->getMock(); @@ -57,6 +65,9 @@ class FactoryTest extends PHPUnit_Framework_TestCase $this->assertInstanceOf('Task\\MyTask', $task); } + /** + * @covers Mage\Task\Factory::get + */ public function testGetWithOptionalParams() { $task = Factory::get('composer/install', $this->config, true, 'production'); @@ -66,6 +77,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase /** * @expectedException \Exception * @expectedExceptionMessage The Task MyInconsistentTask must be an instance of Mage\Task\AbstractTask. + * @covers Mage\Task\Factory::get */ public function testGetInconsistentException() { @@ -76,6 +88,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase /** * @expectedException \Exception * @expectedExceptionMessage Task "Unknowntask" not found. + * @covers Mage\Task\Factory::get */ public function testGetClassDoesNotExist() { From 7ffe04418c60c08fca28e6ee778483fbca03e47e Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 16 Mar 2015 00:39:08 +0100 Subject: [PATCH 15/15] minor annotation fixes --- tests/MageTest/Task/FactoryTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/MageTest/Task/FactoryTest.php b/tests/MageTest/Task/FactoryTest.php index 500ae21..2dfb56b 100644 --- a/tests/MageTest/Task/FactoryTest.php +++ b/tests/MageTest/Task/FactoryTest.php @@ -6,12 +6,12 @@ use Mage\Task\Factory; use PHPUnit_Framework_TestCase; /** - * @group MageTest_Task * @group MageTest_Task_Factory - * @uses Mage\Task\AbstractTask - * @covers Mage\Task\Factory - * + * @group MageTest_Task * @group issue-176 + * + * @uses Mage\Task\AbstractTask + * @coversDefaultClass Mage\Task\Factory */ class FactoryTest extends PHPUnit_Framework_TestCase { @@ -55,7 +55,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase ->setMockClassName('MyTask') ->getMock(); - /** + /* * current workaround * @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/134 */