mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

Browse Source 
Conflicts:
	phpBB/docs/hook_system.html
This commit is contained in:
Yuriy Rusko
2014-05-27 21:55:40 +02:00
parent 27f787e5e4 0acaa77229
commit 1d61bcedfd
39 changed files with 507 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/config/db_text_test.php
View File

@@ -13,8 +13,8 @@
class phpbb_config_db_text_test extends phpbb_database_test_case
{
private $db;
private $config_text;
/** @var \phpbb\config\db_text */
protected $config_text;
public function getDataSet()
{
@@ -52,6 +52,12 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
$this->assertSame('24', $this->config_text->get('foo'));
}
public function test_set_same_value_get()
{
$this->config_text->set('foo', '23');
$this->assertSame('23', $this->config_text->get('foo'));
}
public function test_set_get_long_string()
{
$expected = str_repeat('ABC', 10000);
@@ -93,6 +99,8 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
'baby' => 'phpBB',
// Entry update
'bar' => '64',
// Entry update - same value
'foo' => '23',
);
$this->config_text->set_array($set_array_param);

64
tests/dbal/sql_affected_rows_test.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
/**
*
* @package testing
* @copyright (c) 2014 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
class phpbb_dbal_sql_affected_rows_test extends phpbb_database_test_case
{
/** @var \phpbb\db\driver\driver_interface */
protected $db;
public function setUp()
{
parent::setUp();
$this->db = $this->new_dbal();
}
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
}
public function test_update()
{
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = 'bertie'";
$this->db->sql_query($sql);
$this->assertEquals(2, $this->db->sql_affectedrows());
}
public function test_update_all_matched_unequal_updated()
{
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = 'foo'";
$this->db->sql_query($sql);
$this->assertEquals(2, $this->db->sql_affectedrows());
}
public function test_update_same_value_matched_unequal_updated()
{
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = 'foo'
WHERE config_value = 'foo'";
$this->db->sql_query($sql);
$this->assertEquals(1, $this->db->sql_affectedrows());
}
public function test_insert()
{
$sql = 'INSERT INTO ' . CONFIG_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
'config_name' => 'bertie',
'config_value' => 'rules',
));
$this->db->sql_query($sql);
$this->assertEquals(1, $this->db->sql_affectedrows());
}
}