1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 03:54:56 +02:00

Merge remote-tracking branch 'bantu/ticket/11441' into develop

* bantu/ticket/11441:
  [ticket/11441] Split user loader tests into multiple test methods.
  [ticket/11441] Use setUp() in phpbb_user_loader_test.
  [ticket/11441] Update/correct copyright year of user loader test.
  [ticket/11441] Correct/fix class name of user loader test.
  [ticket/11441] Add _test prefix to user loader test filename.
This commit is contained in:
Joas Schilling 2013-03-15 19:06:54 +01:00
commit afd3681208
2 changed files with 63 additions and 49 deletions

View File

@ -1,49 +0,0 @@
<?php
/**
*
* @package testing
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
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 = $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);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
}

View File

@ -0,0 +1,63 @@
<?php
/**
*
* @package testing
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
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_load_get()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(1);
$this->assertEquals(1, $user['user_id']);
$this->assertEquals('Guest', $user['username']);
$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));
$user = $this->user_loader->get_user(3);
$this->assertEquals(1, $user['user_id']);
$this->assertEquals('Guest', $user['username']);
$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']);
$this->assertEquals('Test', $user['username']);
}
}