From 25acf3f74cd5ea42dbdf23f5743feb17014c22a0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 25 Jun 2013 11:31:15 +0200
Subject: [PATCH] =?UTF-8?q?[=C5=A7icket/11600]=20Split=20get=20driver=20te?=
 =?UTF-8?q?sts=20into=20tests=20for=20all=20and=20only=20enabled=20ones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-11600
---
 tests/avatar/manager_test.php | 44 +++++++++++++++++++++++++++--------
 1 file 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($driver_name, $expected, $enabled_only = true)
+	public function test_get_driver_enabled($driver_name, $expected)
 	{
-		$driver = $this->manager->get_driver($driver_name, $enabled_only);
+		$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_all($driver_name, $expected)
+	{
+		$driver = $this->manager->get_driver($driver_name, false);
 		$this->assertEquals($expected, $driver);
 	}