aboutsummaryrefslogtreecommitdiffstats
path: root/tests/user
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-12-08 18:40:41 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2012-12-08 18:40:41 -0600
commit37565f37e4363f257a160145bc7973a2d5738a86 (patch)
tree3675e8a42a6d2b7cdc1eeac27c8cf0650c680ab1 /tests/user
parent53decec6e315552e8492fcab3c84f68b33f0782e (diff)
downloadforums-37565f37e4363f257a160145bc7973a2d5738a86.tar
forums-37565f37e4363f257a160145bc7973a2d5738a86.tar.gz
forums-37565f37e4363f257a160145bc7973a2d5738a86.tar.bz2
forums-37565f37e4363f257a160145bc7973a2d5738a86.tar.xz
forums-37565f37e4363f257a160145bc7973a2d5738a86.zip
[ticket/11103] Some improvements to the user loader
PHPBB3-11103
Diffstat (limited to 'tests/user')
-rw-r--r--tests/user/user_loader.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/user/user_loader.php b/tests/user/user_loader.php
index 145bfc9549..0beb804729 100644
--- a/tests/user/user_loader.php
+++ b/tests/user/user_loader.php
@@ -7,6 +7,8 @@
*
*/
+include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
+
class phpbb_user_lang_test extends phpbb_database_test_case
{
public function getDataSet()
@@ -18,7 +20,7 @@ class phpbb_user_lang_test extends phpbb_database_test_case
{
$db = $this->new_dbal();
- $user_loader = new phpbb_user_loader($db, __DIR__ . '../../phpBB', 'php', 'phpbb_users');
+ $user_loader = new phpbb_user_loader($db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
$user_loader->load_users(array(2));
@@ -35,13 +37,12 @@ class phpbb_user_lang_test extends phpbb_database_test_case
$this->assertEquals(1, $user['user_id']);
$this->assertEquals('Guest', $user['username']);
- $user_loader->load_users(array(3));
-
- $user = $user_loader->get_user(2);
- $this->assertEquals(2, $user['user_id']);
- $this->assertEquals('Admin', $user['username']);
+ $user = $user_loader->get_user(3, true);
+ $this->assertEquals(3, $user['user_id']);
+ $this->assertEquals('Test', $user['username']);
- $user = $user_loader->get_user(3);
+ $user_id = $user_loader->load_user_by_username('Test');
+ $user = $user_loader->get_user($user_id);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}