[ticket/8323] dataProvider for the test; better test data

PHPBB3-8323

2 files changed, 23 insertions, 7 deletions

diff --git a/tests/functions/fixtures/banned_users.xml b/tests/functions/fixtures/banned_users.xml
index 42b73dd270..cec3f4e51f 100644
--- a/tests/functions/fixtures/banned_users.xml
+++ b/tests/functions/fixtures/banned_users.xml
@@ -29,5 +29,10 @@
 			<value>0</value>
 			<value>999999999999999999999</value>
 		</row>
+		<row>
+			<value>6</value>
+			<value>0</value>
+			<value>3</value>
+		</row>
 	</table>
 </dataset>
diff --git a/tests/functions/phpbb_get_banned_user_ids.php b/tests/functions/phpbb_get_banned_user_ids.php
index 226012f68f..9f56480235 100644
--- a/tests/functions/phpbb_get_banned_user_ids.php
+++ b/tests/functions/phpbb_get_banned_user_ids.php
@@ -16,18 +16,29 @@ class phpbb_get_banned_user_ids_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/banned_users.xml');
 	}
 
-	public function test_phpbb_get_banned_user_ids()
+	public function phpbb_get_banned_user_ids_data()
+	{
+		return array(
+			array(array(array(1, 2, 4, 5, 6), true),	array(2 => 2, 5 => 5)),
+			array(array(array(1, 2, 4, 5, 6), false),	array(2 => 2)),
+			array(array(array(1, 2, 4, 5, 6), 2),		array(2 => 2, 5 => 5, 6 => 6)),
+		);
+	}
+
+	public function setUp()
 	{
 		global $db;
 
 		$db = $this->new_dbal();
 
-		$user_ids = array(1, 2, 4, 5);
-
-		$this->assertEquals(phpbb_get_banned_user_ids($user_ids, true), array(2 => 2, 5 => 5));
-
-		$this->assertEquals(phpbb_get_banned_user_ids($user_ids, false), array(2 => 2));
+		return parent::setUp();
+	}
 
-		$this->assertEquals(phpbb_get_banned_user_ids($user_ids, 2), array(2 => 2, 5 => 5));
+	/**
+	* @dataProvider phpbb_get_banned_user_ids_data
+	*/
+	public function test_phpbb_get_banned_user_ids($input, $expected)
+	{
+		$this->assertEquals($expected, call_user_func_array('phpbb_get_banned_user_ids', $input));
 	}
 }