From 6b7443adacfa8e79304e4c91ca02000d25259633 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 13:41:44 -0600
Subject: [ticket/11103] User loader test.bat PHPBB3-11103

---
 tests/user/fixtures/user_loader.xml | 23 ++++++++++++++++++
 tests/user/user_loader.php          | 48 +++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 tests/user/fixtures/user_loader.xml
 create mode 100644 tests/user/user_loader.php

(limited to 'tests/user')

diff --git a/tests/user/fixtures/user_loader.xml b/tests/user/fixtures/user_loader.xml
new file mode 100644
index 0000000000..737376f326
--- /dev/null
+++ b/tests/user/fixtures/user_loader.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<row>
+			<value>1</value>
+			<value>Guest</value>
+			<value>guest</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>Admin</value>
+			<value>admin</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>Test</value>
+			<value>test</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/user/user_loader.php b/tests/user/user_loader.php
new file mode 100644
index 0000000000..145bfc9549
--- /dev/null
+++ b/tests/user/user_loader.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_user_lang_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml');
+	}
+
+	public function test_user_loader()
+	{
+		$db = $this->new_dbal();
+
+		$user_loader = new phpbb_user_loader($db, __DIR__ . '../../phpBB', 'php', 'phpbb_users');
+
+		$user_loader->load_users(array(2));
+
+		$user = $user_loader->get_user(1);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $user_loader->get_user(2);
+		$this->assertEquals(2, $user['user_id']);
+		$this->assertEquals('Admin', $user['username']);
+
+		// Not loaded
+		$user = $user_loader->get_user(3);
+		$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);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+}
-- 
cgit v1.2.1


From 37565f37e4363f257a160145bc7973a2d5738a86 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 18:40:41 -0600
Subject: [ticket/11103] Some improvements to the user loader

PHPBB3-11103
---
 tests/user/user_loader.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'tests/user')

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']);
 	}
-- 
cgit v1.2.1