diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Framework/DB.php | 108 | ||||
| -rw-r--r-- | tests/Framework/Html2text.php | 5 | ||||
| -rw-r--r-- | tests/Framework/Text2Html.php | 2 |
3 files changed, 103 insertions, 12 deletions
diff --git a/tests/Framework/DB.php b/tests/Framework/DB.php index 42020f47a..04897bb90 100644 --- a/tests/Framework/DB.php +++ b/tests/Framework/DB.php @@ -25,6 +25,8 @@ class Framework_DB extends PHPUnit_Framework_TestCase { $db = new rcube_db_test_wrapper('test'); $db->set_option('table_prefix', 'prefix_'); + $db->set_option('identifier_start', '`'); + $db->set_option('identifier_end', '`'); $script = implode("\n", array( "CREATE TABLE `xxx` (test int, INDEX xxx (test));", @@ -38,26 +40,88 @@ class Framework_DB extends PHPUnit_Framework_TestCase "SELECT test FROM xxx;", )); $output = implode("\n", array( - "CREATE TABLE `prefix_xxx` (test int, INDEX prefix_xxx (test));", - "ALTER TABLE `prefix_xxx` CHANGE test test int;", - "TRUNCATE prefix_xxx;", - "DROP TABLE `prefix_vvv`;", + "CREATE TABLE `prefix_xxx` (test int, INDEX prefix_xxx (test))", + "ALTER TABLE `prefix_xxx` CHANGE test test int", + "TRUNCATE prefix_xxx", + "DROP TABLE `prefix_vvv`", "CREATE TABLE `prefix_i` (test int CONSTRAINT `prefix_iii` - FOREIGN KEY (`test`) REFERENCES `prefix_xxx`(`test`) ON DELETE CASCADE ON UPDATE CASCADE);", - "INSERT INTO prefix_xxx test = 1;", - "SELECT test FROM prefix_xxx;", + FOREIGN KEY (`test`) REFERENCES `prefix_xxx`(`test`) ON DELETE CASCADE ON UPDATE CASCADE)", + "INSERT INTO prefix_xxx test = 1", + "SELECT test FROM prefix_xxx", )); $result = $db->exec_script($script); - $out = ''; + $out = array(); foreach ($db->queries as $q) { - $out[] = $q[0]; + $out[] = $q; } $this->assertTrue($result, "Execute SQL script (result)"); $this->assertSame(implode("\n", $out), $output, "Execute SQL script (content)"); } + + /** + * Test query parsing and arguments quoting + */ + function test_query_parsing() + { + $db = new rcube_db_test_wrapper('test'); + $db->set_option('identifier_start', '`'); + $db->set_option('identifier_end', '`'); + + $db->query("SELECT ?", "test`test"); + $db->query("SELECT ?", "test?test"); + $db->query("SELECT ?", "test``test"); + $db->query("SELECT ?", "test??test"); + $db->query("SELECT `test` WHERE 'test``test'"); + $db->query("SELECT `test` WHERE 'test??test'"); + $db->query("SELECT `test` WHERE `test` = ?", "`te``st`"); + $db->query("SELECT `test` WHERE `test` = ?", "?test?"); + $db->query("SELECT `test` WHERE `test` = ?", "????"); + + $expected = implode("\n", array( + "SELECT 'test`test'", + "SELECT 'test?test'", + "SELECT 'test``test'", + "SELECT 'test??test'", + "SELECT `test` WHERE 'test`test'", + "SELECT `test` WHERE 'test?test'", + "SELECT `test` WHERE `test` = '`te``st`'", + "SELECT `test` WHERE `test` = '?test?'", + "SELECT `test` WHERE `test` = '????'", + )); + + $this->assertSame($expected, implode("\n", $db->queries), "Query parsing [1]"); + + $db->set_option('identifier_start', '"'); + $db->set_option('identifier_end', '"'); + $db->queries = array(); + + $db->query("SELECT ?", "test`test"); + $db->query("SELECT ?", "test?test"); + $db->query("SELECT ?", "test``test"); + $db->query("SELECT ?", "test??test"); + $db->query("SELECT `test` WHERE 'test``test'"); + $db->query("SELECT `test` WHERE 'test??test'"); + $db->query("SELECT `test` WHERE `test` = ?", "`te``st`"); + $db->query("SELECT `test` WHERE `test` = ?", "?test?"); + $db->query("SELECT `test` WHERE `test` = ?", "????"); + + $expected = implode("\n", array( + "SELECT 'test`test'", + "SELECT 'test?test'", + "SELECT 'test``test'", + "SELECT 'test??test'", + "SELECT \"test\" WHERE 'test`test'", + "SELECT \"test\" WHERE 'test?test'", + "SELECT \"test\" WHERE \"test\" = '`te``st`'", + "SELECT \"test\" WHERE \"test\" = '?test?'", + "SELECT \"test\" WHERE \"test\" = '????'", + )); + + $this->assertSame($expected, implode("\n", $db->queries), "Query parsing [2]"); + } } /** @@ -67,8 +131,30 @@ class rcube_db_test_wrapper extends rcube_db { public $queries = array(); - protected function _query($query, $offset, $numrows, $params) + protected function query_execute($query) + { + $this->queries[] = $query; + } + + public function db_connect($mode, $force = false) + { + $this->dbh = new rcube_db_test_dbh(); + } + + public function is_connected() + { + return true; + } + + protected function debug($data) + { + } +} + +class rcube_db_test_dbh +{ + public function quote($data, $type) { - $this->queries[] = array(trim($query), $offset, $numrows, $params); + return "'$data'"; } } diff --git a/tests/Framework/Html2text.php b/tests/Framework/Html2text.php index 76b1f16cd..dee767057 100644 --- a/tests/Framework/Html2text.php +++ b/tests/Framework/Html2text.php @@ -46,6 +46,11 @@ class rc_html2text extends PHPUnit_Framework_TestCase 'in' => chr(0x002).chr(0x003), 'out' => chr(0x002).chr(0x003), ), + 7 => array( + 'title' => 'Remove spaces after <br>', + 'in' => 'test<br> test', + 'out' => "test\ntest", + ), ); } diff --git a/tests/Framework/Text2Html.php b/tests/Framework/Text2Html.php index 8d1325dee..771e14703 100644 --- a/tests/Framework/Text2Html.php +++ b/tests/Framework/Text2Html.php @@ -41,7 +41,7 @@ class Framework_Text2Html extends PHPUnit_Framework_TestCase $data[] = array(">aaaa \n>aaaa", "<blockquote>aaaa_<br>aaaa</blockquote>", $options); $data[] = array(">aaaa\n>aaaa", "<blockquote>aaaa<br>aaaa</blockquote>", $options); $data[] = array(">aaaa \n>bbbb\ncccc dddd", "<blockquote>aaaa_<br>bbbb</blockquote>cccc_dddd", $options); - $data[] = array("aaaa-bbbb/cccc", "aaaa-⁠bbbb/⁠cccc", $options); + $data[] = array("aaaa-bbbb/cccc", "aaaa\xEF\xBB\xBF-\xEF\xBB\xBFbbbb\xEF\xBB\xBF/cccc", $options); $options['flowed'] = true; |