diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-06-25 11:31:15 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-06-25 11:31:15 +0200 |
| commit | 25acf3f74cd5ea42dbdf23f5743feb17014c22a0 (patch) | |
| tree | f1f25b795ebc2998b4ccc6124fd35854df404d6e /tests/avatar | |
| parent | 3703de63dd5208e0431d89e29affe3bf39cdd25a (diff) | |
| download | forums-25acf3f74cd5ea42dbdf23f5743feb17014c22a0.tar forums-25acf3f74cd5ea42dbdf23f5743feb17014c22a0.tar.gz forums-25acf3f74cd5ea42dbdf23f5743feb17014c22a0.tar.bz2 forums-25acf3f74cd5ea42dbdf23f5743feb17014c22a0.tar.xz forums-25acf3f74cd5ea42dbdf23f5743feb17014c22a0.zip | |
[ŧicket/11600] Split get driver tests into tests for all and only enabled ones
PHPBB3-11600
Diffstat (limited to 'tests/avatar')
| -rw-r--r-- | tests/avatar/manager_test.php | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index d8ab1f38ae..58cad06c5d 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -88,27 +88,51 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']); } - public function get_driver_data() + public function get_driver_data_enabled() { return array( - array('avatar.driver.foobar', 'avatar.driver.foobar', false), - array('avatar.driver.foo_wrong', NULL, false), array('avatar.driver.foobar', 'avatar.driver.foobar'), array('avatar.driver.foo_wrong', NULL), - array('avatar.driver.local', 'avatar.driver.local', false), - array(AVATAR_GALLERY, 'avatar.driver.local', false), - array(AVATAR_UPLOAD, 'avatar.driver.upload', false), - array(AVATAR_REMOTE, 'avatar.driver.remote', false), + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.local', NULL), + array(AVATAR_GALLERY, NULL), + array(AVATAR_UPLOAD, NULL), + array(AVATAR_REMOTE, NULL), array(AVATAR_GALLERY, NULL), ); } /** - * @dataProvider get_driver_data + * @dataProvider get_driver_data_enabled + */ + public function test_get_driver_enabled($driver_name, $expected) + { + $driver = $this->manager->get_driver($driver_name); + $this->assertEquals($expected, $driver); + } + + public function get_driver_data_all() + { + return array( + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.local', 'avatar.driver.local'), + array(AVATAR_GALLERY, 'avatar.driver.local'), + array(AVATAR_UPLOAD, 'avatar.driver.upload'), + array(AVATAR_REMOTE, 'avatar.driver.remote'), + array(AVATAR_GALLERY, 'avatar.driver.local'), + ); + } + + /** + * @dataProvider get_driver_data_all */ - public function test_get_driver($driver_name, $expected, $enabled_only = true) + public function test_get_driver_all($driver_name, $expected) { - $driver = $this->manager->get_driver($driver_name, $enabled_only); + $driver = $this->manager->get_driver($driver_name, false); $this->assertEquals($expected, $driver); } |