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

[ticket/13803] Rewrote the poll_option plugin

Browse Source 
As it turns out, poll_option_id is not a primary key.

PHPBB3-13803
This commit is contained in:
JoshyPHP
2015-05-09 20:12:30 +02:00
parent 7a8ac4bb71
commit 3827a131ae
3 changed files with 142 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tests/text_reparser/fixtures/poll_options.xml
View File

@@ -12,48 +12,33 @@
<row>
<value>2</value>
<value>1</value>
<value>[b]Not bold[/b] :) http://example.org</value>
<value>This row should be [b:abcd1234]ignored[/b:abcd1234]</value>
</row>
<row>
<value>1</value>
<value>2</value>
<value>[b:abcd1234]Bold[/b:abcd1234]</value>
</row>
<row>
<value>2</value>
<value>2</value>
<value><![CDATA[<!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) -->]]></value>
</row>
<row>
<value>3</value>
<value>1</value>
<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
<value>2</value>
<value><![CDATA[<!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
</row>
<row>
<value>4</value>
<value>1</value>
<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
</row>
<row>
<value>5</value>
<value>1</value>
<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
</row>
<row>
<value>6</value>
<value>1</value>
<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
</row>
<row>
<value>7</value>
<value>1</value>
<value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value>
</row>
<row>
<value>8</value>
<value>1</value>
<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
</row>
<row>
<value>9</value>
<value>1</value>
<value><![CDATA[[img]http://example.org/img.png[/img]]]></value>
</row>
<row>
<value>1000</value>
<value>1</value>
<value>123</value>
<value>This row should be [b]ignored[/b]</value>
</row>
<row>
<value>2</value>
<value>123</value>
<value>This row should be [b:abcd1234]ignored[/b:abcd1234]</value>
</row>
</table>
<table name="phpbb_posts">
<column>post_id</column>
@@ -74,5 +59,15 @@
<value>1</value>
<value>This row should be [b]ignored[/b]</value>
</row>
<row>
<value>2</value>
<value>1</value>
<value>This row should be [b]ignored[/b]</value>
</row>
<row>
<value>123</value>
<value>1</value>
<value>This row should be [b]ignored[/b]</value>
</row>
</table>
</dataset>

78
tests/text_reparser/poll_option_test.php
View File

@@ -10,10 +10,14 @@
* the docs/CREDITS.txt file.
*
*/
include_once __DIR__ . '/test_row_based_plugin.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php';
class phpbb_textreparser_poll_option_test extends phpbb_textreparser_test_row_based_plugin
class phpbb_textreparser_poll_option_test extends phpbb_database_test_case
{
protected $db;
public function getDataSet()
{
return $this->createXMLDataSet(__DIR__ . '/fixtures/poll_options.xml');
@@ -23,4 +27,74 @@ class phpbb_textreparser_poll_option_test extends phpbb_textreparser_test_row_ba
{
return new \phpbb\textreparser\plugins\poll_option($this->db);
}
public function setUp()
{
global $config;
if (!isset($config))
{
$config = new \phpbb\config\config(array());
}
$this->get_test_case_helpers()->set_s9e_services();
$this->db = $this->new_dbal();
parent::setUp();
}
public function test_get_max_id()
{
$reparser = $this->get_reparser();
$this->assertEquals(123, $reparser->get_max_id());
}
public function testReparse()
{
$reparser = $this->get_reparser();
$reparser->reparse_range(2, 3);
$sql = 'SELECT topic_id, poll_option_id, poll_option_text
FROM ' . POLL_OPTIONS_TABLE . '
ORDER BY topic_id, poll_option_id';
$result = $this->db->sql_query($sql);
$rows = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
$expected = array(
array(
'topic_id' => 1,
'poll_option_id' => 1,
'poll_option_text' => 'This row should be [b]ignored[/b]',
),
array(
'topic_id' => 1,
'poll_option_id' => 2,
'poll_option_text' => 'This row should be [b:abcd1234]ignored[/b:abcd1234]',
),
array(
'topic_id' => 2,
'poll_option_id' => 1,
'poll_option_text' => '<r><B><s>[b]</s>Bold<e>[/b]</e></B></r>',
),
array(
'topic_id' => 2,
'poll_option_id' => 2,
'poll_option_text' => '<r><E>:)</E></r>',
),
array(
'topic_id' => 2,
'poll_option_id' => 3,
'poll_option_text' => '<r><URL url="http://example.org">http://example.org</URL></r>',
),
array(
'topic_id' => 123,
'poll_option_id' => 1,
'poll_option_text' => 'This row should be [b]ignored[/b]',
),
array(
'topic_id' => 123,
'poll_option_id' => 2,
'poll_option_text' => 'This row should be [b:abcd1234]ignored[/b:abcd1234]',
),
);
$this->assertEquals($expected, $rows);
}
}