From eabcbb9baf7d69cfae6d23f05b062002d054424c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 15 Mar 2013 01:25:10 +0100 Subject: [PATCH 1/5] [ticket/11441] Add _test prefix to user loader test filename. PHPBB3-11441 --- tests/user/{user_loader.php => user_loader_test.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/user/{user_loader.php => user_loader_test.php} (100%) diff --git a/tests/user/user_loader.php b/tests/user/user_loader_test.php similarity index 100% rename from tests/user/user_loader.php rename to tests/user/user_loader_test.php From 3c09612d36acf821d4d8576f165dda2e7d69d04e Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 15 Mar 2013 01:26:26 +0100 Subject: [PATCH 2/5] [ticket/11441] Correct/fix class name of user loader test. PHPBB3-11441 --- tests/user/user_loader_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index 0beb804729..57a86d8729 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -9,7 +9,7 @@ include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); -class phpbb_user_lang_test extends phpbb_database_test_case +class phpbb_user_loader_test extends phpbb_database_test_case { public function getDataSet() { From e1e9138c3b706d686dc176f7ccb3dfc95cbf0bb4 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 15 Mar 2013 01:28:27 +0100 Subject: [PATCH 3/5] [ticket/11441] Update/correct copyright year of user loader test. PHPBB3-11441 --- tests/user/user_loader_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index 57a86d8729..c030e7ff97 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -2,7 +2,7 @@ /** * * @package testing -* @copyright (c) 2011 phpBB Group +* @copyright (c) 2012 phpBB Group * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ From ef1caf69332bed24a12fdeda98711f5012c85ebd Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 15 Mar 2013 01:32:33 +0100 Subject: [PATCH 4/5] [ticket/11441] Use setUp() in phpbb_user_loader_test. PHPBB3-11441 --- tests/user/user_loader_test.php | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index c030e7ff97..89659256f8 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -11,38 +11,45 @@ include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); class phpbb_user_loader_test extends phpbb_database_test_case { + protected $db; + protected $user_loader; + public function getDataSet() { return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml'); } + public function setUp() + { + parent::setUp(); + + $this->db = $this->new_dbal(); + $this->user_loader = new phpbb_user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); + } + public function test_user_loader() { - $db = $this->new_dbal(); + $this->user_loader->load_users(array(2)); - $user_loader = new phpbb_user_loader($db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); - - $user_loader->load_users(array(2)); - - $user = $user_loader->get_user(1); + $user = $this->user_loader->get_user(1); $this->assertEquals(1, $user['user_id']); $this->assertEquals('Guest', $user['username']); - $user = $user_loader->get_user(2); + $user = $this->user_loader->get_user(2); $this->assertEquals(2, $user['user_id']); $this->assertEquals('Admin', $user['username']); // Not loaded - $user = $user_loader->get_user(3); + $user = $this->user_loader->get_user(3); $this->assertEquals(1, $user['user_id']); $this->assertEquals('Guest', $user['username']); - $user = $user_loader->get_user(3, true); + $user = $this->user_loader->get_user(3, true); $this->assertEquals(3, $user['user_id']); $this->assertEquals('Test', $user['username']); - $user_id = $user_loader->load_user_by_username('Test'); - $user = $user_loader->get_user($user_id); + $user_id = $this->user_loader->load_user_by_username('Test'); + $user = $this->user_loader->get_user($user_id); $this->assertEquals(3, $user['user_id']); $this->assertEquals('Test', $user['username']); } From ba460d98f1fb78da1f996ae7fcc5cc28e574d3ba Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 15 Mar 2013 01:36:05 +0100 Subject: [PATCH 5/5] [ticket/11441] Split user loader tests into multiple test methods. PHPBB3-11441 --- tests/user/user_loader_test.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index 89659256f8..5cdb654b18 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -27,7 +27,7 @@ class phpbb_user_loader_test extends phpbb_database_test_case $this->user_loader = new phpbb_user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); } - public function test_user_loader() + public function test_load_get() { $this->user_loader->load_users(array(2)); @@ -38,8 +38,12 @@ class phpbb_user_loader_test extends phpbb_database_test_case $user = $this->user_loader->get_user(2); $this->assertEquals(2, $user['user_id']); $this->assertEquals('Admin', $user['username']); + } + + public function test_load_get_unloaded() + { + $this->user_loader->load_users(array(2)); - // Not loaded $user = $this->user_loader->get_user(3); $this->assertEquals(1, $user['user_id']); $this->assertEquals('Guest', $user['username']); @@ -47,7 +51,10 @@ class phpbb_user_loader_test extends phpbb_database_test_case $user = $this->user_loader->get_user(3, true); $this->assertEquals(3, $user['user_id']); $this->assertEquals('Test', $user['username']); + } + public function test_load_user_by_username() + { $user_id = $this->user_loader->load_user_by_username('Test'); $user = $this->user_loader->get_user($user_id); $this->assertEquals(3, $user['user_id']);