makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[task/mssql-db-tests] Split up database tests into SELECT and write operations

Browse source 
SELECT is based on the user table fixture, write (INSERT/UPDATE/DELETE) is
tested using the config table fixture.

PHPBB3-9868
This commit is contained in:
Nils Adermann 2010-10-25 19:20:51 +02:00
parent 9b4da98653
commit fa8dca2400
5 changed files with 200 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/dbal/all_tests.php
View file

@ -15,7 +15,8 @@ if (!defined('PHPUnit_MAIN_METHOD'))
require_once 'test_framework/framework.php'; require_once 'test_framework/framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php'; require_once 'PHPUnit/TextUI/TestRunner.php';
require_once 'dbal/dbal.php'; require_once 'dbal/select.php';
require_once 'dbal/write.php';
class phpbb_dbal_all_tests class phpbb_dbal_all_tests
{ {
@ -28,7 +29,8 @@ class phpbb_dbal_all_tests
{ {
$suite = new PHPUnit_Framework_TestSuite('phpBB Database Abstraction Layer'); $suite = new PHPUnit_Framework_TestSuite('phpBB Database Abstraction Layer');
$suite->addTestSuite('phpbb_dbal_test'); $suite->addTestSuite('phpbb_dbal_select_test');
$suite->addTestSuite('phpbb_dbal_write_test');
return $suite; return $suite;
} }

18
tests/dbal/fixtures/config.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_config">
<column>config_name</column>
<column>config_value</column>
<column>is_dynamic</column>
<row>
<value>config1</value>
<value>foo</value>
<value>0</value>
</row>
<row>
<value>config2</value>
<value>bar</value>
<value>1</value>
</row>
</table>
</dataset>

172
tests/dbal/dbal.php → tests/dbal/select.php
View file

@ -10,7 +10,7 @@
require_once 'test_framework/framework.php'; require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php'; require_once '../phpBB/includes/functions.php';
class phpbb_dbal_test extends phpbb_database_test_case class phpbb_dbal_select_test extends phpbb_database_test_case
{ {
public function getDataSet() public function getDataSet()
{ {
@ -318,174 +318,4 @@ class phpbb_dbal_test extends phpbb_database_test_case
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
public static function build_array_insert_data()
{
return array(
array(array(
'config_name' => 'test_version',
'config_value' => '0.0.0',
'is_dynamic' => 1,
)),
array(array(
'config_name' => 'second config',
'config_value' => '10',
'is_dynamic' => 0,
)),
);
}
/**
* @dataProvider build_array_insert_data
*/
public function test_build_array_insert($sql_ary)
{
$db = $this->new_dbal();
$sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary);
$result = $db->sql_query($sql);
$sql = "SELECT *
FROM phpbb_config
WHERE config_name = '" . $sql_ary['config_name'] . "'";
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals($sql_ary, $db->sql_fetchrow($result));
$db->sql_freeresult($result);
}
public static function delete_data()
{
return array(
array(
"WHERE config_name = 'test_version'",
array(
array(
'config_name' => 'second config',
'config_value' => '10',
'is_dynamic' => 0,
),
),
),
array(
'',
array(),
),
);
}
/**
* @dataProvider delete_data
*/
public function test_delete($where, $expected)
{
$db = $this->new_dbal();
$sql = 'DELETE FROM phpbb_config
' . $where;
$result = $db->sql_query($sql);
$sql = 'SELECT *
FROM phpbb_config';
$result = $db->sql_query($sql);
$this->assertEquals($expected, $db->sql_fetchrowset($result));
$db->sql_freeresult($result);
}
public function test_multiple_insert()
{
$db = $this->new_dbal();
$batch_ary = array(
array(
'config_name' => 'batch one',
'config_value' => 'b1',
'is_dynamic' => 0,
),
array(
'config_name' => 'batch two',
'config_value' => 'b2',
'is_dynamic' => 1,
),
);
$result = $db->sql_multi_insert('phpbb_config', $batch_ary);
$sql = 'SELECT *
FROM phpbb_config
ORDER BY config_name ASC';
$result = $db->sql_query($sql);
$this->assertEquals($batch_ary, $db->sql_fetchrowset($result));
$db->sql_freeresult($result);
}
public static function update_data()
{
return array(
array(
array(
'config_value' => '20',
'is_dynamic' => 0,
),
" WHERE config_name = 'batch one'",
array(
array(
'config_name' => 'batch one',
'config_value' => '20',
'is_dynamic' => 0,
),
array(
'config_name' => 'batch two',
'config_value' => 'b2',
'is_dynamic' => 1,
),
),
),
array(
array(
'config_value' => '0',
'is_dynamic' => 1,
),
'',
array(
array(
'config_name' => 'batch one',
'config_value' => '0',
'is_dynamic' => 1,
),
array(
'config_name' => 'batch two',
'config_value' => '0',
'is_dynamic' => 1,
),
),
),
);
}
/**
* @dataProvider update_data
*/
public function test_update($sql_ary, $where, $expected)
{
$db = $this->new_dbal();
$sql = 'UPDATE phpbb_config
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where;
$result = $db->sql_query($sql);
$sql = 'SELECT *
FROM phpbb_config
ORDER BY config_name ASC';
$result = $db->sql_query($sql);
$this->assertEquals($expected, $db->sql_fetchrowset($result));
$db->sql_freeresult($result);
}
} }

172
tests/dbal/write.php Normal file
View file

@ -0,0 +1,172 @@
<?php
/**
*
* @package testing
* @copyright (c) 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php';
class phpbb_dbal_write_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
}
public static function build_array_insert_data()
{
return array(
array(array(
'config_name' => 'test_version',
'config_value' => '0.0.0',
'is_dynamic' => 1,
)),
array(array(
'config_name' => 'second config',
'config_value' => '10',
'is_dynamic' => 0,
)),
);
}
/**
* @dataProvider build_array_insert_data
*/
public function test_build_array_insert($sql_ary)
{
$db = $this->new_dbal();
$sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary);
$result = $db->sql_query($sql);
$sql = "SELECT *
FROM phpbb_config
WHERE config_name = '" . $sql_ary['config_name'] . "'";
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals($sql_ary, $db->sql_fetchrow($result));
$db->sql_freeresult($result);
}
public function test_delete()
{
$db = $this->new_dbal();
$sql = "DELETE FROM phpbb_config
WHERE config_name = 'config1'";
$result = $db->sql_query($sql);
$sql = 'SELECT *
FROM phpbb_config';
$result = $db->sql_query($sql);
$rows = $db->sql_fetchrowset($result);
$this->assertEquals(1, sizeof($rows));
$this->assertEquals('config2', $rows[0]['config_name']);
$db->sql_freeresult($result);
}
public function test_multiple_insert()
{
$db = $this->new_dbal();
// empty the table
$sql = 'DELETE FROM phpbb_config';
$db->sql_query($sql);
$batch_ary = array(
array(
'config_name' => 'batch one',
'config_value' => 'b1',
'is_dynamic' => 0,
),
array(
'config_name' => 'batch two',
'config_value' => 'b2',
'is_dynamic' => 1,
),
);
$result = $db->sql_multi_insert('phpbb_config', $batch_ary);
$sql = 'SELECT *
FROM phpbb_config
ORDER BY config_name ASC';
$result = $db->sql_query($sql);
$this->assertEquals($batch_ary, $db->sql_fetchrowset($result));
$db->sql_freeresult($result);
}
public static function update_data()
{
return array(
array(
array(
'config_value' => '23',
'is_dynamic' => 0,
),
" WHERE config_name = 'config1'",
array(
array(
'config_name' => 'config1',
'config_value' => '23',
'is_dynamic' => 0,
),
array(
'config_name' => 'config2',
'config_value' => 'bar',
'is_dynamic' => 1,
),
),
),
array(
array(
'config_value' => '0',
'is_dynamic' => 1,
),
'',
array(
array(
'config_name' => 'config1',
'config_value' => '0',
'is_dynamic' => 1,
),
array(
'config_name' => 'config2',
'config_value' => '0',
'is_dynamic' => 1,
),
),
),
);
}
/**
* @dataProvider update_data
*/
public function test_update($sql_ary, $where, $expected)
{
$db = $this->new_dbal();
$sql = 'UPDATE phpbb_config
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where;
$result = $db->sql_query($sql);
$sql = 'SELECT *
FROM phpbb_config
ORDER BY config_name ASC';
$result = $db->sql_query($sql);
$this->assertEquals($expected, $db->sql_fetchrowset($result));
$db->sql_freeresult($result);
}
}

10
tests/test_framework/phpbb_database_test_case.php
View file

@ -9,6 +9,8 @@
abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_TestCase abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_TestCase
{ {
private static $already_connected;
protected $test_case_helpers; protected $test_case_helpers;
public function get_test_case_helpers() public function get_test_case_helpers()
@ -333,23 +335,21 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
public function getConnection() public function getConnection()
{ {
static $already_connected;
$config = $this->get_database_config(); $config = $this->get_database_config();
$dbms = $this->get_dbms_data($config['dbms']); $dbms = $this->get_dbms_data($config['dbms']);
if (!$already_connected) if (!self::$already_connected)
{ {
$this->recreate_db($config, $dbms); $this->recreate_db($config, $dbms);
} }
$pdo = $this->new_pdo($config, $dbms, true); $pdo = $this->new_pdo($config, $dbms, true);
if (!$already_connected) if (!self::$already_connected)
{ {
$this->load_schema($pdo, $config, $dbms); $this->load_schema($pdo, $config, $dbms);
$already_connected = true; self::$already_connected = true;
} }
return $this->createDefaultDBConnection($pdo, 'testdb'); return $this->createDefaultDBConnection($pdo, 'testdb');