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

Merge remote-tracking branch 'upstream/develop' into feature/dic

Browse Source 
* upstream/develop: (39 commits)
  [ticket/11025] Add underline for hover to classes
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
  [ticket/11025] Make last topic titles in forum list Bold
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
  [ticket/10990] Changes for develop
  [ticket/10990] Do not use comma separator when storing it as a log.
  [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
  [ticket/11008] Change onunload_functions to not use eval()
  ...
This commit is contained in:
Igor Wiedler
2012-07-26 16:12:21 +02:00
parent 8a264228d0 d1e5686866
commit cec4c94f2e
58 changed files with 682 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mock/extension_manager.php
View File

@@ -12,7 +12,7 @@ class phpbb_mock_extension_manager extends phpbb_extension_manager
public function __construct($phpbb_root_path, $extensions = array())
{
$this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = '.php';
$this->php_ext = '.php';
$this->extensions = $extensions;
}
}

102
tests/privmsgs/delete_user_pms_test.php Normal file
View File

@@ -0,0 +1,102 @@
<?php
/**
*
* @package testing
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php';
class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml');
}
public static function delete_user_pms_data()
{
return array(
// array(
// (user we delete),
// array(remaining privmsgs ids),
// array(remaining privmsgs_to),
// ),
array(
2,
array(
array('msg_id' => 1),
),
array(
array('msg_id' => 1, 'user_id' => 3),
),
),
array(
3,
array(
array('msg_id' => 1),
array('msg_id' => 2),
array('msg_id' => 3),
array('msg_id' => 5),
),
array(
array('msg_id' => 1, 'user_id' => 2),
array('msg_id' => 1, 'user_id' => 4),
array('msg_id' => 2, 'user_id' => 2),
array('msg_id' => 2, 'user_id' => 4),
array('msg_id' => 3, 'user_id' => 2),
array('msg_id' => 5, 'user_id' => 2),
array('msg_id' => 5, 'user_id' => 4),
),
),
array(
5,
array(
array('msg_id' => 1),
array('msg_id' => 2),
array('msg_id' => 3),
array('msg_id' => 4),
array('msg_id' => 5),
),
array(
array('msg_id' => 1, 'user_id' => 2),
array('msg_id' => 1, 'user_id' => 3),
array('msg_id' => 1, 'user_id' => 4),
array('msg_id' => 2, 'user_id' => 2),
array('msg_id' => 2, 'user_id' => 4),
array('msg_id' => 3, 'user_id' => 2),
array('msg_id' => 4, 'user_id' => 3),
array('msg_id' => 5, 'user_id' => 2),
array('msg_id' => 5, 'user_id' => 3),
array('msg_id' => 5, 'user_id' => 4),
),
),
);
}
/**
* @dataProvider delete_user_pms_data
*/
public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaining_privmsgs_to)
{
global $db;
$db = $this->new_dbal();
phpbb_delete_user_pms($delete_user);
$sql = 'SELECT msg_id
FROM ' . PRIVMSGS_TABLE;
$result = $db->sql_query($sql);
$this->assertEquals($remaining_privmsgs, $db->sql_fetchrowset($result));
$sql = 'SELECT msg_id, user_id
FROM ' . PRIVMSGS_TO_TABLE;
$result = $db->sql_query($sql);
$this->assertEquals($remaining_privmsgs_to, $db->sql_fetchrowset($result));
}
}

215
tests/privmsgs/fixtures/delete_user_pms.xml Normal file
View File

@@ -0,0 +1,215 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_users">
<column>user_id</column>
<column>username</column>
<column>username_clean</column>
<column>user_new_privmsg</column>
<column>user_unread_privmsg</column>
<column>user_permissions</column>
<column>user_sig</column>
<column>user_occ</column>
<column>user_interests</column>
<row>
<value>2</value>
<value>sender</value>
<value>sender</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
<row>
<value>3</value>
<value>pm in inbox</value>
<value>pm in inbox</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
<row>
<value>4</value>
<value>pm in no box</value>
<value>pm in no box</value>
<value>2</value>
<value>2</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
<row>
<value>5</value>
<value>no pms</value>
<value>no pms</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
</table>
<table name="phpbb_privmsgs">
<column>msg_id</column>
<column>root_level</column>
<column>author_id</column>
<column>message_subject</column>
<column>message_text</column>
<column>to_address</column>
<column>bcc_address</column>
<row>
<value>1</value>
<value>0</value>
<value>2</value>
<value>#1</value>
<value>
2 - outbox
3 - inbox
4 - nobox
</value>
<value></value>
<value></value>
</row>
<row>
<value>2</value>
<value>0</value>
<value>2</value>
<value>#2</value>
<value>
2 - outbox
4 - nobox
</value>
<value></value>
<value></value>
</row>
<row>
<value>3</value>
<value>0</value>
<value>2</value>
<value>#3</value>
<value>
2 - outbox
</value>
<value></value>
<value></value>
</row>
<row>
<value>4</value>
<value>0</value>
<value>2</value>
<value>#4</value>
<value>
3 - nobox
</value>
<value></value>
<value></value>
</row>
<row>
<value>5</value>
<value>0</value>
<value>2</value>
<value>#5</value>
<value>
2 - outbox
3 - nobox
4 - nobox
</value>
<value></value>
<value></value>
</row>
</table>
<table name="phpbb_privmsgs_to">
<column>msg_id</column>
<column>user_id</column>
<column>author_id</column>
<column>pm_new</column>
<column>pm_unread</column>
<column>folder_id</column>
<row>
<value>1</value>
<value>2</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-2</value>
</row>
<row>
<value>1</value>
<value>3</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>4</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-3</value>
</row>
<row>
<value>2</value>
<value>2</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-2</value>
</row>
<row>
<value>2</value>
<value>4</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-3</value>
</row>
<row>
<value>3</value>
<value>2</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-2</value>
</row>
<row>
<value>4</value>
<value>3</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-3</value>
</row>
<row>
<value>5</value>
<value>2</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-2</value>
</row>
<row>
<value>5</value>
<value>3</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-3</value>
</row>
<row>
<value>5</value>
<value>4</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>-3</value>
</row>
</table>
</dataset>